From 743164baf63dbdb2f1f0aa99dbbde6579c27c602 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 2 Aug 2015 22:05:33 +0200 Subject: [PATCH] Sync translations with Transifex Signed-off-by: Sven Strickroth --- Languages/Tortoise.pot | 50 +- Languages/Tortoise_bg_BG.po | 3930 +++++++++++++++-------------- Languages/Tortoise_ca.po | 3969 +++++++++++++++-------------- Languages/Tortoise_cs.po | 3787 +++++++++++++++------------- Languages/Tortoise_de.po | 3787 +++++++++++++++------------- Languages/Tortoise_es_ES.po | 3947 +++++++++++++++-------------- Languages/Tortoise_fr.po | 3905 +++++++++++++++-------------- Languages/Tortoise_hu.po | 3968 +++++++++++++++-------------- Languages/Tortoise_id.po | 3921 +++++++++++++++-------------- Languages/Tortoise_it_IT.po | 4008 +++++++++++++++-------------- Languages/Tortoise_ja.po | 3873 ++++++++++++++-------------- Languages/Tortoise_ko_KR.po | 3838 ++++++++++++++-------------- Languages/Tortoise_nl_NL.po | 3783 +++++++++++++++------------- Languages/Tortoise_pl_PL.po | 3975 +++++++++++++++-------------- Languages/Tortoise_pt_BR.po | 4007 +++++++++++++++-------------- Languages/Tortoise_pt_PT.po | 4047 ++++++++++++++++-------------- Languages/Tortoise_ro.po | 4022 +++++++++++++++-------------- Languages/Tortoise_ru.po | 3987 +++++++++++++++-------------- Languages/Tortoise_sk.po | 3815 ++++++++++++++-------------- Languages/Tortoise_sr@latin.po | 4077 +++++++++++++++--------------- Languages/Tortoise_sv.po | 3794 +++++++++++++++------------- Languages/Tortoise_tr.po | 4128 +++++++++++++++--------------- Languages/Tortoise_uk.po | 3922 +++++++++++++++-------------- Languages/Tortoise_vi.po | 3869 ++++++++++++++-------------- Languages/Tortoise_zh_CN.po | 3885 ++++++++++++++-------------- Languages/Tortoise_zh_TW.po | 5425 +++++++++++++++++++++------------------- 26 files changed, 52126 insertions(+), 47593 deletions(-) diff --git a/Languages/Tortoise.pot b/Languages/Tortoise.pot index c3d9bb817..53c06f354 100644 --- a/Languages/Tortoise.pot +++ b/Languages/Tortoise.pot @@ -2233,6 +2233,10 @@ msgstr "" msgid "Blend alpha" msgstr "" +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + #. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "" @@ -2987,7 +2991,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (102) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3031,7 +3035,7 @@ msgstr "" msgid "Conflict resolved" msgstr "" -#. Resource IDs: (4204, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "" @@ -3674,6 +3678,10 @@ msgstr "" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "" @@ -4309,7 +4317,7 @@ msgstr "" msgid "Erase the selection\nErase" msgstr "" -#. Resource IDs: (1112, 1307) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "" @@ -4625,7 +4633,7 @@ msgstr "" msgid "Filename" msgstr "" -#. Resource IDs: (156, 1707) +#. Resource IDs: (1707) msgid "Files" msgstr "" @@ -6048,10 +6056,6 @@ msgstr "" msgid "Mail system DLL is invalid." msgstr "" -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -7026,7 +7030,7 @@ msgstr "" msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (1004, 1223, 3153, 3300) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "" @@ -7511,6 +7515,10 @@ msgid "Recursive" msgstr "" #. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "Redo the previously undone action\nRedo" msgstr "" @@ -7550,7 +7558,7 @@ msgstr "" msgid "Refreshing..." msgstr "" -#. Resource IDs: (165, 500) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -8993,6 +9001,10 @@ msgstr "" msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "" @@ -9005,6 +9017,10 @@ msgstr "" msgid "Status" msgstr "" +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + #. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "" @@ -10013,10 +10029,6 @@ msgstr "" msgid "Use 'theirs' text block then 'mine'" msgstr "" -#. Resource IDs: (32914) -msgid "Use Blocks" -msgstr "" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10268,6 +10280,10 @@ msgstr "" msgid "View .tgitconfig" msgstr "" +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + #. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" @@ -10385,7 +10401,7 @@ msgstr "" msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "" @@ -10891,6 +10907,10 @@ msgstr "" msgid "on %1" msgstr "" +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + #. Resource IDs: (61888) msgid "pixels" msgstr "" diff --git a/Languages/Tortoise_bg_BG.po b/Languages/Tortoise_bg_BG.po index 8ee0a2b62..462fc48ac 100644 --- a/Languages/Tortoise_bg_BG.po +++ b/Languages/Tortoise_bg_BG.po @@ -4,6 +4,7 @@ # This file is distributed under the same license as TortoiseGit # # Translators: +# Dimitar Tsonev , 2015 # Lübbe TortoiseSVN , 2011 # Lübbe TortoiseSVN , 2011 # petkovmt , 2011 @@ -12,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/tortoisegit/language/bg_BG/)\n" "MIME-Version: 1.0\n" @@ -23,7 +24,7 @@ msgstr "" "Language: bg_BG\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -45,138 +46,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# автори, показани поотделно:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 съдържаше неочакван обект." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 съдържа грешен път." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 съдържа грешна схема." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 има грешен формат." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 не бе намерен." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "Преди %1!d! ден" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "Преди %1!d! дни" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "Преди %1!d! час" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "Преди %1!d! часа" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "Преди %1!d! минута" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "Преди %1!d! месец" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "Преди %1!d! месеца" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "Преди %1!d! секунда" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "Преди %1!d! секунди" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "Преди %1!d! седмица" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "Преди %1!d! седмици" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "Преди %1!d! година" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "Преди %1!d! години" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "Преди %1!d! минути" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nДа се продължи ли изпълнението на скрипта?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -184,52 +185,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nНе може да бъде открит този файл.\nПроверете дали е зададен верен път и име." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d байта прехвърлени" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d избрани файла, %d файла общо" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d най-активни автори с поне %d ангажимента (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -237,78 +238,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nкликни за да включиш алфа\nкликни два пъти за да избереш алфа автоматчно" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld минута(и) и %ld секунда(и)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld от %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - редакция: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Възстановени]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s в %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, в %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Експортиране (%d) от %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Експортиране от %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nЖелаете ли да го премахнете въпреки това?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -324,6 +325,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "" @@ -352,15 +357,15 @@ msgstr "" msgid "&Add New/Save" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Добавяне или премахване на бутони" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Добавяне..." @@ -400,7 +405,7 @@ msgstr "&Асоцииране" msgid "&Associate double-click event with:" msgstr "&Асоцииране на двойното щракване с:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Автоматично скриване" @@ -416,15 +421,15 @@ msgstr "" msgid "&Backup original file" msgstr "&Запис на резервно копие" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Авторство на промените" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Авторство на редакции" @@ -434,7 +439,7 @@ msgstr "&Син:" #. Resource IDs: (65535) msgid "&Border:" -msgstr "" +msgstr "&Кант:" #. Resource IDs: (1512) msgid "&Branch" @@ -448,7 +453,7 @@ msgstr "&Бранш:" msgid "&Browse Dir" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Разглеждане на хранилище" @@ -484,7 +489,7 @@ msgstr "&Категория:" msgid "&Choose commands from:" msgstr "&Изберете команди от:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Почисти..." @@ -508,7 +513,7 @@ msgstr "&Затваряне на прозореца/-ите" msgid "&Command:" msgstr "&Команда:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "" @@ -516,23 +521,27 @@ msgstr "" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Поверяване..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Сравняване на редакции" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Копиране" @@ -552,11 +561,11 @@ msgstr "&Допълнително" msgid "&Default" msgstr "&По подразбиране" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Изтриване" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Изтриване (запазва местните)" @@ -564,7 +573,7 @@ msgstr "&Изтриване (запазва местните)" msgid "&Delete Filter" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "" @@ -576,11 +585,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Разлики" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Разлики с предишна версия" @@ -592,7 +601,7 @@ msgstr "" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "" @@ -600,7 +609,7 @@ msgstr "" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Скачване" @@ -608,11 +617,15 @@ msgstr "&Скачване" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "" @@ -620,11 +633,11 @@ msgstr "" msgid "&Edit" msgstr "&Редакция" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "" @@ -632,7 +645,7 @@ msgstr "" msgid "&Edit Filter" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Промяна на конфликти" @@ -657,10 +670,10 @@ msgid "&Enable edit" msgstr "" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Експорт на избраното в..." @@ -672,27 +685,27 @@ msgstr "&Външна" msgid "&File" msgstr "&Файл" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Търсене" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Събери картинките в прозореца" +msgid "&Fit images in window\tF" +msgstr "&Събери картинките в прозореца\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Фиксирани устройства" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Плаващ" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -704,7 +717,7 @@ msgstr "&Шрифт за дневника:" msgid "&Font:" msgstr "&Шрифт:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -724,7 +737,7 @@ msgstr "" msgid "&Go to\tCtrl+G" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -736,15 +749,15 @@ msgstr "&Зелен:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Помощ" #. Resource IDs: (57667, 57670) msgid "&Help Topics" -msgstr "" +msgstr "Помощ по &теми" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Скриване" @@ -752,11 +765,11 @@ msgstr "&Скриване" msgid "&Icon Set:" msgstr "&Комплект с иконки:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Игнориране на %d обекта по име" @@ -770,14 +783,14 @@ msgid "&Image" msgstr "&Изображение" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Информация за &картинка" +msgid "&Image info\tI" +msgstr "Информация за &картинка\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Само изображението" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Импорт..." @@ -789,7 +802,7 @@ msgstr "&Начална директория:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -801,11 +814,11 @@ msgstr "&Преход до първата разлика при зареждан msgid "&Keep CR" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -827,13 +840,13 @@ msgstr "&Ограничаване на търсенето до променен #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Ограничение:" #. Resource IDs: (1078) msgid "&Line number" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "" @@ -850,7 +863,7 @@ msgstr "&Списъчен изглед" msgid "&Local Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -874,11 +887,11 @@ msgstr "&Анимации на менюто:" msgid "&Menu contents:" msgstr "&Съдържание на меню:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Сливане" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Сливане..." @@ -900,7 +913,7 @@ msgstr "&Смаляване" #. Resource IDs: (32880) msgid "&Moved blocks" -msgstr "" +msgstr "&Преместени блокове" #. Resource IDs: (1515) msgid "&Name" @@ -912,7 +925,7 @@ msgstr "" #. Resource IDs: (65535) msgid "&Navigate" -msgstr "" +msgstr "&Навигация" #. Resource IDs: (1049) msgid "&Network drives" @@ -928,12 +941,16 @@ msgstr "&Нов..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Напред >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Следваща страница" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Без двойно щракване" @@ -950,11 +967,11 @@ msgstr "" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Една страница" @@ -962,19 +979,15 @@ msgstr "&Една страница" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Отваряне" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -987,18 +1000,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Припокриване на изображенията" +msgid "&Overlay images\tO" +msgstr "&Припокриване на изображенията\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Парола:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Вмъкване" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1006,7 +1019,7 @@ msgstr "" msgid "&Port:" msgstr "&Порт:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Преглед за печат" @@ -1014,11 +1027,15 @@ msgstr "&Преглед за печат" msgid "&Print..." msgstr "&Печат..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Печат...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1026,10 +1043,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Последни съобщения" @@ -1042,7 +1063,7 @@ msgstr "" msgid "&Red:" msgstr "&Червен:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Повтаряне" @@ -1058,7 +1079,7 @@ msgstr "&Опресняване" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1066,7 +1087,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1074,7 +1095,7 @@ msgstr "" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Премахване" @@ -1086,7 +1107,7 @@ msgstr "" msgid "&Replace" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Разглеждане на хранилища" @@ -1094,7 +1115,7 @@ msgstr "&Разглеждане на хранилища" msgid "&Reset" msgstr "&Нулиране" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Нулиране на лентата с инструменти" @@ -1110,23 +1131,27 @@ msgstr "&Нулиране на данните за използване" msgid "&Reset to Default" msgstr "&Нулиране" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1138,7 +1163,7 @@ msgstr "&SSH клиент:" msgid "&Saturation:" msgstr "&Наситеност:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Запис" @@ -1146,15 +1171,19 @@ msgstr "&Запис" msgid "&Save authentication" msgstr "&Запис на удостоверението" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Запис на диаграма като..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Запис на списък с избраните файлове в..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Запис\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1162,7 +1191,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Настройки" @@ -1182,7 +1211,7 @@ msgstr "&Показване на текстови етикети" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "" @@ -1190,7 +1219,7 @@ msgstr "" msgid "&Squash" msgstr "&Смачкване" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1202,13 +1231,13 @@ msgstr "" msgid "&Start Group" msgstr "&Стартова група" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" #. Resource IDs: (59393) msgid "&Status Bar" -msgstr "" +msgstr "&Лента за състоянието" #. Resource IDs: (1525) msgid "&Switch to new branch" @@ -1222,7 +1251,7 @@ msgstr "С&имволен изглед" msgid "&Tab size:" msgstr "Размер на &табулатора:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Табулиран документ" @@ -1230,7 +1259,7 @@ msgstr "&Табулиран документ" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Етикети" @@ -1252,7 +1281,7 @@ msgstr "&Изчакване (в секунди) на разбора за авт #. Resource IDs: (59392) msgid "&Toolbar" -msgstr "" +msgstr "&Лента с инструменти" #. Resource IDs: (65535) msgid "&Toolbar Name:" @@ -1266,7 +1295,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Ленти с инструменти:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1278,7 +1307,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Две страници" @@ -1286,15 +1319,15 @@ msgstr "&Две страници" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Отменяне" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Unified Diff" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1306,7 +1339,7 @@ msgstr "&Непознати устройства" msgid "&Up" msgstr "&На горе" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&обнови обект до редакция" @@ -1318,11 +1351,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Автоматично дописване на имена на файлове и ключови думи" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Потребител:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Изглед" @@ -1330,7 +1363,7 @@ msgstr "&Изглед" msgid "&View:" msgstr "&Изглед:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1346,6 +1379,10 @@ msgstr "&Цяла дума" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -1354,46 +1391,46 @@ msgstr "" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(от %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(няма списък с промени)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(няма номер на ред)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(без стойност)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(не е намерено)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(неизвестен)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- всички -" @@ -1401,13 +1438,14 @@ msgstr "- всички -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1415,7 +1453,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1431,7 +1469,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1447,31 +1485,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<Всички браншове>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "<Автоматично генерирано от Git>" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<Без бранш>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "<Разделител>" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "<Неозаглавен>" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1480,66 +1518,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit е разширение за Windows.\nТова означава, че се интегрира с Windows explorer.\nЗа да ползвате TortoiseGit моля заредете Windows Explorer и натиснете дясното копче на папка по Ваш избор \nза да видите всички команди налични за TortoiseGit .\nИ не забравяйте да прочетете ръководството" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Внимание: Не е проверено дали браншовете за напълно сляти в главния." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1547,7 +1585,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<нов списък с промени>" @@ -1559,71 +1597,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Списък, с разделител нов ред, от пътища, за които не се показва контекстното меню.\r\nАко добавите знака '*' в края на път, всички файлове и поддиректории в този път също ще са изключени.\r\nЗа да се показва навсякъде контекстното меню, оставете списъка празен." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Необходим ресурс не е наличен." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Програма за разглеждане на GNU diff файлове (файлове с кръпки).\r\nАко нямате такава, може да използвате Notepad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "О&тносно" @@ -1639,23 +1677,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Прекъсване" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "Прекъсване на &сливането" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Относно" @@ -1675,12 +1713,12 @@ msgstr "Относно TortoiseGitMerge" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Отказан бе достъпът до %1." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Действие" @@ -1688,26 +1726,26 @@ msgstr "Действие" msgid "Action log" msgstr "Дневник на действията" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Действия" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Показване на списък със задачите" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Активни файлове" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Обекти тип ActiveX не могат да бъдат записване по време на спиране на Windows!\nОтказ от всички промени на %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Добавяне" @@ -1715,7 +1753,7 @@ msgstr "Добавяне" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Добавяне на '%s' в речника" @@ -1728,15 +1766,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Добавяне на специфична за този тип файлове програма за сравняване" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Добавяне на специфична за този тип файлове програма за сливане" @@ -1744,15 +1782,15 @@ msgstr "Добавяне на специфична за този тип файл msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Добавяне в списъка за &игнориране" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Добавяне към лентата за бърз достъп" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Добавяне..." @@ -1760,11 +1798,11 @@ msgstr "Добавяне..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Добавяне/редакция на специфична за тип файлове програма за сравняване/сливане" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Добавен" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1772,25 +1810,25 @@ msgid "" "to the ignore list." msgstr "Шаблона/-ите на имена на файлове са добавени\n%s\nкъм списъка за игнориране." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Добавяне" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Добавя избраните файлове или шаблон за файлове към списъка за игнориране" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Коригиране на настройките\nНастройки" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Допълнителни" @@ -1798,43 +1836,43 @@ msgstr "Допълнителни" msgid "Advanced Diff/Merge Settings" msgstr "Допълнителни настройки на сравняване/сливане" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Допълнителни настройки на сравняване" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Допълнителни настройки на сливане" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Всички" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Всички команди" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Всички файлове (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Всички файлове (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Всички основни" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1842,47 +1880,47 @@ msgstr "" msgid "All tags only" msgstr "Всички тагове само" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Ще загубите всичките си промени! Наистина ли желаете да нулирате всички ленти с инструменти и менюта?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Ще загубите всичките си промени! Наистина ли желаете да нулирате всички клавишни комбинации?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Ще загубите всичките си промени! Наистина ли желаете да нулирате менюто '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Ще загубите всичките си промени! Наистина ли желаете да нулирате лентата с инструменти '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Вече е последна версия." @@ -1898,11 +1936,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "При показване на дата и час винаги се използват настройките на системния локал" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Поправям" @@ -1910,12 +1948,12 @@ msgstr "Поправям" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1926,7 +1964,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1939,34 +1977,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Грешен файлов псевдоним бе свързан с %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Непозната грешка." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Неизвестна грешка при достъп до %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Неизвестен тип на ред бе открит на ред %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "" @@ -1978,11 +2016,11 @@ msgstr "Менюта на приложната рамка:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Кърпене..." @@ -1990,7 +2028,7 @@ msgstr "Кърпене..." msgid "Apply Patches" msgstr "Добавяне на поправки" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -1998,47 +2036,47 @@ msgstr "" msgid "Apply unified diff" msgstr "Кърпене с Unified Diff" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" -msgstr "" +msgstr "Воден стил" #. Resource IDs: (65535) msgid "Arabic" msgstr "Арабски" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Сигурни ли сте, че желаете да отбележите конфликтните файлове като разрешени?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Подреди &вертикално" +msgid "Arrange &vertical\tV" +msgstr "Подреди &вертикално\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Добавен към списъка с промени '%s'" @@ -2047,11 +2085,11 @@ msgstr "Добавен към списъка с промени '%s'" msgid "Assigned to:" msgstr "Присвоено на:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2063,34 +2101,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "В редакция: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Опит за неподдържана операция." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Опит за достъп до %1 след края му." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Опит да се чете от файл %1, отворен за писане." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Опит за запис във файл %1, отворен за четене." @@ -2107,11 +2145,11 @@ msgstr "Удостоверяване" msgid "Authentication data" msgstr "Удостоверения" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Автор" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Поща на автор" @@ -2119,7 +2157,7 @@ msgstr "Поща на автор" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Автор:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Автори" @@ -2139,37 +2177,37 @@ msgstr "" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "" +msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Автоматично скриване" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Автоматично скриване на всичко" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Автоматично затваряне, ако няма конфликти" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Автоматично затваряне, ако няма грешки" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Автоматично затваряне, ако няма сливане, добавяне или изтриване" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2183,7 +2221,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Автоматично" @@ -2193,7 +2231,7 @@ msgstr "Автоматична проверка за &нова версия вс #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Проверка на автотекста" #. Resource IDs: (1157) msgid "Average" @@ -2203,19 +2241,19 @@ msgstr "Средно" msgid "B&rowse..." msgstr "И&збор..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Назад" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Фон" #. Resource IDs: (65535) msgid "Baltic" msgstr "Балтийски" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Лентова диаграма" @@ -2235,7 +2273,7 @@ msgstr "Базов файл:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Базова информация" @@ -2247,45 +2285,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "Big5 (Traditional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "растерно изображение\nрастерно изображение" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" -msgstr "" +msgstr "Черен стил" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Авторство" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Показва кой е автора на промените на всеки ред" @@ -2293,26 +2331,30 @@ msgstr "Показва кой е автора на промените на вс msgid "Blend alpha" msgstr "Бленд алфа" -#. Resource IDs: (156, 626) -msgid "Blue Style" +#. Resource IDs: (156) +msgid "Blocks" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (215, 10009) +msgid "Blue Style" +msgstr "Син стил" + +#. Resource IDs: (10) msgid "Body" msgstr "Основа" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Зададени са едновременно /logmsg и /logmsgfile!\nСамо един от тези параметри може да се зададе." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Двата пътя до пач файла и изберания файл трябва да се абсолютни!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2324,30 +2366,30 @@ msgstr "Из&бор..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Бранш" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2359,11 +2401,11 @@ msgstr "Бранш:" msgid "Bro&wse" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Избор на външна програма за сравняване" @@ -2375,19 +2417,19 @@ msgstr "" msgid "Browse..." msgstr "Избор..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Номер на проблем" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "Bug-ID и&зраз:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Номера на проблеми" @@ -2403,7 +2445,7 @@ msgstr "" msgid "Button Appearance" msgstr "Външен вид на бутоните" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2419,7 +2461,7 @@ msgstr "&Незабавна проверка" msgid "C&ommands:" msgstr "&Команди:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "Съ&здаване на разклонение/етикет от редакцията" @@ -2427,11 +2469,11 @@ msgstr "Съ&здаване на разклонение/етикет от ред msgid "C&urrent Keys:" msgstr "&Текущи клавиши:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Изрязване" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2447,11 +2489,11 @@ msgstr "Изчисли" msgid "Can double-click in log list to compare with previous revision" msgstr "Двойно щракване върху редакция в дневника я сравнява с предишната редакция" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Грешка при активиране на статичен обект тип ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2460,80 +2502,80 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Грешка при копиране на растерно изображение в системния буфер!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Грешка при създаване на ново изображение!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Грешка при персонализиране на менютата!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Грешка при поставяне на растерно изображение от системния буфер!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Отказ" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "" +msgstr "Отмени\nНе сменяй изгледите." -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "" +msgstr "Отмени\nЗапази празния файл." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "" +msgstr "Отмени\nРазреши първо проблемите." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Не може да се покажат промени, заради несъвместими знаци за нов ред във файла." @@ -2545,9 +2587,9 @@ msgstr "&Каскада" msgid "Cascaded context menu" msgstr "Падащо контекстно меню" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Чувствителност към регистъра" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2569,33 +2611,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Промяна на позицията на прозореца" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Промяна на размера на прозореца" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2603,38 +2645,38 @@ msgstr "" msgid "Changed Files" msgstr "Променени файлове" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Променени файлове: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Списъкът с промени %s е преместен" @@ -2643,15 +2685,15 @@ msgstr "Списъкът с промени %s е преместен" msgid "Changes made (double-click on file for diff):" msgstr "Промени (щракнете двойно върху файла за сравнение):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Позиция за показване на гранична линия в поверяващи диалози:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Поставяне на отметка" @@ -2663,31 +2705,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Проверка за обновления..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Про&верка за промени" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Проверете пътя и/или URL, кoйто сте въвели." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Включете за по-кратък формат за час и дата в дневника" @@ -2695,31 +2737,31 @@ msgstr "Включете за по-кратък формат за час и да msgid "Check:" msgstr "Отметка:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Изписване" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2727,11 +2769,11 @@ msgstr "" msgid "Chinese" msgstr "Китайски" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2743,78 +2785,78 @@ msgstr "Изчистване" msgid "Clean Type" msgstr "Изчистен тип" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Почистване" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Изчистване." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Почистването се провали за следните пътища:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Почистването успешно обработи следните пътища:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Изчистване" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Инструмент за изчистване\nИзчистване" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Изчиства кеширани съобщения от дневника от %ld хранилища" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Изчиства запазените удостоверения.\r\nЩе трябва да въвеждате отново Вашите потребителско име и парола за достъп до хранилищата." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Изчиства съхранените данни за позиции и размери на %ld диалогови прозорци" @@ -2823,7 +2865,7 @@ msgstr "Изчиства съхранените данни за позиции msgid "Click here to go to the website" msgstr "Щракнете тук, за да отворите сайта" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Щракнете тук, за да изберете наскоро въведено съобщение" @@ -2839,17 +2881,17 @@ msgid "" "extension" msgstr "Щракнете върху 'Допълнителни', за да укажете друга сливаща програма според разширението" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Системен буфер" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2857,7 +2899,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Клониране на налично хранилище" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Клониране на хранилище" @@ -2865,49 +2907,49 @@ msgstr "Клониране на хранилище" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Клониране..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Затвори" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Изход от цял екран" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Затваряне на прегледа за печат\n&Затваряне" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Ръчно затваряне" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Затваря активния прозорец и напомня да се запишат документите" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Свиване" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2933,7 +2975,7 @@ msgstr "Цветове:" msgid "Combine One Mail" msgstr "Комбинирай една поща" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Комбинирай в едно поверяване" @@ -2941,11 +2983,11 @@ msgstr "Комбинирай в едно поверяване" msgid "Comman&ds:" msgstr "&Команди:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Команда" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Команден ред" @@ -2953,7 +2995,7 @@ msgstr "Команден ред" msgid "Command Line To Execute:" msgstr "Команден ред за изпълнение:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Командата се провали." @@ -2961,41 +3003,41 @@ msgstr "Командата се провали." msgid "Commands" msgstr "Команди" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Поверяване" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Дата на поверяване" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Поща на поверяване" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Край на поверяване" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Информация за поверяване" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Съобщение на поверяване" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Име на поверяване" @@ -3003,7 +3045,7 @@ msgstr "Име на поверяване" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3011,19 +3053,19 @@ msgstr "" msgid "Commit to:" msgstr "Поверяване в:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Поверяване..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Поверявания по автор" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Поверявания по дата" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Поверяване на всеки %s" @@ -3032,15 +3074,15 @@ msgstr "Поверяване на всеки %s" msgid "Commits each week:" msgstr "Поверявания всяка седмица:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Поверява промените Ви на хранилището" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Поща на поверяващ" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3052,52 +3094,52 @@ msgstr "Поверяването на неконтролирана папка н msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Сравняване на &главните редакции" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Сравняване на избраните отпратки" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Сравни два файла" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Сравняване на празните символи" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Сравняване с &база" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Сравняване с предишна редакция" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "При сравняване се вземат под внимание промените в празните символи\nСравняване на празните символи" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Сравнява файла със последната поверена редакция, за да Ви покаже промените, които сте направили" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Сравняване на %s с %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Завършено" @@ -3113,7 +3155,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3147,11 +3189,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Конфликт" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Конфликтни файлове" @@ -3159,15 +3201,15 @@ msgstr "Конфликтни файлове" msgid "Conflict resolved" msgstr "Конфликтът е разрешен" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "С конфликти" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Конфликти" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Конфликти: %d" @@ -3180,124 +3222,124 @@ msgstr "Контекстни менюта:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Продължаване" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Свиване на скачен прозорец" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Копиране" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Копиран" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Копиране" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Копиране на %s в %s, редакция %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Копирай SHA-1 в системния буфер" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Инструмент за копиране\nКопиране" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Копиране на цялата информация в системния буфер" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Копиране и преименуване" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Копирай лог съобщенията в системния буфер" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Копирай лога в системния буфер" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Копиране на пътищата в системния буфер" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Копиране на избраното в системния &буфер" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Копира селекцията и я поставя в системния буфер\nКопиране" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Копиране в системния буфер" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Копиране: ново име за %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Копиране %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Копиране..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Поправки" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Не можа да се добави %s към списъка за игнориране!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Грешка при проверка за по-нова версия!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3305,76 +3347,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Не може да се създаде %1, защото директорията е пълна." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Грешка при установяването на последната поверена редакция!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Грешка при получаване на състоянието!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Не може да се отвори %1, защото са отворени прекалено много файлове." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Грешка при отваряне на файла\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Не може да се премахне %1, защото е текущата директория." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Не можа да се премахне %s от списъка за игнориране" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Грешка при получаване на URL на файла!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3382,7 +3424,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3390,7 +3432,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3398,11 +3440,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Грешка при отпечатване." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3410,11 +3452,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Грешка при стартиране на нишка!" @@ -3422,7 +3464,7 @@ msgstr "Грешка при стартиране на нишка!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3435,15 +3477,15 @@ msgstr "Създаване на &библиотека" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Създай бранш" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Създай бранш от тази версия" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Създай бранш..." @@ -3455,29 +3497,29 @@ msgstr "Създаване на списък с промени" msgid "Create New Branch" msgstr "Създаване на нов бранш" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Създай серийна поправка..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Създай етикет" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Създай етикет от тази версия..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Създай етикет..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Създай нов документ\nНов" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3486,49 +3528,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Създай файл поправка" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Създаден" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Създаване на бранш или етикет" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Създава файл с кръпки, отразяващ разликите между двата файла\nСъздава файл с кръпки" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Създава хранилище на текущото местоположение" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Създава Unified Diff с всички промени, които сте направили" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3540,7 +3582,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Изрязване" @@ -3548,7 +3590,7 @@ msgstr "&Изрязване" msgid "Current" msgstr "Текущ" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Текущ бранш" @@ -3556,7 +3598,7 @@ msgstr "Текущ бранш" msgid "Current Branch:" msgstr "Текущ бранш:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3568,7 +3610,7 @@ msgstr "" msgid "Current version is:" msgstr "Текущата версия е:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Текущата версия е: %s" @@ -3581,7 +3623,7 @@ msgstr "&Настройване..." msgid "Custom" msgstr "Потребителски" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Персонализиране" @@ -3589,19 +3631,19 @@ msgstr "Персонализиране" msgid "Customize Keyboard" msgstr "Персонализиране на клавиатурата" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Персонализиране на лентата за бърз достъп" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Персонализиране на лентата за бърз достъп..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Допълнително..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3615,88 +3657,92 @@ msgstr "Кирилица" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Дата" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Дата на последното поверяване" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "По подразбиране" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Меню по подразбиране" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Меню на приложението по подразбиране. Появява се, ако няма отворени документи." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Знакова кодировка UTF-8 по подразбиране" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Изтриване" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Изтрии всички етикети" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Изтриване и &игнориране на %d обекта по име" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Изтриване и игнориране на %d обекта по &разширение" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Изтрии бранш" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Изтрий бранш/етикет" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Изтрий отдалечен бранш/таг" @@ -3704,34 +3750,34 @@ msgstr "Изтрий отдалечен бранш/таг" msgid "Delete remote tag - TortoiseGit" msgstr "Изтрий отдалечен етикет - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Изтрий отдалечен етикет..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Изтрий подмодул" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Изтрий етикет" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "" +msgstr "Изтрий\nФайлът е премахнат." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Изтрит" @@ -3739,36 +3785,36 @@ msgstr "Изтрит" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Изтрива и добавя избраните файлове или шаблон за файлове към списъка за игнориране" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Изтрива файла-дневник на действията" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Изтриване" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Изтриване на кеширани данни" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Изтриване на файл" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3778,7 +3824,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Дълбочина" #. Resource IDs: (65535) msgid "Describe" @@ -3788,7 +3834,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Описание" @@ -3796,7 +3842,7 @@ msgstr "Описание" msgid "Description:" msgstr "Описание:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Размаркиране на списък с промени" @@ -3804,33 +3850,33 @@ msgstr "Размаркиране на списък с промени" msgid "Destination" msgstr "Цел" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Дискът е пълен." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Откриване и открояване на преместени блокове" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3844,11 +3890,15 @@ msgstr "Размер и позиция на диалоговите прозор msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Diff Опции" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3880,7 +3930,7 @@ msgstr "Файл с разлики:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3892,12 +3942,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3910,19 +3960,19 @@ msgstr "Разлика между" msgid "Diffing" msgstr "Сравняване" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3934,26 +3984,26 @@ msgstr "Директория:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Пълен диск при достъп до %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Изключение при разпределяне: %1" @@ -3962,44 +4012,52 @@ msgstr "Изключение при разпределяне: %1" msgid "Display &buttons in this order" msgstr "Показване на &бутоните в този ред" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Помощна информация за щракнатите бутони, менюта и прозорци\nПомощ" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Помощна информация за текущата задача или команда\nПомощ" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Указания как да се използва системната помощ\nПомощ" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Информация за програмата, версията й и авторското право\nОтносно" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4012,54 +4070,71 @@ msgstr "Без контекстно меню за следните пътища: msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Наистина ли желаете да изтриете лентата с инструменти '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Наистина ли желаете да преместите този файл или папка?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4067,7 +4142,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4075,21 +4150,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4097,21 +4172,21 @@ msgid "" "as resolved?" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Искате ли да възстановите тези автоматично запазени документи?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Желаете ли да презаредите документите, за да се отразят промените?\nЗабележка: ще загубите всичките си промени!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4119,42 +4194,42 @@ msgstr "" msgid "Document :" msgstr "Документ :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Да не се възстановяват автоматично запазените документи. Да се използват последно записаните версии на документите" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "" +msgstr "Не запазвай\nПрезареди изгледа без да запазваш промените" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Да не се показва повече това съобщение" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Готово" @@ -4166,7 +4241,7 @@ msgstr "На долу" msgid "Download" msgstr "Свали" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Плъзнете, за да направите това меню плаващо" @@ -4194,6 +4269,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "Пътища за &изключване:" @@ -4202,7 +4281,7 @@ msgstr "Пътища за &изключване:" msgid "E&xit" msgstr "&Изход" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Износ..." @@ -4222,11 +4301,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Източно европейски" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Редакция" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4242,23 +4321,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Редакция на изображението на бутона" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Промяна на бележките" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Редакция на автора" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Промяна на описание" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Промяна на специфична за типа файлове програма за сравняване" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Промяна на специфична за типа файлове програма за сливане" @@ -4270,11 +4349,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Промени локални git настройки" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Промяна на съобщение в дневника" @@ -4294,25 +4373,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Името или IP адреса на proxy сървъра" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Инструмент за елипси\nЕлипси" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4320,7 +4399,7 @@ msgstr "" msgid "Empty" msgstr "Празни" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "" @@ -4336,7 +4415,7 @@ msgstr "" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4345,10 +4424,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Включени модификации на иконките" @@ -4357,35 +4440,35 @@ msgstr "Включени модификации на иконките" msgid "Encode" msgstr "Кодиране" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Хардуерна входно/изходна грешка по време на достъп до %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Установено е нарушаване на заключване при достъп до %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Установено е нарушаване на споделяне при достъп до %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Невалиден аргумент." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Неочаквана грешка при четене от %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Неочаквана грешка при запис във %1." @@ -4398,11 +4481,11 @@ msgstr "" msgid "End" msgstr "Край" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Разширяване на прозореца на цял екран" @@ -4410,23 +4493,23 @@ msgstr "Разширяване на прозореца на цял екран" msgid "Enter Log Message" msgstr "Въведете съобщение за дневника" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Въведете URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Въведете GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Въведете валута." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Въведете дата и/или време." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Въведете дата." @@ -4434,90 +4517,90 @@ msgstr "Въведете дата." msgid "Enter a name for the changelist:" msgstr "Въведете име за списъка с промени:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Въведете число между %1 и %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Въведете число." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Въведете положително цяло число." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Въведете време." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Въведете цяло число между %1 и %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Въведете цяло число между 0 и 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Въведете цяло число." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Въведете съдържание на файл за тестване по-долу:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Въведете съобщение за &дневника:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Въведете не повече от %1 знака." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Въведете регулярният израз отдолу:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Изтрива всичко\nИзтриване на всичко" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Изтриване на селекцията\nИзтриване" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Грешка" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Грешка при възобновяването на системната кеш-памет за иконки!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4527,28 +4610,28 @@ msgstr "Изпълними файлове (*.exe)|*.exe|Команди (*.com)|* msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Съществуващ" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Изход" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Разширяване (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Разширяване на скачен прозорец" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Отваряне в Windows Explorer на" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Износ" @@ -4556,36 +4639,36 @@ msgstr "Износ" msgid "Export Zip File" msgstr "Експортиране на ZIP файл" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Директория за износ:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Износ и на неконтролираните файлове" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Експортиране %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Износ..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Разширение" @@ -4601,7 +4684,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Външна" @@ -4609,101 +4692,101 @@ msgstr "Външна" msgid "External Program:" msgstr "Външна програма:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Преливане" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Пропаднало отменяне" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Грешка при свързване.\nВъзможно е връзката да е грешна." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Грешка при превръщане на обект ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Грешка при създаване на празен документ." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Грешка при създаване на обект. Проверете дали приложението е въведено в системния регистър." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Грешка при стартиране на системната помощ." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Грешка при стартиране на сървърно приложение." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Грешка при отваряне на документ." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Грешка при изпълнение на сървърна операция." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Грешка при запис на документ." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Грешка при установяване/премахване на група с промени '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Пропаднало!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4711,62 +4794,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Изваждане" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Изтегляне на файл..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Изтегляне на редакция %s на файл:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Файл" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Файлови промени на всеки %s" @@ -4775,27 +4858,27 @@ msgstr "Файлови промени на всеки %s" msgid "File changes each week:" msgstr "Файлови промени всяка седмица:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Промени във файл" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" -msgstr "" +msgstr "Файлът няма конфикти" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." -msgstr "" +msgstr "Файлът е празен." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "файловият списък е празен" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Файлове с кръпки" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4807,7 +4890,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер на файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксела\nВисочина:\t\t\t%ld пиксела\nХоризонтална разделителна способност:\t%.1f точки на инч\nВертикална разделителна способност:\t%.1f точки на инч\nДълбочина:\t\t\t%d бита\nМащаб:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4827,7 +4910,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер на файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксела\nВисочина:\t\t\t%ld пиксела\nХоризонтална разделителна способност:\t%.1f точки на инч\nВертикална разделителна способност:\t%.1f точки на инч\nДълбочина:\t\t\t%d бита\nМащаб:\t\t\t%d%%\n\nРазмер на файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксела\nВисочина:\t\t\t%ld пиксела\nХоризонтална разделителна способност:\t%.1f точки на инч\nВертикална разделителна способност:\t%.1f точки на инч\nДълбочина:\t\t\t%d бита\nМащаб:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4839,7 +4922,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер на файла:\t\t\t%s (%s)\nШирина:\t\t\t%ld пиксела\nВисочина:\t\t\t%ld пиксела\nХоризонтална разделителна способност:\t%.1f точки на инч\nВертикална разделителна способност:\t\t%.1f точки на инч\nДълбочина:\t\t\t%d бита\nМащаб:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4859,7 +4942,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер на файла:\t\t\t%s (%s)\nШирина:\t\t\t%ld пиксела\nВисочина:\t\t\t%ld пиксела\nХоризонтална разделителна способност:\t%.1f точки на инч\nВертикална разделителна способност:\t\t%.1f точки на инч\nДълбочина:\t\t\t%d бита\nМащаб:\t\t\t%d%%\n\nРазмер на файла:t\t\t%s (%s)\nШирина:\t\t\t%ld пиксела\nВисочина:\t\t\t%ld пиксела\nХоризонтална разделителна способност:\t%.1f точки на инч\nВертикална разделителна способност:\t\t%.1f точки на инч\nДълбочина:\t\t\t%d бита\nМащаб:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Име на файл" @@ -4867,17 +4950,17 @@ msgstr "Име на файл" msgid "Files" msgstr "Файлове" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Инструмент за запълване\nЗапълване" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Филтриране по" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Филтър на пътищата" @@ -4889,11 +4972,11 @@ msgstr "Филтър;" msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Търсене" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4903,17 +4986,17 @@ msgstr "Търсене на специфичен текст\nТърсене" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4921,23 +5004,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Завършено!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Първа основа" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Само първите основи" @@ -4946,18 +5029,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Флопи (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Папка" @@ -4969,38 +5052,34 @@ msgstr "" msgid "Font" msgstr "Шрифт" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "За Помощ, натиснете F1. За хоризонтално превъртане превъртане ползвайте клавиша 'Ctrl' и колелцето за превъртане на мишката" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "За пълна история изключете 'Спиране при копиране/преименуване'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Принудително" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5018,20 +5097,20 @@ msgstr "" msgid "Format Patch" msgstr "Формат на пътя" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Напред" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5039,7 +5118,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Намерени думи:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5061,11 +5140,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5073,7 +5152,7 @@ msgstr "" msgid "From:" msgstr "От:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Цял екран" @@ -5081,7 +5160,7 @@ msgstr "Цял екран" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Напълно рекурсивно" @@ -5089,7 +5168,7 @@ msgstr "Напълно рекурсивно" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5097,24 +5176,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplified)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Грешка при инициализация на GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "Грешка при създаване на обект растерно изображение от GDI+. Най-вероятно липсва достатъчно свободна памет." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Събира се информация. Моля, изчакайте..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5144,43 +5223,43 @@ msgstr "Общи::Контекстно меню" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Общи::Диалогови прозорци 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Общи::Диалогови прозорци 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Общи::Диалогови прозорци 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Получаване на дневниците за сливанията" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Получаване на файл %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Получаване на файл %s, редакция %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Получаване на информация..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Получаване на нужната информация..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Получаване на Unified Diff" @@ -5192,23 +5271,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5216,35 +5295,35 @@ msgstr "" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5256,31 +5335,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5301,7 +5380,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5313,47 +5392,47 @@ msgstr "" msgid "Go to line" msgstr "Преход до ред" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Преход до следващият конфликт\nСледващ конфликт" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Преход до следващата разлика\nСледваща разлика" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Преход до предишен конфликт\nПредишен конфликт" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Преход до предишната разлика\nПредишна разлика" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" -msgstr "" +msgstr "Иди на линия" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Диаграма" @@ -5369,11 +5448,11 @@ msgstr "Сив" msgid "Greek" msgstr "Гръцки" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Групиране на списъци с промени" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5389,7 +5468,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5401,7 +5480,7 @@ msgstr "" msgid "Hebrew" msgstr "Иврит" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Помощ" @@ -5425,11 +5504,11 @@ msgstr "Шестнайсетично" msgid "Hide Menus for unversioned paths" msgstr "Скрий менютата за неревизирани папки" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Скриване на скачен прозорец" @@ -5437,25 +5516,25 @@ msgstr "Скриване на скачен прозорец" msgid "Hide the script while running" msgstr "Скриване на скрипта, докато се изпълнява" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Скриване/показване на списъка с файлове с кръпки\nСкрива или показва списъка с файлове с кръпки" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5465,7 +5544,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Съвет: изберете контекстното меню, идете на страницата 'Команди' и плъзнете бутоните за лентата с инструменти в главния прозорец." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Начална директория" @@ -5481,7 +5560,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Закачени скриптове::Интеграция с програми за проследяване на дефекти" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Тип на кука" @@ -5495,9 +5574,9 @@ msgstr "Пътища за &включване:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5505,55 +5584,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5561,15 +5641,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5593,7 +5673,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5601,7 +5681,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5609,7 +5689,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ИД:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5617,16 +5697,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5637,17 +5717,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5659,7 +5739,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5723,7 +5803,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Модификации на иконките" @@ -5735,7 +5815,7 @@ msgstr "Модификации на иконките::Комплект с ико msgid "Icon Overlays::Overlay Handlers" msgstr "Модификации на иконките::Налични модификации" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5745,52 +5825,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Иконки/дизайн/програмиране:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Ако е включено, предотвратява появата на модификациите на иконките и на контекстното меню в диалоговите прозорци 'Запис като...' или 'Отваряне'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Ако е включено, двойно щракване върху редакция в дневника ще я сравни с предишната редакция" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Ако е включено, файловете в неконтролирани папки ще се появяват в елемента за управление,\r\nкойто показва състоянието. Този елемент за управление например се използва в диалоговия прозорец за поверяване." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5803,16 +5883,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Игнориране" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Игнориране на %d обекта по &разширение" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "" @@ -5824,15 +5904,15 @@ msgstr "Игнориране на файл" msgid "Ignore Type" msgstr "Игнориране на тип" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Игнориране на промените в празните символи" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5840,7 +5920,7 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Нечувствителност към &регистъра" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5858,11 +5938,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Игнориране на символите за &край на ред (препоръчително)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5870,29 +5950,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Игнориране на промените в празните символи" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Игнориран" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "При сравняване се игнорират всички промени в празните символи\nИгнориране на всички промени в празните символи" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5910,24 +5990,24 @@ msgstr "Изображение &и текст" msgid "Images" msgstr "Изображения" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Непосредствените деца, включително и папки" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Внос" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5936,16 +6016,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5969,24 +6049,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Включване само на следния обхват от редакции:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Грешно име на файл" -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Първоначален внос" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "" @@ -5998,25 +6078,25 @@ msgstr "Вътрередови разлики" msgid "Input" msgstr "Въвеждане" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Вмъква съдържанието на системния буфер\nПоставяне" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Недостиг на оперативна памет за извършването на тази операция." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Вътрешна програмна грешка." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Невалидна валута." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6024,7 +6104,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6047,7 +6127,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6055,11 +6135,11 @@ msgstr "" msgid "Keep changelists" msgstr "Запис на списъците с промени" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6073,7 +6153,7 @@ msgstr "Клавиатура" msgid "Keyboard shortcuts:" msgstr "Клавишни комбинации:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Клавиши" @@ -6115,21 +6195,41 @@ msgstr "Линия8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Език:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Последен автор" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Последна промяна" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Последна промяна:" @@ -6137,7 +6237,11 @@ msgstr "Последна промяна:" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6145,17 +6249,17 @@ msgstr "" msgid "Least active author:" msgstr "Най-малко активен автор:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Изглед вляво:" @@ -6163,11 +6267,11 @@ msgstr "Изглед вляво:" msgid "Left image" msgstr "Ляво изображение" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Линейна диаграма" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6175,21 +6279,21 @@ msgstr "Инструмент за линии\nЛинии" #. Resource IDs: (32853) msgid "Line diff bar" -msgstr "" +msgstr "Лента с разликите в реда" #. Resource IDs: (65535) msgid "Line differences" msgstr "Редови разлики" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" -msgstr "" +msgstr "Линията е преместена от линия %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" -msgstr "" +msgstr "Линията е преместена на линия %ld" #. Resource IDs: (65535) msgid "Line width" @@ -6199,26 +6303,26 @@ msgstr "" msgid "Line:" msgstr "Ред:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Ред: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Добавени редове" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Премахнати редове" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Изброява темите в системната помощ\nПомощни теми" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6236,23 +6340,23 @@ msgstr "Зареждане на изображенията" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6260,13 +6364,13 @@ msgstr "" msgid "Local Branch" msgstr "Локален бранш" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Локално състояние" @@ -6274,7 +6378,7 @@ msgstr "Локално състояние" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6282,9 +6386,9 @@ msgstr "" #. Resource IDs: (32854) msgid "Locator Bar" -msgstr "" +msgstr "Локатор" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Дневник" @@ -6324,12 +6428,12 @@ msgstr "Съобщения от дневника (Диалогов прозор msgid "Login:" msgstr "Вход:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6340,7 +6444,7 @@ msgstr "" msgid "Lum" msgstr "Осветеност" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6352,14 +6456,10 @@ msgstr "Макинтош" msgid "Mail" msgstr "Поща" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL файлът на системата за електронна поще е невалиден." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6372,47 +6472,47 @@ msgstr "" msgid "Manage" msgstr "Управление" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Отбелязване като разрешен" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Отбелязване за сравнение" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Чувствителност към &регистъра" @@ -6436,7 +6536,7 @@ msgstr "&Менютата показват най-отгоре скоро изп msgid "Menu" msgstr "Меню" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Лента на менюто" @@ -6444,7 +6544,7 @@ msgstr "Лента на менюто" msgid "Menu s&hadows" msgstr "&Сенки в менюто" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Сливане" @@ -6452,34 +6552,34 @@ msgstr "Сливане" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Сливане / повторна интеграция" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Слят" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6487,22 +6587,22 @@ msgstr "" msgid "Merging" msgstr "Сливане" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Сливането изисква различни редакции или различни URL-и за 'От:' и 'Към:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Сливане на редакции %s от %s в %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Съобщение" @@ -6512,9 +6612,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "Израз на част от &съобщение:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Съобщения" @@ -6522,23 +6622,27 @@ msgstr "Съобщения" msgid "Min" msgstr "Мин" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Мой" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Смаляване на панделката" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Минимален брой знаци за съобщение при поверяване:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Други" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Смесен" @@ -6546,35 +6650,35 @@ msgstr "Смесен" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Дата на промяна" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Променен" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Още" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Още бутони" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Още команди..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Още цветове..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Още..." @@ -6594,41 +6698,41 @@ msgstr "Преместване на&долу" msgid "Move &Up" msgstr "Преместване на&горе" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Преместване на обекта надолу" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Преместване на обекта нагоре" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Преместване и преименуване" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Преместване в списък с промени" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Преместване/преименуване" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Преместване: ново име за %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Премества променените файлове в кошчето преди отмяна" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Местене %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Местене..." @@ -6636,13 +6740,13 @@ msgstr "Местене..." msgid "My file:" msgstr "Мой файл:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" -msgstr "" +msgstr "Име" #. Resource IDs: (65535) msgid "Name:" @@ -6650,9 +6754,9 @@ msgstr "Име:" #. Resource IDs: (156) msgid "Navigate" -msgstr "" +msgstr "Навигирай" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6662,11 +6766,11 @@ msgstr "" msgid "Navigation Pane Options" msgstr "Настройки на навигационното пано" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Настройки на навигационното пано..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Вмъкнат" @@ -6678,7 +6782,7 @@ msgstr "Мрежа" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Нов" @@ -6687,43 +6791,43 @@ msgid "New &name:" msgstr "Ново &име:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Нов бранш\\етикет" +msgid "New Branch/Tag" +msgstr "Нов бранш/етикет" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Ново меню" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Ново име за %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Ново име:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6731,33 +6835,29 @@ msgstr "" msgid "Next" msgstr "Следващо" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Следваща страница\nСледваща страница" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" -msgstr "" +msgstr "Следващ конфликт" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" -msgstr "" +msgstr "Следваща разлика" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" -msgstr "" - -#. Resource IDs: (73) -msgid "No" -msgstr "Не" +msgstr "Следваща вътрередова разлика" #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6769,102 +6869,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Не е указана стойност на командата!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Няма открити разлики!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Няма налично съобщение за грешка." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Няма грешки." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Няма файлове за показване при текущите настройки.\nВключете една или повече опции по-долу за да видите неконтролираните, игнорираните и/или непроменените файлове.\nЗа да видите отдалечените промени, щракнете на 'Проверка в хранилището'." +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." +"the last commit." msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Няма налична диаграма" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Не е открит преобразовател на изображения за %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Няма правописни грешки" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Без кеш на състоянието. Само контролирани папки имат модификация на иконката, файловете - не." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Няма предложения за синоними" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6872,11 +6977,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Никакъв" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Нормален" @@ -6888,30 +6993,30 @@ msgstr "" msgid "North European" msgstr "Северно европейски" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Не всички записи в системния регистър (или INI файлът) са премахнати." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Недостиг на оперативна памет за извършването на тази операция." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Недостиг на памет!\nПробвайте да намалите размера на диаграмата на редакциите\nили чрез свиване на възли, или чрез намаляване на мащаба." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6919,7 +7024,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6938,26 +7043,26 @@ msgstr "Забележка: папката съдържа неконтролир msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Бележки" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Забележка" @@ -6965,7 +7070,7 @@ msgstr "Забележка" msgid "Number Commits" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Брой %s" @@ -6978,7 +7083,7 @@ msgstr "Брой автори:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7050,41 +7155,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" -msgstr "" +msgstr "Офис 2007 цветове" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7092,15 +7197,15 @@ msgstr "" msgid "Older lines" msgstr "По-стари редове" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Намерени са един или повече запазени документи." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Един или повече файлове са в конфликтно състояние." @@ -7112,29 +7217,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Само деца от тип файлове" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Разрешени са само числа (евентуално разделени\nсъс запетаи)!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Само този обект" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Отваряне" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7144,51 +7249,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Отваряне от системния буфер" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Отваряне на файл с изображение..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Отваряне на съдържащата папка" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Отваряне с..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Отваря системната помощ\nПомощни теми" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Опция" @@ -7197,30 +7303,30 @@ msgid "Options" msgstr "Настройки" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "&Оригинален размер" +msgid "Ori&ginal size\tS" +msgstr "&Оригинален размер\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Пана на другите задачи" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Други" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Недостиг на оперативна памет." @@ -7228,7 +7334,7 @@ msgstr "Недостиг на оперативна памет." msgid "Output Directory" msgstr "Изходна директория:" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7236,20 +7342,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Страница %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7260,15 +7370,15 @@ msgstr "Страница %u\nСтраници %u-%u\n" msgid "Page :" msgstr "Страница :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Панел 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Панел 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Параметри" @@ -7276,25 +7386,25 @@ msgstr "Параметри" msgid "Parameters:" msgstr "Параметри:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7306,39 +7416,39 @@ msgstr "" msgid "Password" msgstr "" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Парола:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" +msgstr "Постави" + +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2751) +msgid "Paste &last commit message" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Инструмент за поставяне\nПоставяне" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Поставяне на списъка с файлове" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Поставя път от тип SVN от системния буфер и в резултат има преместване или копиране" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Път" @@ -7354,54 +7464,54 @@ msgstr "Кърпене на &избраният обект" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Кърпене на всички файлове" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Кърпене на избраните файлове" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Кърпене" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Път" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." -msgstr "" +msgstr "Пътя намери, че съвпада с парчто по-добре." #. Resource IDs: (1580, 65535) msgid "Path:" msgstr "Път:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Пътища" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Инструмент за молив\nМолив" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Дял от авторството" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Проценти" @@ -7409,24 +7519,24 @@ msgstr "Проценти" msgid "Personalized Menus and Toolbars" msgstr "Персонализирани менюта и ленти с инструменти" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7436,56 +7546,56 @@ msgstr "Картинка (Метафайл)\nкартинка" msgid "Picture:" msgstr "Картинка:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Кръгова диаграма" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Моля, укажете закачен скрипт за изпълнение." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Моля, укажете път, в който да се приложи закаченият скрипт." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Моля, изберете тип на закачения скрипт" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Моля, изчакайте отменянето..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Моля, изчакайте докато се получават разликите..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Моля, изчакайте..." @@ -7501,11 +7611,11 @@ msgstr "Порт :" msgid "Port:" msgstr "Порт :" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Кука след поверяване" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7513,23 +7623,23 @@ msgstr "" msgid "Pre&v Page" msgstr "&Предна страница" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Кука преди поверяване" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "" @@ -7541,11 +7651,11 @@ msgstr "Натиснете &нова клавишна комбинация:" msgid "Press &new shortcut key:" msgstr "Натиснете &нова клавишна комбинация:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Преглед" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Преглед на закърпения файл" @@ -7557,51 +7667,51 @@ msgstr "Преглед:" msgid "Previous" msgstr "Предишно" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Предна страница\nПредна страница" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" -msgstr "" +msgstr "Предишен конфликт" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Печат" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Разпечатване на документ\n&Печат" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Печатане във файл" @@ -7609,7 +7719,7 @@ msgstr "Печатане във файл" msgid "Printer :" msgstr "Принтер :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Printer Files (*.prn)|*.prn|Всички файлове (*.*)|*.*||" @@ -7617,11 +7727,11 @@ msgstr "Printer Files (*.prn)|*.prn|Всички файлове (*.*)|*.*||" msgid "Printing" msgstr "Печатане" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Програма" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Програми (*.exe)|*.*|Всички файлове (*.*)|*.*||" @@ -7629,11 +7739,11 @@ msgstr "Програми (*.exe)|*.*|Всички файлове (*.*)|*.*||" msgid "Progress" msgstr "Развитие" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Свойство" @@ -7641,17 +7751,17 @@ msgstr "Свойство" msgid "Property Page" msgstr "Страница за свойствата" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Доставчик" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "&Параметри на доставчика:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Доставчик uuid win&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7673,15 +7783,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Дърпане" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7689,19 +7799,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Бутане" @@ -7717,11 +7827,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7729,22 +7839,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Изход от програмата; напомня да се запишат документите\nИзход" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7762,11 +7872,15 @@ msgstr "&RAM устройства" msgid "R&eset" msgstr "&Нулиране" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "От&мяна до тази редакция" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7774,7 +7888,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7796,7 +7910,7 @@ msgstr "" msgid "Re&movable drives" msgstr "&Сменяеми устройства" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "&Преименуване..." @@ -7812,15 +7926,15 @@ msgstr "&Нулиране на всичко" msgid "Re&store defaults" msgstr "&Възстановяване на настройките по подразбиране" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Отмяна..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Прочетете 'Упътване за всекидневна употреба' преди да 'затънете'..." @@ -7828,21 +7942,21 @@ msgstr "Прочетете 'Упътване за всекидневна упо msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Последни" @@ -7854,21 +7968,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Наскоро променени редове" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Само запис" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Възстанови и отвори автоматично запазените документи, вместо последните записани версии" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7882,17 +7996,21 @@ msgstr "" msgid "Recursive" msgstr "Рекурсивно" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Възстановявa отменено преди това действие\nВъзстановяване" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Смали прозореца до иконка" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7900,31 +8018,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Опресняване" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7936,7 +8054,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7955,7 +8073,7 @@ msgid "" "\\s : whitespaces" msgstr "Филтър с регулярни изрази:\r\n. : всеки знак\r\nc+ : съвпада със знака 'c' един или повече пъти\r\nc* : съвпада със знака 'c' нула или повече пъти\r\n^ : начало на ред\r\n$ : край на ред\r\n(string){n} : съвпада с низа 'string' n-пъти\r\n(abcd) : подизраз\r\n[aei0-9] : съвпада с a,e,i и 0..9\r\n[^aei0-9] : всичко, освен a,e,i и 0..9\r\n\r\n\\w : съвпада с a-z,A-Z,0-9 и _\r\n\\W : всеки небуквено-цифров знак\r\n\\d : цифри 0-9\r\n\\s : празни символи" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Отменени остатъци за '%s'" @@ -7968,7 +8086,7 @@ msgstr "Относителни времена в дневника" msgid "Reload" msgstr "Презареждане" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8002,19 +8120,19 @@ msgstr "" msgid "Remote Branch" msgstr "Отдалечен бранш" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Отдалечено състояние" @@ -8026,12 +8144,12 @@ msgstr "Отдалечено:" msgid "Remove" msgstr "Премахване" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Премахване на %ld обекта" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Премахване на %s" @@ -8040,7 +8158,7 @@ msgstr "Премахване на %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8048,21 +8166,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Премахване от списъка за &игнориране" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Премахване от лентата за бърз достъп" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Премахване от списъка с промени" @@ -8074,7 +8192,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8082,11 +8200,11 @@ msgstr "" msgid "Removed" msgstr "Премахнат" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Премахнат от списъка с промени" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8094,7 +8212,7 @@ msgid "" "from the ignore list." msgstr "Шаблона/-ите на имена на файлове са премахнати\n%s\nот списъка за игнориране." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Премахва избраните файлове или шаблон за файлове от списъка за игнориране" @@ -8102,11 +8220,11 @@ msgstr "Премахва избраните файлове или шаблон msgid "Rena&me..." msgstr "&Преименуване..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Преименуване" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Преименуване на %s" @@ -8115,20 +8233,20 @@ msgstr "Преименуване на %s" msgid "Rename - TortoiseGit" msgstr "Преименуване - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Преименувай/премести" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8138,7 +8256,7 @@ msgstr "Повтаря последното действие\nПовторени msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8152,12 +8270,12 @@ msgstr "" msgid "Replace:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Замяна" @@ -8181,11 +8299,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Изисква потребителско име и парола" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Нулиране" @@ -8197,25 +8315,25 @@ msgstr "&Нулиране на всичко" msgid "Reset Type" msgstr "Нулиране на тиб" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Нулиране на колони" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Разрешаване" @@ -8223,126 +8341,122 @@ msgstr "Разрешаване" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Разрешаване на конфликт, използвайки 'моя'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Разрешаване на конфликт, използвайки 'техния'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Разрешен" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Разрешен:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Разрешава конфликтни файлове" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Възтановяване" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Възстановяване на настройките по подразбиране" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" -msgstr "" +msgstr "Възстанови след поверяване" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Възстановяване на прозореца до нормален размер" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Възстановен" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Нов опит" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Отменяне" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Отменен" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Отменя всички промени, които сте направили след последното обновяване" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Отменя добавяне за контролиране" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Редакция" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Редакция %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Редакция %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Диаграма на редакциите" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8358,31 +8472,31 @@ msgstr "Филтър за диаграмата на редакциите" msgid "Revision graph" msgstr "Диаграма на редакциите" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Редакция:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Оформен текст (RTF)\nтекст с оформление за шрифт и абзац" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Изглед вдясно:" @@ -8390,21 +8504,21 @@ msgstr "Изглед вдясно:" msgid "Right image" msgstr "Дясно изображение" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Ред %d от %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Ред %d-%d от %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Ред надолу" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Ред нагоре" @@ -8412,11 +8526,11 @@ msgstr "Ред нагоре" msgid "S&elect..." msgstr "&Избор..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Бутоните - на един ред" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Бутоните - на два реда" @@ -8424,25 +8538,33 @@ msgstr "&Бутоните - на два реда" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Показване на лента за бърз достъп под панделката" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "С&татистика" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8452,7 +8574,7 @@ msgstr "" msgid "SMTP Server:" msgstr "SMTP сървър:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8460,31 +8582,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8496,15 +8618,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8520,37 +8642,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Примерен текст:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" -msgstr "" +msgstr "Съхраняване" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Запис &като..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Запис &като...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Запис като" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8558,13 +8684,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8572,74 +8698,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" -msgstr "" +msgstr "Съхраняване като" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Запис като..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "" +msgstr "Запази като\nКъде да бъде запазен файла" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Да се запишат ли промените в %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." -msgstr "" +msgstr "Запази промените." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Запис на &редакция в..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8661,13 +8787,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "" +msgstr "Запази\nЗапази файлът с конфликтите." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8679,28 +8805,28 @@ msgstr "" msgid "Saved Data" msgstr "Съхранени данни" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Претърсване" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Превъртане на ляво" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Превъртане на дясно" @@ -8708,7 +8834,7 @@ msgstr "Превъртане на дясно" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "&Търсене в дневника..." @@ -8720,20 +8846,20 @@ msgstr "" msgid "Search for:" msgstr "Търсене за:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Търсене на по-подходящ път за налагане на кръпката..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Търсенето се провали на %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Избиране" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "&Избиране на всички" @@ -8749,59 +8875,59 @@ msgstr "Изберете &контекстно меню:" msgid "Select &window:" msgstr "&Избор на прозорец:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Инструмент за избор на цвят\nИзбор на цвят" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Избор на файл..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Избор на SSH клиент" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Изберете бутон." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Избор на обект, за който да се получи помощ" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Маркиране на списък с промени" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Избор на програма за сравняване" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Изберете папка, която да се свърже с тази програма за проследяване на дефекти" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Изберете папка, в която да се изнесе.\nВъзможно е да се наложи да създадете нова папка преди да се извърши този износ." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Изберете папка, за която да се изпълнят скриптове" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Изберете папка, в която да се запишат файловете" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Изберете файл със закачен скрипт" @@ -8809,20 +8935,20 @@ msgstr "Изберете файл със закачен скрипт" msgid "Select items automatically" msgstr "Автоматично маркиране на обектите" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Избор на програма за сливане" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Избор на цел на сливането" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "Изберете поведението на диалоговия прозорец, показващ хода на операцията, след нейния край." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8832,17 +8958,21 @@ msgstr "Маркира целият документ\nМаркиране – в msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Изберете език за този проект. Тази настройка засяга проверката на правописа на съобщенията при поверяване." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Избор на програма за разглеждане на Diff файлове" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8852,7 +8982,7 @@ msgstr "" msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8860,7 +8990,7 @@ msgstr "" msgid "Send" msgstr "Изпращане" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Изпращане на писмо" @@ -8868,11 +8998,11 @@ msgstr "Изпращане на писмо" msgid "Send Mail after create" msgstr "Изпращане на писмо след създаване" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "'Изпращане на поща' не можа да изпрати съобщение." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Изпращане на писмо..." @@ -8880,19 +9010,19 @@ msgstr "Изпращане на писмо..." msgid "Send Patch" msgstr "Изпращане на поправка" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Изпращане на поправка чрез писмо" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Изпращане на съдържание" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Изпращане..." @@ -8912,28 +9042,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Установяване на свойства..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Настройки" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Настройки - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Обвивка" @@ -8941,7 +9071,7 @@ msgstr "Обвивка" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Системната кеш-памет за иконки беше възобновена!" @@ -8953,7 +9083,7 @@ msgstr "" msgid "Short &date/time format in log messages" msgstr "&Кратък формат за дата/час в дневника" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Съкратен списък със свойства" @@ -8965,7 +9095,7 @@ msgstr "Показване" msgid "Show &Accelerator for:" msgstr "Показване на &кратък клавиш за:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8973,15 +9103,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "&Промени" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "&Дневник" @@ -8989,15 +9119,19 @@ msgstr "&Дневник" msgid "Show &log..." msgstr "&Дневник..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "&Модификации на иконките и контекстно меню - само в Windows Explorer" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Показване над панделката" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Показване под панделката" @@ -9005,35 +9139,35 @@ msgstr "Показване под панделката" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Показване на по-малко бутони" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Показване на възли за главната редакция" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Показва вътрередовите разлики дума по дума\nВътрередови разлики - по думи" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Показване на повече бутони" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Показване на лента за бърз достъп над панделката" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Показване на лента за бърз достъп под панделката" @@ -9041,11 +9175,11 @@ msgstr "Показване на лента за бърз достъп под п msgid "Show Screen&Tips on toolbars" msgstr "Показване на &екранни съвети на лентите с инструменти" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Преглед на цялата диаграма" @@ -9053,7 +9187,7 @@ msgstr "Преглед на цялата диаграма" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9061,11 +9195,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Показване на промените като &unified Diff" @@ -9085,15 +9219,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9105,11 +9239,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "&Пълно меню след кратко забавяне" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9125,7 +9263,7 @@ msgstr "" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9133,90 +9271,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "&Номерация на редовете" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Показва дневник" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Показва дневник..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Най-старият възел - на върха" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Показване или скриване на лентата с разликите\nПревключване на лентата с разликите" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Показване или скриване на локатора\nПревключване на локатора" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Показване или скриване на лентата за състоянието\nПревключване на лентата за състоянието" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Показване или скриване лентата с инструменти\nПревключване на лентата с инструменти" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Показване на свойствата на редакцията" @@ -9224,7 +9362,7 @@ msgstr "Показване на свойствата на редакцията" msgid "Show shortcut &keys in ScreenTips" msgstr "Показване на &клавишните комбинации в екранните съвети" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9234,7 +9372,7 @@ msgstr "" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9246,45 +9384,43 @@ msgstr "" msgid "Show un&versioned files" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Показване/Скриване" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Графично представяне на копията/етикетите/разклоненията" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Показване на всички файлове, променени след последното обновяване - локално или в хранилището" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Отваря файла-дневник на действията в текстовия редактор по подразбиране" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9296,7 +9432,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "" @@ -9304,20 +9440,20 @@ msgstr "" msgid "Since" msgstr "След" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Размер" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Пропусни" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9325,23 +9461,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Прескочен" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Прескочени липсващи цели" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Плъзване" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9349,13 +9485,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9369,7 +9505,7 @@ msgstr "Подреждане по брой поверявания" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9379,49 +9515,53 @@ msgstr "Указва максималния брой съобщения, кои msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Разделяне на редовете" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Разделяне на активния прозорец на пана\nРазделяне" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Смачкване" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Диаграма с насложени ленти" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Диаграма с насложени линии" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Стандартен" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Стартиране на закачен скрипт при поверяване" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" @@ -9429,7 +9569,7 @@ msgstr "" msgid "Start registry editor" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9441,39 +9581,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Статичен" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Статистика" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Състояние" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Настройки на лентата за състоянието" @@ -9485,32 +9633,32 @@ msgstr "Цветове за състояния и действия" msgid "Status cache" msgstr "Кеш на състоянието" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Кеш на състоянието на само една папка, без рекурсивни модификации на иконките" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9518,15 +9666,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "" @@ -9534,7 +9682,7 @@ msgstr "" msgid "Submodule" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9542,7 +9690,7 @@ msgstr "" msgid "Submodule Add" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9550,15 +9698,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9566,7 +9714,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9581,15 +9729,15 @@ msgstr "" msgid "Submodules" msgstr "Подмодули" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Успешно" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Превключи" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "" @@ -9598,43 +9746,43 @@ msgstr "" msgid "Switch To" msgstr "Смяна на" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Превключване обратно към предишното пано на прозореца\nПредишно пано" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Превключване между изглед с единично или двойно пано\nПревключване между изглед с единично или двойно пано" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Разменяне на съдържанието на левия и десния изглед\nРазменя левия с десния изглед" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Превключване към следващият прозорец на документа" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Превключване към следващото пано на прозореца\nСледващо пано" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Превключване към предишния прозорец на документа" @@ -9642,21 +9790,21 @@ msgstr "Превключване към предишния прозорец на msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Размяна на ляво с дясно при сравняване" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9666,23 +9814,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Синхронизиране..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9692,13 +9840,13 @@ msgstr "Записи в системният регистър са били пр msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9712,7 +9860,7 @@ msgstr "Заместител на страница" msgid "Tab size:" msgstr "Размер на табулатора:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Етикет" @@ -9720,16 +9868,16 @@ msgstr "Етикет" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Етикети" @@ -9737,11 +9885,11 @@ msgstr "Етикети" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Задачи" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Панел на задачите" @@ -9753,11 +9901,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Само за тест" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9765,13 +9913,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9779,64 +9933,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Размера на блока с код не съвпада с броя на добавените/премахнатите редове!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Механизмът за сравнение прекъсна работа заради грешка:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Файлът %s не съществува!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Файлът %s не бе открит във файлът с кръпки!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9845,15 +10013,15 @@ msgid "" "Do you want to remove the file?" msgstr "Файлът \n%s\nе празен.\nЖелаете ли да го изтриете?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Файлът е прекалено голям" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Този файл е прекалено голям, за да бъде отворен." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9861,7 +10029,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Файлът\n%s\nвече съществува! Желаете ли да го презапишете?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9869,14 +10037,14 @@ msgid "" "is not a valid text file!" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Папката %s\nсъдържа неконтролирани и/или променени файлове. Желаете ли въпреки това да ги премахнете?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9885,78 +10053,78 @@ msgid "" "Would you like to create it first?" msgstr "Папката \n%s\nне съществува.\nБихте ли желали първо да бъде създадена?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Закаченият скрипт върна грешка:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Изображението не може да бъде показано." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Доставчикът на проследяване на дефекти не може да бъде създаден. Моля, проверете дали е инсталиран правилно." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Доставчикът на проследяване на дефекти не можа да провери низа-параметър." -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Редът, указващ новият файл, се очакваше на ред %d!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Максимален брой редове в дневника на действията.\nВсеки нов ред над този лимит изтрива най-стария ред във файла." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Операцията се провали." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Параметрите '/path' и '/pathfile' са взаимно изключващи с.\nТрябва да подадете само един от тях." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9966,7 +10134,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9977,7 +10145,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9988,36 +10156,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "Този регулярен израз е невалиден!\nМоля, въведете валиден регулярен израз." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Избраният файл все още съдържа маркери за налични конфликти.\nСигурни ли сте, че желаете да отбележите файла като разрешен?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10025,7 +10200,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10034,7 +10209,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10043,26 +10218,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Време (в секунди), след изтичането на което спира разбора на избраните файлове.\r\nПо-малка стойност ще покаже списъка за автоматично дописване по-скоро,\r\nно вероятно без да са прегледани всички файлове." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Двата избрани URL-а не са създадени от един и същ корен.\nНевъзможно е да бъдат показани съобщения от дневника между тях!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10072,34 +10247,34 @@ msgstr "" msgid "Their file:" msgstr "Техният файл:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Техен" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Няма доставчици на проследяване на дефекти." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10108,85 +10283,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Все още има неразрешени конфликти на ред %d!\nБи трябвало да разрешите тези конфликти преди да запишете.\nЖелаете ли да запишете файла с неразрешени конфликти?\nАко изберете 'Да', ще трябва да разрешите конфликтите ръчно в друг текстов редактор!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Има незаписани промени!\nЖелаете ли да запишете промените си?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Синонимен речник" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Това са по-скоро запазени документи от отворените в момента,които съдържат промени направени преди затварянето на програмата." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Това не е валиден URL.\nМоля, въведете URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Тази програма е свързана с липсващ износ %s във файла %s. Тази система вероятно има несъвместима версия на %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Програмата изисква файлът %s, който не е открит в тази система." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Това свойство е позволено за папки, но не и за файлове." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Ще бъде изтрит записа на командите, които сте използвали в тази програма и ще се възстанови началното положение на видимите команди в менютата и лентите с инструменти. Няма да бъдат отменени никакви изрични персонализации . Сигурни ли сте, че желаете това?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10202,14 +10377,14 @@ msgstr "&Хоризонтално подреждане" msgid "To" msgstr "До" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10221,13 +10396,13 @@ msgstr "" msgid "To:" msgstr "До:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Превключване между показване на една или две страници\nПревключване между показване на една или две страници" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10239,11 +10414,11 @@ msgstr "Лента с инструменти" msgid "Toolbar Name" msgstr "Име на лентата с инструменти" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Настройки на лентите с инструменти" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Вътрешна грешка на лента с инструменти. Моля, обърнете се към доставчика на тази програма." @@ -10259,16 +10434,16 @@ msgstr "Инструменти" msgid "Tools:" msgstr "Инструменти:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10278,20 +10453,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" @@ -10300,18 +10475,18 @@ msgstr "" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10327,7 +10502,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10335,7 +10510,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10349,36 +10524,36 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10417,11 +10592,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Прехвърляне на %s" @@ -10430,39 +10605,35 @@ msgstr "Прехвърляне на %s" msgid "Transparent &color..." msgstr "Прозрачен &цвят..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Опитайте командата 'Почистване'. Ако и това не помогне, ще трябва да направите ново изписване." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Нов опит" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Тип" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10486,24 +10657,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Грешка при стартиране на системата за електронна поща." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Невъзможно е да се обработи командата - сървърът е зает." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Грешка при при четене от %1 - отворен е от някой друг." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Невъзможно е да се чете свойство само за установяване." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10511,91 +10682,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Невъзможно е да се променя свойство само за четене." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Грешка при запис в %1 - или е само за четене, или е отворен от някой друг." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Премахване на отметка" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Отмяна на %d действия" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Отмяна на едно действие" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Неочакван файлов формат." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Разгъване" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Неформатиран текст\nтекст без формат" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Унифицирани &разлики на главните редакции" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Неизвестна дълбочина" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" +msgstr "Неразрешени конфликти!" + +#. Resource IDs: (1558) +msgid "Unset tracked branch" msgstr "" -#. Resource IDs: (3841) +#. Resource IDs: (61443) msgid "Untitled" msgstr "Неозаглавен" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Неконтролирани" @@ -10603,7 +10778,7 @@ msgstr "Неконтролирани" msgid "Unversioned files mark parent folder as modified" msgstr "Неконтролираните файлове бележат съдържащата ги папка като променена" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "" @@ -10614,25 +10789,25 @@ msgstr "" #. Resource IDs: (1710) msgid "Update" -msgstr "" +msgstr "Обновяване" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Обновен" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Обновяване на обекти тип ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10644,30 +10819,26 @@ msgstr "Използване на изображението по &подраз msgid "Use &one-pane view as default for 2-file diff" msgstr "Изглед с &единично пано по подразбиране при сравняване на два файла" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Използване на &другия текстов блок" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10688,15 +10859,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Използване на Unified Diff от системния &буфер" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10706,7 +10877,7 @@ msgstr "Използване на цялото съдържание на лев msgid "Use block from left before right" msgstr "Използване на левия блок преди десния" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10716,25 +10887,25 @@ msgstr "Използване на блока от левия изглед пре msgid "Use block from right before left" msgstr "Използване на десния блок преди левия" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Използване на блока от десния изглед преди блока от левия изглед\nИзползване на блока от дясно преди този от ляво" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Използване и на двата текстови блока (този пръв)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Използване и на двата текстови блока (този последен)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "" @@ -10750,15 +10921,15 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Използване на кошчето при отмяна" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "С регулярни изрази" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "" @@ -10766,61 +10937,61 @@ msgstr "" msgid "Use system locale for date/time" msgstr "Използване на системния локал за дата и час" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Използване на текстовият блок от '&моя'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Използване на текстовият блок от '&техния'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Използване на текстовият блок от '&моя' преди 'техния'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Използване на текстовият блок от 'моя' преди 'техния'\nИзползване на 'моя' текстов блок и тогава 'техния'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Използване на текстовият блок от 'моя'\nИзползване на 'моя' текстов блок" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Използване на текстовият блок от '&техния' преди 'моя'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Използване на текстовият блок от 'моя' преди 'техния'\nИзползване на 'моя' текстов блок и тогава 'техния'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Използване на текстовият блок от 'техния'\nИзползване на 'техния' текстов блок" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Използване на текстовият блок от левия изглед\nИзползване на левия блок" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Използване на &този текстов блок" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10828,7 +10999,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10840,19 +11011,19 @@ msgstr "" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Използване на &този файл изцяло" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Използване на &другият файл изцяло" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10868,11 +11039,11 @@ msgstr "" msgid "User Name:" msgstr "Потребител:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Отменено от потребителя" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10882,11 +11053,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Потребителско име:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10905,7 +11076,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Стойност" @@ -10913,24 +11084,24 @@ msgstr "Стойност" msgid "Version" msgstr "Версия" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Версия 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Версия 2 (База)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10938,11 +11109,11 @@ msgstr "" msgid "Version Information" msgstr "Информация за версията" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Версия:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Контролиран" @@ -10954,23 +11125,27 @@ msgstr "" msgid "View" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Виж пътя" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Виж поправката>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Преглед на редакция на път в &уеб-визуализатора" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "" @@ -10982,11 +11157,11 @@ msgstr "" msgid "Visit our website" msgstr "Посетете нашия сайт" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10997,7 +11172,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ВНИМАНИЕ!\r\nПроменяйте тези настройки само ако сте съвсем сигурни, че знаете какво правите!\r\nЗа да върните стойностите по подразбиране, изтрийте текста им." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Изчакване" @@ -11005,7 +11180,7 @@ msgstr "Изчакване" msgid "Wait for the script to finish" msgstr "Изчакване на края на изпълнението на скрипта" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11013,15 +11188,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Предупреждение" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Внимание!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11029,7 +11204,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Уеб" @@ -11037,56 +11212,56 @@ msgstr "Уеб" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Ако е включено, контролираните обекти, включени в списъка на диалоговия прозорец за поверяване, са маркирани автоматично" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11096,15 +11271,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Празни символи" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Позицията на прозореца" @@ -11112,15 +11287,15 @@ msgstr "Позицията на прозореца" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11164,11 +11339,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Работно дърво" @@ -11176,29 +11351,25 @@ msgstr "Работно дърво" msgid "Working Tree Path:" msgstr "Път към работното дърво:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Да" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "'Да' за всички" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Вече имате инсталирана най-новата версия." @@ -11208,51 +11379,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Тук може да изключите определени модификации на иконките.\nИзключените модификации няма да заемат слот за модификация и ще дадат шанс на други разширения на обвивката да покажат техните модификации." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Може да поставите растерно изображение само с размери (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Не можете да създадете повече от %d потребителски ленти с инструменти!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Това свойство не може да се установи на папки, а само на файлове!\nАко желаете да го установите на всички файлове в тази папка,\nтрябва да включите 'рекурсивно'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Променили сте свойства без да сте ги записали.\nЖелаете ли да ги запишете сега?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11260,67 +11431,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Не сте въвели номер на проблем.!\nСигурни ли сте, че желаете да поверите без да задавате номер на проблем?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Можете да дефинирате най-много %d инструмента." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "За да влязат в сила промените, трябва да рестартирате системата си." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Избрали сте неконтролиран файл.\nФайлът ще бъде добавен за контролиране преди да бъде поверен." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Трябва да въведете текст!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Трябва да изберете изображение!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11330,7 +11501,7 @@ msgstr "Вашите скорошни съобщения са запазени.\ msgid "Your version is:" msgstr "Вашата версия е:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Вашата версия е: %d.%d.%d.%d" @@ -11340,10 +11511,10 @@ msgid "Zip File" msgstr "ZIP файл" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "С&маляване" +msgid "Zoo&m out\t-" +msgstr "С&маляване\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Увеличаване" @@ -11355,80 +11526,80 @@ msgstr "&Увеличаване" msgid "Zoom &Out" msgstr "&Смаляване" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Мащаб 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Увеличаване\nУвеличаване" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Смаляване\nСмаляване" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "&Увеличаване" +msgid "Zoom i&n\t+" +msgstr "&Увеличаване\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Увеличаване" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Смаляване" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Оптимален мащаб" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Оптимален мащаб по височина" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Оптимален мащаб по ширина" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[По подразбиране]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Неприсвоен]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11442,7 +11613,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "добавен" @@ -11450,7 +11621,7 @@ msgstr "добавен" msgid "added files" msgstr "добавени файлове" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "неозаглавен файл" @@ -11458,14 +11629,19 @@ msgstr "неозаглавен файл" msgid "and support the developers" msgstr "и подкрепете разработчиците" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "автор" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11498,30 +11674,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "поверявания" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "с конфликти" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "ден" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "изтрит" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11533,7 +11709,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11542,16 +11718,16 @@ msgid "" "%s" msgstr "изнесени\n%s\nв\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "външни" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "игнориран" @@ -11559,23 +11735,23 @@ msgstr "игнориран" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "недовършен" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "обект, запазен местно" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "пази файловите списъци на английски" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11584,7 +11760,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11597,13 +11773,13 @@ msgstr "" #. Resource IDs: (1494) msgid "master" -msgstr "" +msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "слят" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "липсващ" @@ -11611,7 +11787,7 @@ msgstr "липсващ" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "променен" @@ -11619,7 +11795,7 @@ msgstr "променен" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "месец" @@ -11627,40 +11803,44 @@ msgstr "месец" msgid "new branch" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "не" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "не е налично описание за тази команда" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "неконтролиран" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "нормален" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "задръстен" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "на %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "точки" @@ -11668,11 +11848,11 @@ msgstr "точки" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "тримесечие" @@ -11680,35 +11860,35 @@ msgstr "тримесечие" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "заменени" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "път за претърсване:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "превключено към\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "към %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "към %s" @@ -11717,35 +11897,35 @@ msgstr "към %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "седмица" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "година" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "да" diff --git a/Languages/Tortoise_ca.po b/Languages/Tortoise_ca.po index 7d92a1cdc..b9648c3b7 100644 --- a/Languages/Tortoise_ca.po +++ b/Languages/Tortoise_ca.po @@ -6,16 +6,20 @@ # Translators: # TempEmail.net , 2013 # Adrià Vilanova Martínez , 2012 +# el_libre como el chaval , 2011 +# Haommin , 2014 +# Joan Monguillot , 2013 # Joan Monguillot , 2013 # el_libre como el chaval , 2011 -# Sven Strickroth , 2013 +# Lübbe TortoiseSVN , 2013 +# Sven Strickroth , 2013,2015 # TempEmail.net , 2013 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/tortoisegit/language/ca/)\n" "MIME-Version: 1.0\n" @@ -24,7 +28,7 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -46,138 +50,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autors mostrats individualment:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "" +msgstr "%.2f MiB copiats" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 conté un objecte no esperat." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 conté un camí incorrecte." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 conté un esquema incorrecte." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 té un format incorrecte" -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 no ha sigut trobat." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "fa %1!d! dia" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "fa %1!d! dies" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "fa %1!d! hora" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "fa %1!d! hores" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "fa %1!d! minut" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "fa %1!d! mes" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "fa %1!d! mesos" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "fa %1!d! segon" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "fa %1!d! segons" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "fa %1!d! setmana" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "fa %1!d! setmanes" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "fa %1!d! any" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "fa %1!d! anys" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! elements seleccionats" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "fa %1!d! minuts" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nMostrant %2!d! arxius, %3!d! sub-mòduls i %4!d! directoris, %5!d! elements en total" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nMida %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nContinuar executant el script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -185,52 +189,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nNo es troba el fitxer.\nSi us plau verifiqueu que el camí i el nom són correctes." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes transferits" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "%I64d KiB transferits" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d entregues per davant de \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d arxius modificats" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d arxius eliminats." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d arxius restituïts a %s" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d arxius seleccionats, %d arxius total" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "els %d autor(s) més actius que tenen, com a mínim, %d entregues cadascú (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -238,78 +242,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alfa\nclica per alternar l'alfa\nfes doble clic per canviar alfa automàticament" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minut(s) i %ld segon(s)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld de %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - revisió %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Recuperat]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s a %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, a %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Directori de treball" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Exporta (%d) de %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Exporta de %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nNo s'ha pogut aplicar el pedaç de manera neta." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nVoleu eliminar-lo sigui com sigui?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -325,6 +329,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "Fusió a 3 bandes" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Quant al TortoiseGitBlame..." @@ -347,21 +355,21 @@ msgstr "&Afegeix >>" #. Resource IDs: (1505) msgid "&Add Filter" -msgstr "" +msgstr "&Afegir Filtre" #. Resource IDs: (1382) msgid "&Add New/Save" msgstr "Afegeix Nou/Desa" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Afegir-lo" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Afegeix o Treu Botons" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Afegeix..." @@ -401,7 +409,7 @@ msgstr "&Assigna" msgid "&Associate double-click event with:" msgstr "&Associa event doble clic amb:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Auto Amaga" @@ -417,15 +425,15 @@ msgstr "Auto-carrega la clau de putty" msgid "&Backup original file" msgstr "&Fes còpia de seguretat del fitxer original" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Autoria" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Estableix Autoria dels canvis" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Mostra autoria de les revisions" @@ -435,7 +443,7 @@ msgstr "&Blau:" #. Resource IDs: (65535) msgid "&Border:" -msgstr "" +msgstr "&Contorn:" #. Resource IDs: (1512) msgid "&Branch" @@ -449,7 +457,7 @@ msgstr "&Branca:" msgid "&Browse Dir" msgstr "&Navega directori" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Explora el diposit" @@ -485,7 +493,7 @@ msgstr "&Categoria:" msgid "&Choose commands from:" msgstr "&Escull comandes de:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "Neteja..." @@ -509,7 +517,7 @@ msgstr "&Tanca Finestra(es)" msgid "&Command:" msgstr "&Comanda:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Entrega" @@ -517,23 +525,27 @@ msgstr "&Entrega" msgid "&Commit submodule..." msgstr "&Entrega sub-mòdul..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Entrega sense" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Entrega..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Compara revisions" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copia" @@ -553,19 +565,19 @@ msgstr "&Personalitzat" msgid "&Default" msgstr "&Per defecte" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Suprimeix" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Esborra (manté la còpia local)" #. Resource IDs: (1507) msgid "&Delete Filter" -msgstr "" +msgstr "&Suprimir Filtre" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Esborra remot && local" @@ -577,11 +589,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Compara" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Compara amb revisió prèvia" @@ -593,7 +605,7 @@ msgstr "Directori:" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Descarta" @@ -601,7 +613,7 @@ msgstr "&Descarta" msgid "&Do the same for the rest" msgstr "Fes el mateix per la resta" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Acoblament" @@ -609,11 +621,15 @@ msgstr "&Acoblament" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Avall" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Descarrega" @@ -621,19 +637,19 @@ msgstr "&Descarrega" msgid "&Edit" msgstr "&Edita" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Edita .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Edita tots" #. Resource IDs: (1506) msgid "&Edit Filter" -msgstr "" +msgstr "&Editar Filtre" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Edita conflictes" @@ -658,10 +674,10 @@ msgid "&Enable edit" msgstr "&Activa l'edició" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exporta selecció a..." @@ -673,27 +689,27 @@ msgstr "&Extern" msgid "&File" msgstr "&Fitxer" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Troba" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Cerca\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "Ajusta les imatges a la mida de la finestra" +msgid "&Fit images in window\tF" +msgstr "Ajusta les imatges a la mida de la finestra\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Discs fixes" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flotant" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "Segueix canvis de noms" @@ -705,7 +721,7 @@ msgstr "&Font pels missatges de registre:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "Força" @@ -725,7 +741,7 @@ msgstr "Entrega de tipus git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Anar a\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -737,7 +753,7 @@ msgstr "&Verd:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Ajuda" @@ -745,7 +761,7 @@ msgstr "&Ajuda" msgid "&Help Topics" msgstr "&Temes de l'Ajuda" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Amaga" @@ -753,11 +769,11 @@ msgstr "&Amaga" msgid "&Icon Set:" msgstr "&Conjunt d'icones:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignora" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignora %d ítems per nom" @@ -771,14 +787,14 @@ msgid "&Image" msgstr "&Imatge" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Informació de la imatge" +msgid "&Image info\tI" +msgstr "Informació de la imatge\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "Només &Imatge" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importa..." @@ -790,7 +806,7 @@ msgstr "Directori &Inicial:" msgid "&Initialize submodules (--init)" msgstr "&Inicialitza sub-mòduls (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Instal·la" @@ -802,11 +818,11 @@ msgstr "&Anar a la primera diferència quan es carrega" msgid "&Keep CR" msgstr "&Manté CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Manté l'estat actual" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -828,13 +844,13 @@ msgstr "&Limita cerca a línies modificades" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Límit:" #. Resource IDs: (1078) msgid "&Line number" msgstr "Número de línia" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Número de línia (%d - %d)" @@ -851,7 +867,7 @@ msgstr "Visualització de &Llista" msgid "&Local Branch:" msgstr "Branca local" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -875,11 +891,11 @@ msgstr "&Menú d'animacions:" msgid "&Menu contents:" msgstr "Contingut del &Menú:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Fusiona" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Fusiona..." @@ -929,12 +945,16 @@ msgstr "&Nou..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Següent >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "Pàgina &Següent" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Event sense doble clic" @@ -951,11 +971,11 @@ msgstr "&Cap" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&D'acord" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Una Pàgina" @@ -963,19 +983,15 @@ msgstr "&Una Pàgina" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Obre" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Obre...\tCtrl+O" @@ -988,18 +1004,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Sobreposar imatges" +msgid "&Overlay images\tO" +msgstr "&Sobreposar imatges\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Contrasenya:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Enganxa" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Escull tots" @@ -1007,7 +1023,7 @@ msgstr "&Escull tots" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Exemple d'Impressió" @@ -1015,11 +1031,15 @@ msgstr "&Exemple d'Impressió" msgid "&Print..." msgstr "&Imprimeix..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Imprimeix...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Continua" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Estira" @@ -1027,10 +1047,14 @@ msgstr "&Estira" msgid "&Push all branches" msgstr "Empeny totes les branques" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&ReEntrega" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Missatges recents" @@ -1043,7 +1067,7 @@ msgstr "&Recursiu" msgid "&Red:" msgstr "&Vermell:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Refer" @@ -1059,7 +1083,7 @@ msgstr "&Refresca" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1067,7 +1091,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "Branca remota" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1075,7 +1099,7 @@ msgstr "" msgid "&Remote:" msgstr "Remot:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Treu" @@ -1085,9 +1109,9 @@ msgstr "Elimina aquest arxiu de l'index" #. Resource IDs: (1511) msgid "&Replace" -msgstr "" +msgstr "&Substitueix" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Navegador de dipòsits" @@ -1095,7 +1119,7 @@ msgstr "&Navegador de dipòsits" msgid "&Reset" msgstr "&Reinicia" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Reinicia Barra d'Eines" @@ -1111,23 +1135,27 @@ msgstr "&Reinicia les meves dades d'us" msgid "&Reset to Default" msgstr "&Reinicia a Valors per Defecte" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Resolt" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Restaura" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Restaura l'estat antic" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "Restitueix els canvis fets per aquesta entrega" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "Restitueix els canvis fets per aquestes entregues" @@ -1139,7 +1167,7 @@ msgstr "&Client SSH:" msgid "&Saturation:" msgstr "&Saturació:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Desa" @@ -1147,15 +1175,19 @@ msgstr "&Desa" msgid "&Save authentication" msgstr "&Desa Autenticació" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Desa gràfic com..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Desa llista de fitxers seleccionats a..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Desa\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1163,7 +1195,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "&Especifica el Upstream/segueix branca remota" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Configuració" @@ -1183,7 +1215,7 @@ msgstr "&Mostra etiquetes de text" msgid "&Signing key ID:" msgstr "Clau de signatura:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Omet" @@ -1191,7 +1223,7 @@ msgstr "&Omet" msgid "&Squash" msgstr "&Esclafa" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Esclafa tots" @@ -1203,7 +1235,7 @@ msgstr "&Inicia" msgid "&Start Group" msgstr "&Inicia Grup" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "Stash" @@ -1223,7 +1255,7 @@ msgstr "&Visualització Símbols" msgid "&Tab size:" msgstr "&Longitud del tabulador:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Document Tabulat" @@ -1231,9 +1263,9 @@ msgstr "&Document Tabulat" msgid "&Tag" msgstr "&Etiqueta" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" -msgstr "" +msgstr "&Etiquetes" #. Resource IDs: (65535) msgid "&Tags:" @@ -1267,7 +1299,7 @@ msgstr "&Barra d'eines i acoblament de finestra" msgid "&Toolbars:" msgstr "&Barres d'Eines:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1279,7 +1311,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dues Pàgines" @@ -1287,15 +1323,15 @@ msgstr "&Dues Pàgines" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Desfés" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Compara Unificat" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Compara Unificat" @@ -1307,7 +1343,7 @@ msgstr "&Unitats desconegudes" msgid "&Up" msgstr "Amunt" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "Actualitza element a una revisió" @@ -1319,11 +1355,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Utilitza compleció automàtica de camins de fitxers i paraules clau" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Nom d'Usuari:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Vista" @@ -1331,7 +1367,7 @@ msgstr "&Vista" msgid "&View:" msgstr "&Vista:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "Avisa quan es faci una entrega sense signatura" @@ -1347,6 +1383,10 @@ msgstr "&Paraula Sencera" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "Ignora canvis d'espais en blanc" @@ -1355,46 +1395,46 @@ msgstr "Ignora canvis d'espais en blanc" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit per defecte)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(des de %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(sense llista de canvis)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(sense número de línia)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(sense valor)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(no trobat)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(desconegut)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- tot -" @@ -1402,13 +1442,14 @@ msgstr "- tot -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1416,7 +1457,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1432,7 +1473,7 @@ msgstr ".gitignore en el directori que conté els elements" msgid ".gitignore in the repository root" msgstr ".gitignore a l'arrel del dipòsit" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1448,31 +1489,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1481,66 +1522,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit és una extensió de shell.\nAixò vol dir que s'integra amb Windows.\nPer a utilitzar TortoiseGit obre el navegador i fes click dret en qualsevol carpeta que vulguis, per a mostrar el menú contextual on trobaràs totes les opcions.\nI llegeix el manual!." -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Avís: No s'ha comprovat si aquestes branques han estat completament fusionades amb HEAD." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Avís: Aquesta acció eliminarà branques remotes." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Avís: Aquesta branca no està completament fusionada amb HEAD." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Realment voleu eliminar TOT el stash?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "L'intent d'aplicar canvis des del Stash ha fracassat!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "L'intent d'extreure del Stash ha fracassat!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "L'intent de desar al Stash ha fracassat!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "previous rebase directory rebase-apply still exists but mbox given\n\nDo you want to" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "L'intent d'aplicar canvis des del Stash ha fracassat, hi ha conflictes" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "L'intent d'extreure del Stash ha fracassat, hi ha conflictes" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "L'intent d'aplicar canvis des del Stash ha tingut èxit" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "L'intent d'extreure del Stash ha tingut èxit" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "S'ha pogut desar al Stash" @@ -1548,7 +1589,7 @@ msgstr "S'ha pogut desar al Stash" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1560,71 +1601,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Ja existeix una branca amb el nom d'aquesta etiqueta (així que el ref és ambigu).\nAixò pot causar problemes. És aconsellable evitar-ho." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Ja existeix una branca amb aquest nom." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Un procés de fusió està actiu, per tant aquesta entrega serà una entrega fusionada. Per tal d'interrompre la fusió heu de fer un Reset o una extracció forçada" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Hi ha una nova versió disponible. Si us plau, descarregui la nova versió!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Una llista de camins, separats en múltiples linies, on es mostraran els sobreposats de les icones.\nSi afegeixes un * al final del camí, tots els arxius i subdirectoris dins d'aquell camí estaran automàticament inclosos." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Una llista de paths per la qual no es mostra el menú.\nAfegint un caracter '*' al final del path, tots els fitxers i subdirectoris dins d'aquest són també exclosos.\nUna llista buida mostrara el menú en totes les carpetes." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Una llista de paths per la qual no es mostraran els sobreposats de les icones.\nAfegint un caracter '*' al final del path, tots els fitxers i subdirectoris dins d'aquest són també exclosos.\nUna llista buida mostrara els sobreposats de les icones en totes les carpetes." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Un recurs necessari no està disponible." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Ja existeix una etiqueta amb el nom d'aquesta branca (així que el ref és ambigu).\nAixò pot causar problemes. És aconsellable evitar-ho." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Ja existeix una etiqueta amb aquest nom." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Una utilitat GNU per a visualitzar fitxers diff (fitxers pedaç).\nSi no en teniu cap utilitzeu el Bloc de Notes. " -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "Interrompt" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&Quant al programa" @@ -1640,11 +1681,11 @@ msgstr "Abrevia canvis de nom" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Interromp" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Interromp &Fusió" @@ -1652,11 +1693,11 @@ msgstr "Interromp &Fusió" msgid "Abort Merge" msgstr "Interromp Fusió" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Interromp una fusió en curs" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Quant a" @@ -1676,12 +1717,12 @@ msgstr "Quant al TortoiseGitMerge" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "L'accés a %1 ha sigut denegat." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Acció" @@ -1689,26 +1730,26 @@ msgstr "Acció" msgid "Action log" msgstr "Registre d'Accions" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Accions" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Activa Llista de Tasques" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Fitxers Actius" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Els objectes ActiveX no es poden desar quan se surt de Windows!\nVols descartar tots els canvis a %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Afegeix" @@ -1716,7 +1757,7 @@ msgstr "Afegeix" msgid "Add &Signed-off-by" msgstr "Afegeix \"Signat per\"" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Afegeix '%s' al diccionari" @@ -1729,15 +1770,15 @@ msgstr "Afegir Remot" msgid "Add \"&Signed-off-by\"" msgstr "Afegeix \"Signat per\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Afegeix utilitat de comparació per a extensions específiques" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Afegeix utilitat de fusió per a extensions específiques" @@ -1745,15 +1786,15 @@ msgstr "Afegeix utilitat de fusió per a extensions específiques" msgid "Add new files automatically to Git" msgstr "Afegeix els arxius nous a Git, automàticament" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Afegeix a la llista d'&ignorats" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Afegeix a la barra de Ràpid Accés" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Afegeix..." @@ -1761,11 +1802,11 @@ msgstr "Afegeix..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Afegeix/Edita utilitat Comparació/Fusió per a extensions específiques" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Afegit" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1773,25 +1814,25 @@ msgid "" "to the ignore list." msgstr "Afegit el patró del(s) fitxer(s)\n%s\na la llista d'ignorats." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Afegint" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Posa arxiu(s) sota el control de Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Afegeix fitxer(s) seleccionat(s) o màscara de fitxers a la llista d'ignorats" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Canvia la Configuració\nConfiguració" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avançat" @@ -1799,43 +1840,43 @@ msgstr "Avançat" msgid "Advanced Diff/Merge Settings" msgstr "Configuració avançada de Comparació/Fusió" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Configuració avançada de Comparació" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Configuració avançada de fusió" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Tot" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Totes les ordres" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Tots els fitxers (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Tots els fitxers (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Tots els pares" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1843,47 +1884,47 @@ msgstr "" msgid "All tags only" msgstr "Només totes les etiquetes" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Tots els canvis es perdran! Realment voleu reiniciar totes les barres i menús?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Tots els canvis es perdran! Realment voleu reiniciar totes les assignacions de teclat?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Tots els canvis es perdran! Realment voleu reiniciar el menú '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Tots els canvis es perdran! Realment voleu reiniciar la barra d'eines '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Permet l'edició per aquesta vista\nPermet l'edició" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Permet utilitzar una url de Gravatar personalitzada" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Ja està al dia" @@ -1899,11 +1940,11 @@ msgstr "Empeny sempre aquesta branca local a la branca remota seleccionat" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Utilitza sempre la configuració local per mostrar hores i dates" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Esmena" @@ -1911,12 +1952,12 @@ msgstr "Esmena" msgid "Amend &Last Commit" msgstr "Esmena última entrega" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Un editor alternatiu. Que hauria de ser compatible amb finals de línia tipus *nix (LF)." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1927,7 +1968,7 @@ msgid "" "%mine: the modified file" msgstr "Un programa de diffs extern per a comparar diferents revisions d'arxius.\n\nPot especificar els següents paràmetres a la ruta:\n%base: l'arxiu base\n%mine: l'arxiu modificat" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1938,36 +1979,36 @@ msgid "" "%theirs: the file as it is in the repository\r\n" "%mine: your own file, with your changes\r\n" "%base: the original file without your changes" -msgstr "Un programa de fusió extern usat per resoldre arxius en conflicte.\n\nPot especificar els següents paràmetres a la ruta:\n%merged: l'arxiu en conflicte, on desar↩⏎\n%theirs: l'arxiu, tal com està en el dipòsit↩⏎\n%mine: el seu arxiu, amb els canvis que heu fet↩⏎\n%base: l'arxiu original sense els canvis que heu fet" +msgstr "Un programa de fusió extern usat per resoldre arxius en conflicte.\r\nPot especificar els següents paràmetres a la ruta:\r\n%merged: l'arxiu en conflicte, on desar\r\n%theirs: l'arxiu, tal com està en el dipòsit\r\n%mine: el seu arxiu, amb els canvis que heu fet\r\n%base: l'arxiu original sense els canvis que heu fet" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Un identificador invàlid d'arxiu ha sigut associat amb %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "S'ha produït un error desconegut." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "S'ha produït un error desconegut mentre s'accedia a %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Un tipus de línia desconegut s´ha trobat a la línia %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Afegeix el bloc de la dreta, al final" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Afegeix aquest bloc a l'esquerra, al final" @@ -1979,11 +2020,11 @@ msgstr "Menús d'Estructura de l'Aplicació: " msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Aplica pedaç serial" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Aplica pedaços" @@ -1991,7 +2032,7 @@ msgstr "Aplica pedaços" msgid "Apply Patches" msgstr "Aplica pedaços" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Aplica conjunt de pedaços des d'una bústia de correu" @@ -1999,7 +2040,7 @@ msgstr "Aplica conjunt de pedaços des d'una bústia de correu" msgid "Apply unified diff" msgstr "Aplicar Comparació unificada" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Estil aqua" @@ -2007,39 +2048,39 @@ msgstr "Estil aqua" msgid "Arabic" msgstr "Arabic" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "URL Arbitrària" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Esteu segurs que voleu interrompre el procés de rebase?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Esteu segur que voleu marcar el(s) fitxer(s) en conflicte com a resolt(s)?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Esteu segurs que voleu restituir els %d element(s)? perdreu TOTS els canvis des de l'última actualització." -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Organitza verticalment" +msgid "Arrange &vertical\tV" +msgstr "Organitza &verticalment\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Assignat a la llista de canvis '%s'" @@ -2048,11 +2089,11 @@ msgstr "Assignat a la llista de canvis '%s'" msgid "Assigned to:" msgstr "Assignat a:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Considera'l inalterat" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Considera'l vàlid/inalterat" @@ -2064,34 +2105,34 @@ msgstr "Assumeix com a vàlid/inalterat (\"Necessita-bloqueig\" a TortoiseSVN)" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "A la revisió: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Ara mateix només pot canviar els noms de les branques" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "S'ha intentat una operació no permesa." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "S'ha intentat accedir %1 més enllà del final del fitxer." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "S'ha fet un intent de llegir d' %1 mentre s'hi escrivia." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "S'ha intentat escriure a %1 mentre es llegia." @@ -2108,11 +2149,11 @@ msgstr "Autenticació" msgid "Authentication data" msgstr "Dades d'autenticació" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Correu de l'autor" @@ -2120,7 +2161,7 @@ msgstr "Correu de l'autor" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:»»»»Stefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autors" @@ -2142,11 +2183,11 @@ msgstr "Auto convertir CrLf" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Auto Amaga" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Auto Amaga Tot" @@ -2154,23 +2195,23 @@ msgstr "Auto Amaga Tot" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Tanca automàticament si no hi ha conflictes" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Tanca automàticament si no hi ha errors" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Tanca automàticament si no hi ha fusions, afegits o supressions" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2184,7 +2225,7 @@ msgstr "Auto-carrega clau Putty" msgid "Autoload Putty &Key" msgstr "Auto-carrega clau Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automàtic" @@ -2194,7 +2235,7 @@ msgstr "Comprova si hi ha actualitzacions noves cada setmana" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Provador Autotest" #. Resource IDs: (1157) msgid "Average" @@ -2204,19 +2245,19 @@ msgstr "Mitjana" msgid "B&rowse..." msgstr "E&xplora..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Enrere" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Segon pla" #. Resource IDs: (65535) msgid "Baltic" msgstr "Baltic" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Gràfic de barres" @@ -2236,7 +2277,7 @@ msgstr "Fitxer base:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Basat en TortoiseIDiff de TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Informació bàsica" @@ -2248,45 +2289,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "Big5 (Tradicional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bisect dolent" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bisect bo" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Reinicialitza Bisect" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Inicia bisect" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\nun mapa de bits" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Estil negre" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Autoria" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Error de Blame" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "&Mostra autoria de la versió antiga" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Mostra l'autor de cada línia d'un arxiu" @@ -2294,26 +2335,30 @@ msgstr "Mostra l'autor de cada línia d'un arxiu" msgid "Blend alpha" msgstr "Barreja alpha" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Estil blau" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Cos" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg i /logmsgfile a la vegada!\nNomés se'n pot especificar un." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "La ruta al pedaç i la ruta de destí han de ser rutes absolutes!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Visualització inferior:" @@ -2325,30 +2370,30 @@ msgstr "E&xplora..." msgid "Branc&h:" msgstr "&Branca:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Bifurcació" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Branca %s està per darrera de %s\n%s sera avançada a %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Nom de la branca" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "La branca/etiqueta no és vàlida." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "La branca/etiqueta no pot estar buida o ser invàlida." @@ -2360,11 +2405,11 @@ msgstr "Bifurcació:" msgid "Bro&wse" msgstr "Navega" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Explora les referencies" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Navega per trobar programa de comparació extern" @@ -2376,19 +2421,19 @@ msgstr "Explora les referencies" msgid "Browse..." msgstr "Navega..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Codi d'error" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "e&xpressió ID d'error:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "Id d'error/Número de problema:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Codis d'error" @@ -2404,7 +2449,7 @@ msgstr "" msgid "Button Appearance" msgstr "Aparença del Botó" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2420,7 +2465,7 @@ msgstr "C&omprova ara" msgid "C&ommands:" msgstr "&Ordres:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&rea branca/etiqueta des de la revisió" @@ -2428,11 +2473,11 @@ msgstr "C&rea branca/etiqueta des de la revisió" msgid "C&urrent Keys:" msgstr "Tecles A&ctuals:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Retalla" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2448,11 +2493,11 @@ msgstr "Calcula" msgid "Can double-click in log list to compare with previous revision" msgstr "Doble clic a la llista de registre permet comparar amb la revisió prèvia" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "No es pot activar un objecte ActiveX estàtic." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2461,80 +2506,80 @@ msgid "" "%s" msgstr "No es pot copiar\n%s\na\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "No es pot copiar imatge de mapa de bits al porta-retalls!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "No es pot crear una nova imatge!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "No es poden personalitzar menús!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "No es pot enganxar una imatge de mapa de bits des del porta-retalls!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Cancel·la" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Anul·la\nNo tanquis TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Anul·la\nNo intercanviïs les vistes" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Anul·la\nManté l'arxiu buit" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Anul·la\nPrimer de tot, resol els conflictes." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Anul·la\nMantén-te en els arxius actuals" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Anul·la\nMantén-te la configuració actual" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "No es poden combinar entregues ara\nAsseguri's que esta veient el registre de la branca actual i que no hi ha filtres aplicats" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "No es pot mostrar l'autoria \"%s\" no està sota el control de versions de git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "No es poden mostrar diferències degut a noves línies inconsistents al fitxer." @@ -2546,9 +2591,9 @@ msgstr "En cascada" msgid "Cascaded context menu" msgstr "Menú de contexte en cascada" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Considera Majúsc./minúsc." #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2570,33 +2615,33 @@ msgstr "" msgid "Change log" msgstr "Registre de canvis" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Canvia la impressora i les opcions d'impressió\nConfigura la impressora" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Canvia les opcions d'impressió\nConfiguració de la pàgina" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Canvia l'estil d'una aplicació.\nCanvia l'estil" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Canvia la posició de la finestra" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Canvia la mida de la finestra" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2604,38 +2649,38 @@ msgstr "" msgid "Changed Files" msgstr "Fitxers canviats" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Fitxers modificats entre %s, %s i %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Fitxers modificats: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Línies canviades, incloent arxius afegits/eliminats" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Línies canviades, incloent arxius afegits/eliminats per data" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Línies canviades, sense incloure arxius afegits/eliminats" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Línies canviades, sense incloure arxius afegits/eliminats per data" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Llista de canvis %s moguda" @@ -2644,15 +2689,15 @@ msgstr "Llista de canvis %s moguda" msgid "Changes made (double-click on file for diff):" msgstr "Canvis fets (Fer doble click sobre el fitxer per veure diferències):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Canvia l'estil de l'aplicació" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Posició on es mostra una línia de vora als quadres de text d'entrega:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Selecciona" @@ -2664,31 +2709,31 @@ msgstr "Cerca actualitzacions - TortoiseGit" msgid "Check For Updates..." msgstr "Busca actualitzacions..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Troba Modi&ficacions" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Comprova el camí i/o la URL que has introduït." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Marca les entrades que vols que es mostrin al menú principal enlloc de dins del submenú." -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Marca les entrades que vols que es mostrin al menú principal enlloc de dins del submenú (Majus+Click esquerre)." -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Marca per mostrar temps relatius als registre de missatges" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Marca per utilitzar un format de temps/data simplificat en els missatges del registre" @@ -2696,31 +2741,31 @@ msgstr "Marca per utilitzar un format de temps/data simplificat en els missatges msgid "Check:" msgstr "Selecciona:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Extreu" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Escull" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "La tria ha fracassat" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Tria d'entregues" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Tria aquesta entrega..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Aquesta tria ha fracassat! Voleu ometre aquesta entrega?" @@ -2728,11 +2773,11 @@ msgstr "Aquesta tria ha fracassat! Voleu ometre aquesta entrega?" msgid "Chinese" msgstr "Chinese" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Escull dipòsit" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Ordre cronològicament invers (per defecte de Git)" @@ -2744,78 +2789,78 @@ msgstr "Neteja" msgid "Clean Type" msgstr "Neteja tipus" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Neteja les branques remotes caducades" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Netejant" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Netejant." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Neteja ha fracassat intentant processar les següents carpetes:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Neteja ha processat satisfactòriament les següents carpetes:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Esborra" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Neteja Eina\nNeteja" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Neteja %ld URLs desades per %ld directoris de treball" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Neteja %ld missatges de registre desats per %ld directoris de treball" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Elimina %ld usuaris/contrasenyes. %ld certificats SSL i %ld usuaris" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Esborra logs amagats dels %ld dipòsits" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Esborra l'autentificació guardada.\nHaureu de tornar a introduir el vostre nom d'usuari/contrasenya un altre cop per a tots els diposits." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Oblida les mides i posicions de %ld formularis" @@ -2824,7 +2869,7 @@ msgstr "Oblida les mides i posicions de %ld formularis" msgid "Click here to go to the website" msgstr "Feu clic aquí per anar a la pàgina web" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Fer clic aquí per seleccionar un text escrit recentment" @@ -2840,17 +2885,17 @@ msgid "" "extension" msgstr "Feu clic a \"Avançat\" per especificar programes de fusió de fitxers alternatius segons l'extensió dels fitxers" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Click per veure comandes per a moure blocs de text\nUtilitza blocs de text" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Porta-retalls" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Clona" @@ -2858,7 +2903,7 @@ msgstr "Clona" msgid "Clone Existing Repository" msgstr "Clona dipòsit existent" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Clona dipòsit existent" @@ -2866,49 +2911,49 @@ msgstr "Clona dipòsit existent" msgid "Clone into Bare Repo" msgstr "Clona en un nou dipòsit cru" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Clona..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Tanca" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Tanca Pantalla Sencera " -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Tanca Visualització Prèvia d'Impressió\n&Tanca" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Tanca manualment" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Tanca Visualització Prèvia d'Impressió\n&Cancel·la la visualització prèvia" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Tanca el document actiu\nTanca" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Tanca la finestra activa i pregunta si es volen gravar els documents" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Contrau" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2934,7 +2979,7 @@ msgstr "Colors:" msgid "Combine One Mail" msgstr "Combina un correu" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Combina en una sola entrega" @@ -2942,11 +2987,11 @@ msgstr "Combina en una sola entrega" msgid "Comman&ds:" msgstr "Coman&des:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Comanda" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Línia de comandes" @@ -2954,7 +2999,7 @@ msgstr "Línia de comandes" msgid "Command Line To Execute:" msgstr "Comanda a Executar:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "La comanda ha fallat." @@ -2962,41 +3007,41 @@ msgstr "La comanda ha fallat." msgid "Commands" msgstr "Comandes" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Entrega" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Data d'entrega" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Correu de l'entrega" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Finalització de l'entrega" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Informació de l'entrega" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Missatge d'entrega" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Nom de l'entrega" @@ -3004,7 +3049,7 @@ msgstr "Nom de l'entrega" msgid "Commit Ordering:" msgstr "Ordre de les entregues:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3012,19 +3057,19 @@ msgstr "" msgid "Commit to:" msgstr "Entrega a:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Entrega..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Entregues per autor" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Entregues per data" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Entregues cada %s" @@ -3033,15 +3078,15 @@ msgstr "Entregues cada %s" msgid "Commits each week:" msgstr "Entregues cada setmana:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Entrega els teus canvis al dipòsit. " -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Correu de l'entregador" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3053,52 +3098,52 @@ msgstr "Entregar una carpeta sense versionar no afegeix recursivament el seu con msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Compara revisions &HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Compara els refs seleccionats" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Compara dos arxius" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Compara espais en blanc" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "&Compara amb el directori de treball" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Compara amb b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "&Compara amb revisió prèvia" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Compara tots els espais en blanc quan es cerquen diferències\nCompara espais en blanc" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Compara fitxer amb l'última revisió entregada per mostrar els canvis que has fet" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Comparant %s amb %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Completat" @@ -3114,9 +3159,9 @@ msgstr "" msgid "Config type:" msgstr "Tipus de configuració:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" -msgstr "" +msgstr "Configurar Filtres regex" #. Resource IDs: (236) msgid "Configure Hook Scripts" @@ -3148,11 +3193,11 @@ msgstr "Configura programa visor per diffs de GNU (arxius de pedaç)" msgid "Confirm to kill running git process" msgstr "Confirma aturar processos git" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Conflicte" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Arxius en conflicte" @@ -3160,15 +3205,15 @@ msgstr "Arxius en conflicte" msgid "Conflict resolved" msgstr "Conflicte resolt" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "En conflicte" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflictes" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflictes: %d" @@ -3179,126 +3224,126 @@ msgstr "Menús contextual:" #. Resource IDs: (65535) msgid "Context lines for patches" -msgstr "" +msgstr "Línies de context per a pedaços" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continua" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Contrau finestra acoblada" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Converteix els espais a tabuladors" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Converteix els tabuladors a espais" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Co&pia" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copiat(s)" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copia" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copia %s a %s, revisió %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Copia SHA-1 al porta-retalls" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Eina de Còpia\nCòpia" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copia tota la informació al porta-retalls" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copia i canvia el nom" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Copia els missatges de registre al porta-retalls" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Copia registre al portapapers" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copia rutes al porta-retalls" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Copia els noms de les refs" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copia al porta-&retalls" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copia la selecció i posa-la al porta-retalls\nCopia" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copia al porta-retalls" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Còpia: Nou nom per %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Copiant %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Copiant..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Correccions" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "No s'ha pogut afegir %s a la llista d'ignorats!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "No s'ha pogut comprovar si hi ha una versió més nova!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3306,76 +3351,76 @@ msgid "" "%s" msgstr "No s'ha pogut copiar els fitxers\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "No s'ha pogut crear %1 perquè el directori és ple." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "No s'ha pogut determinar la darrera revisió entregada!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "No s'ha pogut trobar el super-projecte" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "No s'ha pogut obtenir l'estat!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "No s'ha pogut obrir %1 perquè hi ha masses fitxers oberts." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "No s'ha pogut obtenir el fitxer\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "No s'ha pogut eliminar %1 perquè és el directori actual." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "No s'ha pogut treure %s de la llista d'ignorats" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "No s'ha pogut reinicialitzar a la primera entrega (primer pas). Cancel·lant..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "No s'ha pogut reinicialitzar a l'última entrega (segon pas). Cancel·lant..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "No s'ha pogut reinicialitzar al HEAD original" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "No s'ha pogut obtenir la URL del fitxer!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "No s'ha pogut obtenir la revisió %s de l'arxiu %s.\nNo és possible aplicar el pedaç." -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "No s'ha pogut iniciar TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3383,7 +3428,7 @@ msgid "" "%s" msgstr "No s'ha pogut iniciar el visualitzador de diferències!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3391,7 +3436,7 @@ msgid "" "%s" msgstr "No s'ha pogut iniciar el visualitzador de diferències extern!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3399,11 +3444,11 @@ msgid "" "%s" msgstr "No s'ha pogut iniciar el programa de fusió extern!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "No s'ha pogut iniciar la tasca d'impressió." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3411,22 +3456,22 @@ msgid "" "%s" msgstr "No s'ha pogut iniciar el visualitzador de text!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "No s'ha pogut iniciar l'agent Putty (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "No s'ha pogut iniciar el fil!" #. Resource IDs: (1501) msgid "Coun&t" -msgstr "" +msgstr "Compt&a" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." -msgstr "" +msgstr "Recompte: %u coincidències." #. Resource IDs: (1683) msgid "Create &Library" @@ -3436,15 +3481,15 @@ msgstr "Crea una bib&lioteca" msgid "Create .gitignore file" msgstr "Crea arxiu .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Crea branca" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Crea una branca en aquesta revisió..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Crea una branca" @@ -3456,29 +3501,29 @@ msgstr "Crea llista de canvis" msgid "Create New Branch" msgstr "Crea una nova branca" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Crea pedaç serial" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Crea etiqueta" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Crea etiqueta en aquesta revisió.." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Crea una etiqueta..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Crea un document nou\nNou" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3487,49 +3532,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Crea un dipòsit lleuger amb una història truncada a un nombre específic de revisions. Un dipòsit lleuger té certes limitacions (no pot ésser clonat, ni fer operacions push/pull), però és adequat si només us interessa veure la historia recent d'un projecte amb molts canvis, i voleu enviar correccions com a pedaços" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Crea arxiu pedaç" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Crea sol·licitud d'estirada" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Crea un dipòsit aquí..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Creat" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Crea una branca o etiqueta" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Crea una carpeta biblioteca amb configuracions especials per als directoris de treball de Git." -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Crea un fitxer pedaç amb les diferències dels dos fitxers\nCrea fitxer pedaç" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Crea una base de dades de dipòsit al lloc actual" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Crea un fitxer diff unificat amb tots els canvis que has fet" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Creant sol·licitud d'estirada" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "L'auxiliar de credencials no pot estar buit." @@ -3541,7 +3586,7 @@ msgstr "Auxiliar de credencials:" msgid "Credentials" msgstr "Credencials" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Re&talla" @@ -3549,7 +3594,7 @@ msgstr "Re&talla" msgid "Current" msgstr "Actual" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Branca actual" @@ -3557,7 +3602,7 @@ msgstr "Branca actual" msgid "Current Branch:" msgstr "Branca actual" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3569,7 +3614,7 @@ msgstr "La branca actual %s està al dia.\n\nSi vol forçar un Rebase fins i tot msgid "Current version is:" msgstr "La versió actual és:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "La versió actual és: %s" @@ -3582,7 +3627,7 @@ msgstr "&Personalitza..." msgid "Custom" msgstr "Personalitzat" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personalitza" @@ -3590,19 +3635,19 @@ msgstr "Personalitza" msgid "Customize Keyboard" msgstr "Personalitza Teclat" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Personalitza Barra de Ràpid Accès" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Personalitza Barra de Ràpid Accès..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Personalitza..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3616,88 +3661,92 @@ msgstr "Ciríl·lic" msgid "DCommit Type" msgstr "DCommit Type" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Dimoni" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Data" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Fixa la data de l'última entrega" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Per defecte" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menú Per defecte" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Mení d'aplicació per defecte. Apareix quan no hi han documents oberts." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Escull per defecte codificació UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Elimina" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Elimina %d branques" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Elimina %d branques remotes" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Elimina %d etiquetes" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Elimina &local" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Elimina ref..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Elimina totes les etiquetes" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Esborra i &ignora %d els elements pel seu nom" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Eliminia i afegeix a la llista d'ignorats" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Esborra i ignora %d items per &extensió" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Elimina branca" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Elimina branca/etiqueta" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Elimina branca remota" @@ -3705,34 +3754,34 @@ msgstr "Elimina branca remota" msgid "Delete remote tag - TortoiseGit" msgstr "Elimina etiqueta remota - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Elimina etiquetes remotes..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Elimina sub-mòdul" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Elimina etiqueta" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Elimina la branca actual o fes servir un altre nom." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Elimina\nL'arxiu ja no hi és." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Eliminat" @@ -3740,36 +3789,36 @@ msgstr "Eliminat" msgid "Deleted merge conflict" msgstr "Elimina i afegeix a la llista d'ignorats" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Esborra i afegeix el(s) fitxer(s) seleccionat(s) o la màscara de fitxers a la 'llista d'ignorats'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Elimina els arxius/directoris del control de versions" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Elimina els arxius/directoris del control de versions, però manté l'arxiu." -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Elimina el fitxer d'acció de registre" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Esborrant" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Esborrant dades en cache" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "S'està suprimint el fitxer" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Eliminant refs remots..." @@ -3779,7 +3828,7 @@ msgstr "Lliurament:" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Profunditat" #. Resource IDs: (65535) msgid "Describe" @@ -3789,7 +3838,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Descripció" @@ -3797,7 +3846,7 @@ msgstr "Descripció" msgid "Description:" msgstr "Descripció:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Desselecciona la llista de canvis" @@ -3805,33 +3854,33 @@ msgstr "Desselecciona la llista de canvis" msgid "Destination" msgstr "Destinació" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "La unitat de destinació és plena." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detecta i marca blocs moguts" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3845,11 +3894,15 @@ msgstr "Mides i posicions dels formularis" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Opcions de comparació" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Diffs de dues entregues" @@ -3863,15 +3916,15 @@ msgstr "Visor de Diffs::Eina de fusió" #. Resource IDs: (65535) msgid "Diff added lines" -msgstr "" +msgstr "Línies afegides al comparador" #. Resource IDs: (65535) msgid "Diff command" -msgstr "" +msgstr "Ordre del comparador" #. Resource IDs: (65535) msgid "Diff comment" -msgstr "" +msgstr "Comentari del comparador" #. Resource IDs: (65535) msgid "Diff file:" @@ -3879,26 +3932,26 @@ msgstr "Fitxer Diff:" #. Resource IDs: (65535) msgid "Diff header" -msgstr "" +msgstr "Capçalera del comparador" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" -msgstr "" +msgstr "Compara més endavant" #. Resource IDs: (65535) msgid "Diff position" -msgstr "" +msgstr "Posició del comparador" #. Resource IDs: (65535) msgid "Diff removed lines" -msgstr "" +msgstr "Línies suprimides del comparador" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Diff amb el pare %d" @@ -3911,19 +3964,19 @@ msgstr "Diferència entre" msgid "Diffing" msgstr "Trobant diferències" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Fent Diffs de les entregues" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Fes un diff entre l'arxiu del directori de treball i l'anterior al de la última entrega." -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Diffs de dues entregues" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Dir..." @@ -3935,26 +3988,26 @@ msgstr "Directori:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Desactiva aquesta opció si teniu directoris de treball excessivament grans i patiu problemes de rendiment amb els accessos al disc dur quan navegueu pel directori." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disc ple mentre s'accedeix a %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Reporta Excepció: %1" @@ -3963,44 +4016,52 @@ msgstr "Reporta Excepció: %1" msgid "Display &buttons in this order" msgstr "Mostra &botons en aquest ordre" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Mostra pàgines completes\nExemple d'impressió" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Mostra ajuda per botons, menús i finestres seleccionats\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Mostra ajuda per la tasca o comandament actuals\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Mostra instruccions sobre com utilitzar l'ajuda\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Mostra informació del programa, número de versió i copyright\nQuant a" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "No em mostris més aquest avís (si prems Continua)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "No em mostris més aquest avís (si prems Ignora)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "No auto-seleccionis sub-mòduls" @@ -4013,54 +4074,71 @@ msgstr "No mostreu el menú pels següents camins:" msgid "Do not use recycle bin" msgstr "No utilitzis la paperera de reciclatge" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Realment vol eliminar %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Realment voleu esborrar la barra d'eines '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Esteu segur que voleu marcar els fitxer(s) seleccionats com a \"assumeix vàlid\"?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Esteu segur que voleu marcar els fitxer(s) seleccionats com a \"Omet arbre de trebal\"?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Estàs segur de que vols moure aquest arxiu o carpeta?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Realment vols eliminar permanentment les %d refs seleccionades? NO es podran recuperar!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Esteu segurs que voleu eliminar \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Realment voleu restaurar la copia? Perdreu tots els canvis que hagueu fet després de la còpia." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4068,7 +4146,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Realment vol restituir tots els canvis fets a\n%s\ni tornar a aquesta versió? Aquests canvis seran restituïts fent un una fusió-inversa de les revisions en el vostre arbre de treball." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4076,21 +4154,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Realment vol restituir tots els canvis fets a\n%s\nque es van fer en aquesta revisió? Aquests canvis seran restituïts fent un una fusió-inversa de les revisions en el vostre arbre de treball." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Vol recuperar les branques remotes del nou remot" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Voleu carregar els arxius canviats?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4098,21 +4176,21 @@ msgid "" "as resolved?" msgstr "Voleu marcar l'arxiu\n%s\ncom a resolt?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Aquests documents tenen una copia d'auto-recuperació. Vol recuperar-los?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Vols recarregar els documents per reflectir els canvis en la configuració?\nNota: Perdràs tots els canvis que hagis fet!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Voleu veure els canvis?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Vols extreure del Stash ara?" @@ -4120,28 +4198,28 @@ msgstr "Vols extreure del Stash ara?" msgid "Document :" msgstr "Document:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "No sé què s'enviarà perquè la branca és desconeguda \"%s\"" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "No sé què s'enviarà perquè heu introduït una URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "No recuperis els documents desats automaticament\nUtilitza la última versió dels documents que fou desada explícitament." -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "No ho desis\nTanca les vistes sense desar les modificacions" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4151,11 +4229,11 @@ msgstr "No ho desis\nRecarrega les vistes sense desar les modificacions" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "No mostrar més aquest missatge " -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Fet" @@ -4167,7 +4245,7 @@ msgstr "Avall" msgid "Download" msgstr "Descarrega" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Arrossega per fer flotar aquest menú" @@ -4195,6 +4273,10 @@ msgstr "Dummy Button Form " msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&No incloguis aquests paths:" @@ -4203,7 +4285,7 @@ msgstr "&No incloguis aquests paths:" msgid "E&xit" msgstr "S&urt" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xporta..." @@ -4223,11 +4305,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Eastern European" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Edita" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Edita .gitconfig &global" @@ -4243,23 +4325,23 @@ msgstr "Edita .tgitconfig" msgid "Edit Button Image" msgstr "Edita Imatge del Botó" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Edita notes" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Edita autor" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Edita descripció" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Escull programa Comparador segons l'extensió " -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Escull rograma de fusió segons l'extensió " @@ -4271,11 +4353,11 @@ msgstr "Edita gitconfig per tot el sistema" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Edita la configuració git local" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Edita text de registre" @@ -4295,25 +4377,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Nom o IP del servidor intermediari" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Eines d'Elipse\nElipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "&Email:" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Les adreces de correu electrònic A: i CC: no poden estar buides a la vegada." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Correus electrònics" @@ -4321,13 +4403,13 @@ msgstr "Correus electrònics" msgid "Empty" msgstr "Buit" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Activa l'edició" #. Resource IDs: (1510) msgid "Enable EditorConfig" -msgstr "" +msgstr "Habilita EditorConfig" #. Resource IDs: (1766) msgid "Enable Gravatar" @@ -4335,9 +4417,9 @@ msgstr "Activa Gravatar" #. Resource IDs: (1788) msgid "Enable drag context menu" -msgstr "" +msgstr "Habilita el menú contextual arrossegar" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Activa la CAU de registra en arxius (tortoisegit.data, tortoisegit.index)" @@ -4346,10 +4428,14 @@ msgstr "Activa la CAU de registra en arxius (tortoisegit.data, tortoisegit.index msgid "Enable log cache" msgstr "Activa la CAU de registre" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Permet mostrar imatges de Gravatar a la finestra de registre" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Activa sobreposició d'icones" @@ -4358,35 +4444,35 @@ msgstr "Activa sobreposició d'icones" msgid "Encode" msgstr "Codifica" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Codificació" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "S'ha trobat un error d'E/S de hardware mentre s'accedia %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "S'ha trobat una violació de bloqueig mentre s'accedia %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "S'ha trobat una violació de recursos compartits mentre s'accedia %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Trobat argument incorrecte." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "S'ha trobat un error inesperat mentre es llegia %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "S'ha trobat un error inesperat mentre s'escrivia %1." @@ -4399,11 +4485,11 @@ msgstr "Encriptació" msgid "End" msgstr "Fi" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Estil de final de línia" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Engrandeix la finestra a la mida màxima" @@ -4411,23 +4497,23 @@ msgstr "Engrandeix la finestra a la mida màxima" msgid "Enter Log Message" msgstr "Introdueix Text del registre" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Introdueix URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Introduïu un GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Introduïu un valor monetari." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Introduïu una data i/o hora." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Introduïu una data." @@ -4435,90 +4521,90 @@ msgstr "Introduïu una data." msgid "Enter a name for the changelist:" msgstr "Introdueixi un nom per la llista de canvis:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Introduïu un nombre entre %1 i %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Introduïu un nombre." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Introduïu un enter positiu." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Introduïu un temps." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Introduïu un enter entre %1 i %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Introduïu un enter entre 0 i 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Introduïu un enter." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Introduïu el contingut del fitxer de prova a sota:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Introdueix un &missatge de registre:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "No introduïu més de %1 caràcters." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Introduïu la cadena regex a sota:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Esborra tot\nEsborra tot" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Esborra la selecció\nEsborra" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Error" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Error durant la reconstrucció de Cache d'Icones Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Error intentant llegir/escriure la clau de registre %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Tot ha estat actualitzat" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4528,28 +4614,28 @@ msgstr "Executable (*.exe)|*.exe|Comanda (*.com)|*.com|Informació (*.pdf)|*.pdf msgid "Executable (+x)" msgstr "Executable (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existent" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Surt" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Expandeix (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Expandeix finestra encastada" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Explora a" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exporta" @@ -4557,36 +4643,36 @@ msgstr "Exporta" msgid "Export Zip File" msgstr "Exporta arxiu ZIP" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exporta directori:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "&Exporta selecció a..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exporta aquesta versió" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exporta fitxers sense versionar també" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportant %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportant..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exporta una revisió a un arxiu ZIP" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extensió" @@ -4602,7 +4688,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "Ruta de la DLL externa" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Extern" @@ -4610,101 +4696,101 @@ msgstr "Extern" msgid "External Program:" msgstr "Programa extern:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Esvaïment" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Ha fracassat" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "La restitució ha fallat" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Ha fracassat l'intent d'extreure l'arxiu \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Ha fracassat l'intent d'extreure l'arxiu \"%s\" de les revisions de la %s a la \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "No s'ha pogut connectar.\nL'enllaç pot estar trencat." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "No s'ha pogut crear objecte ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "No ha pogut crear document buit." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "No s'ha pogut crear l'objecte. Assegureu-vos de que l'aplicació s'ha introduït al registre del sistema." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "No s'ha pogut crear una sol·licitud d'estirada" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Ha fracassat l'intent d'obtenir l'arxiu base." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Ha fracassat l'intent d'aconseguir l'arxiu fusionat." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "No s'ha pogut mostrar l'ajuda." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "No s'ha pogut obrir aplicació del servidor." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "No ha pogut obrir document." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "No s'ha pogut fer l'operació al servidor." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "No ha pogut gravar document." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "No ha pogut configurar/treure la llista de canvis '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Error en iniciar el proveïdor COM de seguiment d'incidències '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Ha fracassat esperant que l'agent acabi de carregar la clau." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Ha fallat!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Avancament ràpid" @@ -4712,62 +4798,62 @@ msgstr "Avancament ràpid" msgid "Fast Forward o&nly" msgstr "Només avançaments ràpids" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Avançament ràpid a %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "Recupera" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Recupera" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Recupera des d'un dipòsit SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Recupera des de \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Recupera i fes Rebase" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Recupera..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Obtenint estat..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Recuperant arxius canviats..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Recuperant fitxer..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Recuperant revisió %s de fitxer:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Fitxer" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Codificació d'arxiu" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "El fitxer canvia cada %s" @@ -4776,27 +4862,27 @@ msgstr "El fitxer canvia cada %s" msgid "File changes each week:" msgstr "Canvis en els fitxers cada setmana:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Diferències dels fitxers" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "L'arxiu no té conflictes" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "L'arxiu és buit." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Llista de fitxers buida" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Pedaços de fitxer" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4808,7 +4894,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Mida del fitxer:\t\t%s (%s)\nAmplada:\t\t\t%ld pixel\nAlçada:\t\t\t%ld pixel\nResolució Horitzontal:\t%.1f dpi\nResolució Vertical:\t%.1f dpi\nProfunditat:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4828,7 +4914,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Mida de fitxer:\t\t%s (%s)\nAmplada:\t\t\t%ld pixel\nAlçada:\t\t\t%ld pixel\nResolució Horitzontal:\t%.1f dpi\nResolució Vertical :\t%.1f dpi\nProfunditat:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nMida de fitxer:\t\t%s (%s)\nAmplada:\t\t\t%ld pixel\nAlçada:\t\t\t%ld pixel\nResolució Horitzontal:\t%.1f dpi\nResolució Vertical:\t%.1f dpi\nProfunditat:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4840,7 +4926,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Mida del fitxer:\t\t\t%s (%s)\nAmplada:\t\t\t%ld pixel\nAlçada:\t\t\t%ld pixel\nResolució Horitzontal:\t%.1f dpi\nResolució Vertical:\t\t%.1f dpi\nProfunditat:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4860,7 +4946,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Mida del Fitxer:\t\t\t%s (%s)\nAmplada:\t\t\t%ld pixel\nAlçada:\t\t\t%ld pixel\nResolució Horitzontal:\t%.1f dpi\nResolució Vertical:\t\t%.1f dpi\nProfunditat:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nMida del Fitxer:\t\t\t%s (%s)\nAmplada:\t\t\t%ld pixel\nAlçada:\t\t\t%ld pixel\nResolució Horizontal:\t%.1f dpi\nResolució Vertical:\t\t%.1f dpi\nProfunditat:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nom del fitxer" @@ -4868,17 +4954,17 @@ msgstr "Nom del fitxer" msgid "Files" msgstr "Fitxers" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Eina d'Omplir\nOmple" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtra per" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtra rutes" @@ -4890,11 +4976,11 @@ msgstr "Filtre:" msgid "Filter: " msgstr "Filtra:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Troba" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4904,41 +4990,41 @@ msgstr "Troba el text especificat\nTroba" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." -msgstr "" +msgstr "Troba: Primera ocurrència trobada des del final. Ha arribat a l'inici del document." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." -msgstr "" +msgstr "Troba: Primera ocurrència trobada des de l'inici. Ha arribat al final del document." #. Resource IDs: (65535) msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Finalitza" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Rebase finalitzat." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Finalitzat!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Primer pare" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Només el primer pare" @@ -4947,18 +5033,18 @@ msgid "First known &bad:" msgstr "Primer dolent connegut:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Ajusta l'alçada de la imatge" +msgid "Fit image &heights\tH" +msgstr "Ajusta l'alçada de la imatge\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Ajusta l'amplada de la imatge" +msgid "Fit image &widths\tW" +msgstr "Ajusta l'amplada de la imatge\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Disquets (A:, B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Carpeta" @@ -4970,38 +5056,34 @@ msgstr "Segueix canvis de noms" msgid "Font" msgstr "Font" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Per ajuda premeu F1. Feu scroll horitzontal amb Ctrl-Rodeta del ratolí" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Per a un històric complet desmarqueu 'Atura còpia/canvi de nom '" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Força" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Força la creació d'una branca/etiqueta - fins i tot si ja n'existeix una amb aquest nom." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5013,26 +5095,26 @@ msgstr "" #. Resource IDs: (65535) msgid "Foreground" -msgstr "" +msgstr "Primer pla" #. Resource IDs: (312) msgid "Format Patch" msgstr "Formata pedaç" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Formata pedaç..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Endavant" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5040,7 +5122,7 @@ msgstr "No s'ha trobat un missatge per aquesta entrega. N'heu d'introduir un per #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Paraules auto trobades:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5062,11 +5144,11 @@ msgstr "" msgid "From SVN Repository" msgstr "Des d'un dipòsit SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5074,7 +5156,7 @@ msgstr "" msgid "From:" msgstr "De:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Pantalla Completa" @@ -5082,7 +5164,7 @@ msgstr "Pantalla Completa" msgid "Full text search" msgstr "Cerca text complet" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Totalment recursiu" @@ -5090,7 +5172,7 @@ msgstr "Totalment recursiu" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5098,24 +5180,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplificat)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "No s'ha pogut iniciar GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ no ha pogut crear un objecte bitmap. Probablement no hi ha prou memòria." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Obtenint informació. Si us plau espereu..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Recopilant estadístiques" @@ -5153,35 +5235,35 @@ msgstr "General::Diàlegs 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "General::Diàlegs 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "General::Menú contextual estès" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Obté logs de Fusió" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Obtenint fitxer %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Obtenint fitxer %s, revisió %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Obtenint informació..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Obtenint informació requerida..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Obtenint diff unificat" @@ -5193,23 +5275,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Progrés de la comanda" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Copy i afegeix els arxius a aquest WC" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git copy i canvia el nom de l'element aqui" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git copy element(s) aqui" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "git-exporta tots els elements aquí" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "git-exporta els elements versionats aquí" @@ -5217,35 +5299,35 @@ msgstr "git-exporta els elements versionats aquí" msgid "Git Init" msgstr "Git Init" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Log" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "git-mou i reanomena els elements versionats aquí" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "git-mou els element(s) versionats aquí" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Configuració de Git Remote" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Llista de revisions de Git" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Rebase de git-svn" @@ -5257,31 +5339,31 @@ msgstr "Sincronització git" msgid "Git clone - TortoiseGit" msgstr "Git clone - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git ha tingut problemes mentre creava un dipòsit.\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5302,7 +5384,7 @@ msgstr "Git::Credencials" msgid "Git::Remote" msgstr "Git::Remot" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5314,47 +5396,47 @@ msgstr "Vés a la línia" msgid "Go to line" msgstr "Vés a la línia" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Vés a el proper conflicte\nProper conflicte" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Vés a la propera diferència\nPropera diferència" -#. Resource IDs: (2055) +#. Resource IDs: (32875) 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" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Vés al conflicte previ\nConflicte previ" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Vés a la diferència prèvia\nDiferència prèvia" -#. Resource IDs: (2055) +#. Resource IDs: (32876) 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" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Vés a la línia" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Grafic" @@ -5370,11 +5452,11 @@ msgstr "Gris" msgid "Greek" msgstr "Greek" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Agrupa llistes de canvis" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "Oculta rutes no relacionades" @@ -5390,7 +5472,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Hard" @@ -5402,7 +5484,7 @@ msgstr "Hard: reinicialitza el directory de treball i l'index (descarta tots els msgid "Hebrew" msgstr "Hebrew" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Ajuda" @@ -5426,11 +5508,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Oculta menús per rutes no versionades" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Amaga pedaç<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Amaga finestra encastada" @@ -5438,25 +5520,25 @@ msgstr "Amaga finestra encastada" msgid "Hide the script while running" msgstr "Amaga el script mentres s'està executant" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Mostra/oculta la llista de pedaços" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Amaga/Mostra el llistat de fitxers pedaç\nAmaga o mostra el llistat de fitxers pedaç" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5466,7 +5548,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Ajuda: seleccioneu el menú, canvieu la pàgina a 'Comandes' i arrossegueu els botons de la barra d'eines cap a la finestra del menú." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Inici" @@ -5482,7 +5564,7 @@ msgstr "Scripts d'interconnexió::Configuració del rastreig d'incidències" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Scripts d'interconnexió::Integració del Seguidor d'Incidències" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tipus d'interconnexió" @@ -5496,9 +5578,9 @@ msgstr "&Inclou els camins:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5506,55 +5588,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5562,15 +5645,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5594,7 +5677,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5602,7 +5685,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5610,7 +5693,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5618,16 +5701,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5638,17 +5721,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5660,7 +5743,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5724,7 +5807,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Sobreposició d'icones" @@ -5736,7 +5819,7 @@ msgstr "Sobreposició d'icones::Conjunt d'icones" msgid "Icon Overlays::Overlay Handlers" msgstr "Sobreposició d'icones::Conjunt d'icones" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5746,52 +5829,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Icons/Design/Code:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Si s'activa, no es mostren sobreposicions ni menús als diàlegs 'anomena i desa...' o 'obre' " -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Si s'activa, s'enviara a git la comanda --track. Si no s'activa, s'enviarà --no-track. En qualsevol altre casos, no s'enviarà res (vegeu l'ajuda)" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Si se selecciona, fent doble clic sobre una revisió a la llista del registre la compara amb la revisió prèvia" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Si s'activa, la finestra d'entrega es mostrarà automàticament si hi hagués algun error.\nTambé es recorda de la selecció i el missatge." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Si s'activa, TortoiseGit comprovarà si hi ha actualitzacions un cop per setmana" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Si s'activa, les carpetes que estan excloses de mostrar icones sobreposades, mostren una superposició amb la icona d'estat \"normal\"." -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Si està seleccionat, els fitxers a dins de carpetes sense versionar es poden mostrar al control d'estat.\nEl control d'estat s'utilitza, per exemple, al diàleg d'entrega." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5804,18 +5887,18 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Si tens planificat treballar dins d'aquesta carpeta, deixa-ho desmarcat. Normalment, un dipòsit cru només es pot rebre canvis enviats des d'un altre dipòsit -git push-. (La convenció indica que els dipòsits crus han de tenir un nom acabat en .git.)" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignora" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignora %d items per &extensió" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" -msgstr "" +msgstr "Ignora Comentaris" #. Resource IDs: (1692) msgid "Ignore File" @@ -5825,15 +5908,15 @@ msgstr "Ignora arxiu" msgid "Ignore Type" msgstr "Ignora tipus" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignora tots els canvis d'espais en blanc" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5841,7 +5924,7 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Ignora canvis entre Majúsc/Minúsc" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5859,11 +5942,11 @@ msgstr "Ignora element(s) recursivament" msgid "Ignore line &endings (recommended)" msgstr "Ignora &finals de línia (recomanat)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5871,29 +5954,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignora canvis d'espais en blanc" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorat" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Arxius ignorats" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignora tots els canvis d'espai en blanc quan cerca diferències\nIgnora tots els canvis d'espai en blanc" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5911,24 +5994,24 @@ msgstr "Imatge &i text" msgid "Images" msgstr "Imatges" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Fills immediats, incloent-hi carpetes" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importa" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importa %s a %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importa arxiu SVN ignore" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importa arxiu SVN ignore..." @@ -5937,16 +6020,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importa l'arxius svn ignore a.git/info/exclude (l'arxiu destí serà sobreescrit)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Important arxiu %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Llista de canvis rebuts" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Entregues rebudes" @@ -5970,24 +6053,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Inclou només el següent rang de revisions:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nom de fitxer incorrecte." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Importació Inicial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Inicialitza un nou dipòsit git a la carpeta %s" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Diff en-linia" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Diff en-linia per paraules" @@ -5999,25 +6082,25 @@ msgstr "Diferències en-línia" msgid "Input" msgstr "Entrada" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Insereix contingut del Porta-retalls\nEnganxa" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Memòria insuficient per fer la operació." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Error intern de l'aplicació." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Valor Monetari Incorrecte." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "El número de revisió no és vàlid!" @@ -6025,7 +6108,7 @@ msgstr "El número de revisió no és vàlid!" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6048,7 +6131,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6056,11 +6139,11 @@ msgstr "" msgid "Keep changelists" msgstr "Manté la Changelist" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Mantenir l'arxiu localment?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6074,7 +6157,7 @@ msgstr "Teclat" msgid "Keyboard shortcuts:" msgstr "Acceleradors de teclat:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Tecles" @@ -6116,21 +6199,41 @@ msgstr "LINE8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Idioma:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" msgstr "" -#. Resource IDs: (85) -msgid "Last Author" -msgstr "Últim autor" +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" -#. Resource IDs: (68) -msgid "Last Commit" -msgstr "Última entrega" +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1350) +msgid "Last Author" +msgstr "Últim autor" + +#. Resource IDs: (1076) +msgid "Last Commit" +msgstr "Última entrega" + +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Última modificació" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Última modificació:" @@ -6138,7 +6241,11 @@ msgstr "Última modificació:" msgid "Last known &good:" msgstr "Últim bo conegut:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Llança el programa de diffs/fusions extern per a resoldre conflictes" @@ -6146,17 +6253,17 @@ msgstr "Llança el programa de diffs/fusions extern per a resoldre conflictes" msgid "Least active author:" msgstr "Autor menys actiu:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Deixa com si no tingués conflictes\nL'estatus de conflicte de l'arxiu es mantindrà" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Visualització esquerra:" @@ -6164,11 +6271,11 @@ msgstr "Visualització esquerra:" msgid "Left image" msgstr "Imatge esquerra" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Gràfic de línies" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6182,12 +6289,12 @@ msgstr "Barra diff de línia" msgid "Line differences" msgstr "Diferències de línea" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Línia moguda des de la línia %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Línia moguda a la línia %ld" @@ -6200,26 +6307,26 @@ msgstr "Gruix de la línia" msgid "Line:" msgstr "Línia:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Línia: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Línies afegides" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Línies eliminades" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Llista temes de l'Ajuda\nTemes d'Ajuda" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6237,23 +6344,23 @@ msgstr "Carrega Imatges" msgid "Load Putty &Key" msgstr "Carrega clau Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Carrega canvis\nEls canvis fets en TortoiseGitMerge seran descartats i substituïts pel nou contingut." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Carrega canvis\nLes vistes s'han actualitzat amb el nou contingut" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Carregant..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Local" @@ -6261,13 +6368,13 @@ msgstr "Local" msgid "Local Branch" msgstr "Branca local" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Estat local" @@ -6275,7 +6382,7 @@ msgstr "Estat local" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6285,7 +6392,7 @@ msgstr "Ruta on es desaran els continguts de la revisió del dipòsit selecciona msgid "Locator Bar" msgstr "Barra Localització" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Registre" @@ -6325,12 +6432,12 @@ msgstr "Missatges de registre (Mostra diàleg de registre)" msgid "Login:" msgstr "Inici de sessió:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Revisió més baixa mostrada: %ld - Revisió mostrada més alta: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6341,7 +6448,7 @@ msgstr "Revisió més baixa mostrada: %ld - Revisió mostrada més alta: %ld - R msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6353,14 +6460,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Correu" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "La DLL del sistema de correu no és vàlida." -#. Resource IDs: (156) -msgid "Main" -msgstr "Principal" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Crea un dipòsit cru (sense directori de treball)" @@ -6373,47 +6476,47 @@ msgstr "Administra" msgid "Manage" msgstr "Administra" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Administra remots" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Marca com a resolt" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Marca com a resolt.\nL'estatus de l'arxiu s'ha canviat a modificat" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Marca per a comparar" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" -msgstr "" +msgstr "Blocs marcats" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Marca l'arxiu com a resolt al Git\nMarca com a resolt" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Marca revisió com a dolenta" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Marca revisió com a bona" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Fer coincidir ma&júsc/minúsc" @@ -6437,7 +6540,7 @@ msgstr "Els Me&nús mostren primer les comandes més recents" msgid "Menu" msgstr "Menú" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Barra de Menú" @@ -6445,7 +6548,7 @@ msgstr "Barra de Menú" msgid "Menu s&hadows" msgstr "&Ombres de Menú" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Fusiona" @@ -6453,34 +6556,34 @@ msgstr "Fusiona" msgid "Merge &Message" msgstr "Missatge de fusió" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Punt de fusió" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Fusiona Reintegra" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Fusiona cap a \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Fusionats" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Arxius fusionats" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Fusiona una altra branca" @@ -6488,22 +6591,22 @@ msgstr "Fusiona una altra branca" msgid "Merging" msgstr "Fusionant" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Fusionant des de %s, revisions de %s fins a %s, revisions %s a %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Fusionar requereix diferents revisions o diferents URLs a 'De:' i 'Cap a:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Fusionant revisions %s de %s dins de %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Missatge" @@ -6513,9 +6616,9 @@ msgstr "Només missatge" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "&Expressió de part de missatge" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Missatges" @@ -6523,23 +6626,27 @@ msgstr "Missatges" msgid "Min" msgstr "Mín" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Meu" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimitza la Cinta" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Nombre mínim de caràcters per un missatge d'entrega:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Miscel·lània" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Barrejat" @@ -6547,35 +6654,35 @@ msgstr "Barrejat" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: No modifiquis el directori de treball, però reinicialitza l'index" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Data de modificació" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Modificat" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Arxius modificats" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Més" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Més Botons" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Més Comandes..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Més colors..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Més" @@ -6595,41 +6702,41 @@ msgstr "Mou &Avall" msgid "Move &Up" msgstr "Mou &Amunt" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Mou Element Avall" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Mou Element Amunt" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Mou i canvia el nom" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Mou a la llista de canvis" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Mou/Canvia el nom" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Moure: Nom nou per a %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Mou els fitxers modificats a la paperera abans de restituir" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Movent %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Movent..." @@ -6637,11 +6744,11 @@ msgstr "Movent..." msgid "My file:" msgstr "El meu fitxer:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nom" @@ -6653,7 +6760,7 @@ msgstr "Nom:" msgid "Navigate" msgstr "Navega" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6663,11 +6770,11 @@ msgstr "Navega a una línia específica de la vista\nVés a la línia" msgid "Navigation Pane Options" msgstr "Opcions de Navegació" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opcions de Navegació..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Imbricat" @@ -6679,7 +6786,7 @@ msgstr "Xarxa" msgid "Network::Email" msgstr "Xarxa::Correu electrònic" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nou" @@ -6688,77 +6795,73 @@ msgid "New &name:" msgstr "Nou &nom:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nova branca\\etiqueta" +msgid "New Branch/Tag" +msgstr "Nova branca/etiqueta" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nou Menú" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nou nom per %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" -msgstr "" +msgstr "El nou nom no pot ser buit o igual que el nom original!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nou nom:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Nou sub-mòdul" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Hora d'entrega més nova" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" -msgstr "" +msgstr "Salts de línia" #. Resource IDs: (20308) msgid "Next" msgstr "Següent" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Pàgina Següent\nPàgina Següent" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Següent conflicte" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Següent diferència" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Següent diferència en-linia" -#. Resource IDs: (73) -msgid "No" -msgstr "No" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Sense avançaments ràpids" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6770,102 +6873,107 @@ msgstr "Sense extracció" msgid "No Co&mmit" msgstr "Sense entrega" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "No s'ha trobat el HEAD" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "No s'ha especificat cap comanda!\n\nTortoiseGitProc.exe és una extensió de Shell i no s'hauria d'executar manualment/directament!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "No s'ha especificat cap valor de comanda!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "No s'han trobat diferències!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "No s'han trobat diferències! Pot ser que el sub-mòdul no estigui actualitzat. Voleu actualitzar-lo ara?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "No hi ha disponible cap error de missatge." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "No ha ocorregut cap error." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "No s'han modificat carpetes o arxius. No hi ha res que TortoiseGit pugui restituir!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "No hi ha fitxers per mostrar amb la configuració actual.\nActiva una o més opcions de sota per veure fitxers sense versionar, ignorats i/o sense modificar.\nPer veure canvis remots, clica a 'Comprova Dipòsit'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "No s'han canviat o afegit arxius des de\nl'última entrega. No hi ha res\nque TortoiseGit pugui fer aqui..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "No s'han canviat o afegit arxius des de\nl'última entrega. No hi ha res\nque TortoiseGit pugui fer aqui...\nVols veure una llista d'arxius no versionats." +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "No hi ha cap gràfic disponible" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "No s'ha trobat codificador d'imatge per %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "No s'han trobat més revisions." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "No hi ha versió anterior." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "No s'han trobat referències!" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Sense correccions ortogràfiques" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "No hi ha cache d'estat. Només les carpetes versionades mostren una icona sobreposada, els fitxers no." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "No hi ha cap suggerència del diccionari" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "No s'ha trobat el directori de treball." @@ -6873,11 +6981,11 @@ msgstr "No s'ha trobat el directori de treball." msgid "Node size" msgstr "Mida del node" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Cap" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6889,30 +6997,30 @@ msgstr "SVN Commit normal" msgid "North European" msgstr "North European" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Arxius no versionats" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "No s'han pogut descarregar i validar tots els arxius." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Alguns valors del registre (o del fitxer INI) no s'han suprimit." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "No hi ha prou memòria per completar la operació." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "No hi ha prou memòria!\nReduïu la mida del gràfic de revisió contraient \nels nodes o bé reduint el factor de zoom." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "No hi ha pedaços." @@ -6920,7 +7028,7 @@ msgstr "No hi ha pedaços." msgid "Note node" msgstr "Nota del node" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6939,26 +7047,26 @@ msgstr "Nota: el directori conté elements sense versionar" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Nota: això afecta tots els clients Git, no només TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notes" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Res necessita fer un Rebase\n%s és igual que %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "No hi ha res per a fer Rebase" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "No hi ha res per entregar" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Nota" @@ -6966,7 +7074,7 @@ msgstr "Nota" msgid "Number Commits" msgstr "Enumera entregues" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Nombre de %s" @@ -6979,7 +7087,7 @@ msgstr "Nombre d'autors" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7051,41 +7159,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "D'acord" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Ha fracassat la inicialització OLE. Assegureu-vos que les biblioteques OLE tenen la versió correcta." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007, colors" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Hora de l'entrega més antiga" @@ -7093,15 +7201,15 @@ msgstr "Hora de l'entrega més antiga" msgid "Older lines" msgstr "Línies antigues" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Sota petició" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "No s'han pogut trobar un o més documents auto-desats." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Un o més fitxers són en estat de conflicte." @@ -7113,29 +7221,29 @@ msgstr "Només branca actual" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Només arxius fusionats" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Només fitxers fills" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Només es permeten números!\n(opcionalment separats per comes)" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Només aquest element" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Obre" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7145,51 +7253,52 @@ msgstr "Obre un document existent\nObre" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Obre arxius per diff o per aplicar un pedaç\nObre arxius" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Obre del portapapers" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Obre fitxer d'imatge" -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Obre carpeta pare" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Obre aquest document" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Obre amb..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Obre Ajuda\nTemes d'Ajuda" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Mostra el registre de referencies" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Navega Dipòsit" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opció" @@ -7198,30 +7307,30 @@ msgid "Options" msgstr "Opcions" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Mida original" +msgid "Ori&ginal size\tS" +msgstr "Mida ori&ginal\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Nom de l'origen" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Altres sub-finestres de Tasques" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Altres" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Canvis a enviar" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Entregues a enviar" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Sense memoria" @@ -7229,7 +7338,7 @@ msgstr "Sense memoria" msgid "Output Directory" msgstr "Directori de sortida" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Sortida.prn" @@ -7237,20 +7346,24 @@ msgstr "Sortida.prn" msgid "Override branch if exists" msgstr "Sobreesciu la branca, si ja existeix" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Pàgina %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7261,15 +7374,15 @@ msgstr "Pàgina %u\nPàgines %u-%u\n" msgid "Page :" msgstr "Pàgina :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Subfinestra 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Subfinestra 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Paràmetres" @@ -7277,25 +7390,25 @@ msgstr "Paràmetres" msgid "Parameters:" msgstr "Paràmetres:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Pare %d no existeix" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Pare 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Pare 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Pare(s)" @@ -7307,39 +7420,39 @@ msgstr "Part del codi ha sortit de TortoiseSVN Blame" msgid "Password" msgstr "Contrasenya:" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Contrasenya:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Enganxa" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Enganxa missatge recent..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Eina d'Enganxar\nEnganxa" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Enganxa llista de noms de fitxer" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Enganxa el missatge de la última entrega" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Enganxa el camí svn del porta-retalls, fent una operació de moure (tallar) o copiar" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Peda" @@ -7355,32 +7468,32 @@ msgstr "Aplica el pedaç als elements marcats" msgid "Patch As Attachment" msgstr "Pedaç com a fitxer adjunt" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Aplica el pedaç a tots els arxius" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Aplica el pedaç als arxius marcats" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Arxius de pedaç (*.diff, *.patch)|*.diff;*.patch|Tots els arxius (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "S'està aplicant un pedaç" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "S'està apedaçant l'arxiu '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Camí" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "S'ha trobat una ruta que encaixa millor amb el pedaç." @@ -7388,21 +7501,21 @@ msgstr "S'ha trobat una ruta que encaixa millor amb el pedaç." msgid "Path:" msgstr "Ruta:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Camins" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Eina de Llapis\nLlapis" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Percentatge d'autoria" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Percentatges" @@ -7410,24 +7523,24 @@ msgstr "Percentatges" msgid "Personalized Menus and Toolbars" msgstr "Menús i Barres d'Eines Personalitzats" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Escull" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Escull hash de l'entrega" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Escull missatge d'entrega" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Recull %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7437,56 +7550,56 @@ msgstr "Dibuix (Metafile)\nun dibuix" msgid "Picture:" msgstr "Dibuix:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Imatges (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Gràfics (*.gv)|*.gv|Tots els arxius (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Imatges (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Tots els arxius (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Diagrama de sectors" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Introdueix un scripts d'interconnexió per executar." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Introdueix una ruta a on aplicar l'scripts d'interconnexió" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Seleccioneu un tipus d'interconnexió" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Espereu mentre es cancel·la..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Espereu mentre s'obtenen les diferències..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Espereu un moment..." @@ -7502,11 +7615,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port :" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Interconnexió Post-Entrega" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Interconnexió Post-Empenta" @@ -7514,23 +7627,23 @@ msgstr "Interconnexió Post-Empenta" msgid "Pre&v Page" msgstr "Pàgina Prè&via" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Interconnexió Pre-Entrega" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Interconnexió Pre-empenta" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Preparant entrega..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Afegeix el bloc dret a l'inici" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Afegeix aquest bloc a l'esquerra, a l'inici" @@ -7542,11 +7655,11 @@ msgstr "Premeu nova tecla ràpida:" msgid "Press &new shortcut key:" msgstr "Premeu nova tecla ràpida:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Visualització Prèvia" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Previsualitza fitxer apedaçat" @@ -7558,51 +7671,51 @@ msgstr "Visualització Prèvia:" msgid "Previous" msgstr "Anterior" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Pàgina Anterior\nPàgina Anterior" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Versió anterior." -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflicte anterior" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Diferència anterior" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Diferència en-línia anterior" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Imprimeix" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Imprimeix Document\n&Imprimeix" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Imprimeix el document actiu fet servir les opcions actuals\nImpressió ràpida" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Imprimeix el document actiu\nImprimeix" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Imprimeix a Fitxer" @@ -7610,7 +7723,7 @@ msgstr "Imprimeix a Fitxer" msgid "Printer :" msgstr "Impressora:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Fitxers Impresora (*.prn)|*.prn|Tots els Fitxers (*.*)|*.*||" @@ -7618,11 +7731,11 @@ msgstr "Fitxers Impresora (*.prn)|*.prn|Tots els Fitxers (*.*)|*.*||" msgid "Printing" msgstr "Imprimint" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programa" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programes (*.exe)|*.exe|Tots els Fitxers (*.*)|*.*||" @@ -7630,11 +7743,11 @@ msgstr "Programes (*.exe)|*.exe|Tots els Fitxers (*.*)|*.*||" msgid "Progress" msgstr "Progrés" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" -msgstr "" +msgstr "Projecte" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Propietat" @@ -7642,17 +7755,17 @@ msgstr "Propietat" msgid "Property Page" msgstr "Pàgina de Propietats" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Proveïdor" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Parà&metres del proveïdor:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Proveïdor uuid win&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7674,15 +7787,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Estira" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Estira necessita que la branca seleccionada sigui la branca actual." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Estira..." @@ -7690,19 +7803,19 @@ msgstr "Estira..." msgid "Pull/Fetch" msgstr "Estira/Recupera" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Diferència estirada" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Registre estirat" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "Empeny" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Empeny" @@ -7718,11 +7831,11 @@ msgstr "" msgid "Push notes" msgstr "Empeny notes" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Empeny etiquetes" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Empeny..." @@ -7730,22 +7843,22 @@ msgstr "Empeny..." msgid "Putty Key:" msgstr "Clau putty" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Clau Privada Putty (*.ppk)|*.ppk|Tots els arxius (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Surt de l'aplicació; confirma si es vol desar els documents\nSurt" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7763,11 +7876,15 @@ msgstr "Unitats R&AM" msgid "R&eset" msgstr "Reinicialitza" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "R&everteix a aquesta revisió" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "Rebase" @@ -7775,7 +7892,7 @@ msgstr "Rebase" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7797,7 +7914,7 @@ msgstr "Remot:" msgid "Re&movable drives" msgstr "Unitats ex&traibles" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "A&nomena..." @@ -7813,15 +7930,15 @@ msgstr "Re&seteja Tot" msgid "Re&store defaults" msgstr "Re&staura valor per defecte" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Re&stitueix..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Accessible" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Llegeix la 'Guia d'Us Diari' abans de que et quedis bloquejat..." @@ -7829,21 +7946,21 @@ msgstr "Llegeix la 'Guia d'Us Diari' abans de que et quedis bloquejat..." msgid "Rebase" msgstr "Rebase" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Fés un rebase de \"%s\" aquí..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Rebase..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Rebasing... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Recent" @@ -7855,21 +7972,21 @@ msgstr "Arxius recents" msgid "Recently modified lines" msgstr "Línies modificades recentment" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Només Registre" -#. Resource IDs: (3887) +#. Resource IDs: (62184) 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" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Recupera l'estat d'abans del Rebase" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7883,17 +8000,21 @@ msgstr "Sub-mòdul recursiu" msgid "Recursive" msgstr "Recursiu" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Torna a fer la acció prèvia desfeta\nRefés" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Redueix la finestra a una icona" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref" @@ -7901,43 +8022,43 @@ msgstr "Ref" msgid "Ref (Click it then go to)" msgstr "Ref (Fes click i ves-hi)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Cerca refs" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "RefLog" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Refname" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Refresca" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Refrescant..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" -msgstr "" +msgstr "Filtre regex" #. Resource IDs: (164) msgid "Regex Filters" -msgstr "" +msgstr "Filtres regex" #. Resource IDs: (65535) msgid "Regex:" -msgstr "" +msgstr "Regex:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7956,7 +8077,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtre d'expressions corrents:\n. : qualsevol caràcter\nc+ : cerca coincidències caràcter c un o més cops\nc* : cerca coincidències caràcter c zero o més cops\n^ : inici de línia\n$ : final de línia\n(string){n} : cerca coincidències cadena n cops\n(abcd) : sub-expressió\n[aei0-9] : cerca coincidències a,e,i i 0..9\n[^aei0-9] : tot menys a,e,i o 0..9\n\n\\w : coincideix amb a-z,A-Z,0-9 and _\n\\W : any caràcter no-alfanumèric\n\\d : dígits 0-9\n\\s : espais en blanc" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Trossos de pedaç rebutjats per '%s'" @@ -7969,7 +8090,7 @@ msgstr "Temps relatius en el registre" msgid "Reload" msgstr "Recarrega" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8003,19 +8124,19 @@ msgstr "Branca que segueix una branca remota" msgid "Remote Branch" msgstr "Branca remota" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "La URL remota no pot estar buida" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Actualització remota" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "El nom remot no pot estar buit." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Estat Remot" @@ -8027,12 +8148,12 @@ msgstr "Remot:" msgid "Remove" msgstr "Treu" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Suprimeix %ld items" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Suprimeix %s" @@ -8041,7 +8162,7 @@ msgstr "Suprimeix %s" msgid "Remove &all untracked files (-fx)" msgstr "Treu tots els arxius que no estan rastrejats (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Branca remota" @@ -8049,21 +8170,21 @@ msgstr "Branca remota" msgid "Remove &non-ignored untracked files (-f)" msgstr "Treu els arxius no rastrejats que no estan ignorats (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" -msgstr "" +msgstr "Suprimeix tots els comentaris abans de fer el diff de manera que els canvis en els comentaris no es mostrin com a diferències" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Treu de la llista d'&ignorats" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Treu de la Barra d'Eines d'Accés Ràpid" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Treu de la llista de canvis" @@ -8075,7 +8196,7 @@ msgstr "Elimina arxius ignorats (-fX)" msgid "Remove untracked directories (-d)" msgstr "Elimina directoris no rastrejats (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Elimina els arxius no rastrejats del directori de treball" @@ -8083,11 +8204,11 @@ msgstr "Elimina els arxius no rastrejats del directori de treball" msgid "Removed" msgstr "Tret" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Tret de la llista de canvis" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8095,7 +8216,7 @@ msgid "" "from the ignore list." msgstr "-Esborrat(s) Patró(ns) de fitxer \n%s\nde la llista d'ignorats." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Treu el fitxer o màscara de fitxer de la llista d'elements ignorats" @@ -8103,11 +8224,11 @@ msgstr "Treu el fitxer o màscara de fitxer de la llista d'elements ignorats" msgid "Rena&me..." msgstr "C&anvia el Nom..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Canvia el nom" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Canvia el nom %s" @@ -8116,20 +8237,20 @@ msgstr "Canvia el nom %s" msgid "Rename - TortoiseGit" msgstr "Canvia el nom - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Canvia el nom/mou" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Reanomena els arxius/carpetes que estan sota el control de versions" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8137,9 +8258,9 @@ msgstr "Repeteix la darrera acció\nRepeteix" #. Resource IDs: (1512) msgid "Replace &All" -msgstr "" +msgstr "Substitueix &Tots" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8147,18 +8268,18 @@ msgstr "Reemplaça text específic amb text diferent\nReemplaça" #. Resource IDs: (65535) msgid "Replace with:" -msgstr "" +msgstr "Substitueix amb:" #. Resource IDs: (65535) msgid "Replace:" -msgstr "" +msgstr "Substitueix:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" -msgstr "" +msgstr "Substituïdes %d coincidències" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Reemplaçant" @@ -8182,11 +8303,11 @@ msgstr "Demana una estirada" msgid "Requests a username and a password" msgstr "Demana un nom d'usuari i contrasenya" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Res&ol..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "&Reinicialitza" @@ -8198,25 +8319,25 @@ msgstr "Reinicialitza &Tot" msgid "Reset Type" msgstr "Reinicialitza tipus" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Reinicialitza \"%s\" a això..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Reinicialitza branca activa" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Reinicialitza columnes" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Reinicialitza la branca actual \"%s\" a" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Resol" @@ -8224,126 +8345,122 @@ msgstr "Resol" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Resoldre conflicte utilitzant 'el meu'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Resoldre conflicte usant 'el seu'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Resolt" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Resolt:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Resol fitxers en conflicte" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Reinicia el rebase" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Restaura" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Restaura Per Defecte" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Restaura després de l'entrega" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Restaura finestra a tamany normal" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Restaurat" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Torna-ho a provar" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Tornant a intentar-ho en 2 segons..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Restitueix" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Restitueix entrega" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Restitueix entrega %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Restitueix a la revisió pare" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Restitueix a la revisió %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Restituït" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Restitueix tots els canvis que has fet des de la darrera actualització" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Desfés una addició al control de versions" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Revisa pedaç amb TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Revisa/aplica un arxiu de diff unificat amb TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Revisa/aplica un sol pedaç..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisió" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisió: %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisió: %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr " &Gràfic de revisions" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Arxius de revisió" @@ -8359,31 +8476,31 @@ msgstr "Filtre del Gràfic de Revisions" msgid "Revision graph" msgstr "Gràfic de revisions" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Revisió(ns) restituïda/es. Tots els canvis s'han integrat en el seu arbre de treball." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revisió:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Rebobina" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntext amb tipus de lletra i formatació de paràgrafs" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Visualització dreta:" @@ -8391,21 +8508,21 @@ msgstr "Visualització dreta:" msgid "Right image" msgstr "Imatge dreta" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Fila %d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Fila %d-%d of %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Fila avall" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Fila amunt" @@ -8413,11 +8530,11 @@ msgstr "Fila amunt" msgid "S&elect..." msgstr "Selecciona..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "M&ostra Botons en una Filera" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "M&ostra Botons en Dues Fileres" @@ -8425,25 +8542,33 @@ msgstr "M&ostra Botons en Dues Fileres" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "M&ostra Barra d'Eines de Ràpid Accès a sota de la Cinta" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "Es&tadístiques" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "Canvia a/Extreu" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8453,7 +8578,7 @@ msgstr "El servidor SMTP necessita autenticació" msgid "SMTP Server:" msgstr "Servidor SMTP:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, directament al servidor de destí" @@ -8461,31 +8586,31 @@ msgstr "SMTP, directament al servidor de destí" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "Entrega tipus SVN" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "Recupera de SVN" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8497,15 +8622,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Mateixa hora d'entrega" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8521,37 +8646,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Text de mostra:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Desa" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "&Anomena i Desa..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "&Anomena i Desa...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Anomena i Desa" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Anomena i desa l'arxiu inferior\nHaurà d'especificar on desar l'arxiu inferior" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Desa l'arxiu" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Anomena i desa l'arxiu de l'esquerra\nHaurà d'especificar on desar l'arxiu de l'esquerra" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8559,13 +8688,13 @@ msgid "" "%s" msgstr "Desa l'arxiu de l'esquerra\nLes modificacions s'han desat a \n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Desa l'arxiu de la dreta\nHaurà d'especificar on desar l'arxiu de la dreta" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8573,74 +8702,74 @@ msgid "" "%s" msgstr "Desa l'arxiu de la dreta\nLes modificacions s'han desat a \n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Desa'ls tots\nAmbdós arxius seran desats" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" -msgstr "" +msgstr "Desa i exclou\nEls vostres canvis es desen i s'utilitza el contingut original" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Desa i ignora els blocs marcats\nNomés es desen els vostres canvis manuals, els blocs marcats es deixen tal com estan" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "" +msgstr "Desa i inclou\nEls vostres canvis es desen i s'inclouen els blocs marcats" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Anomena i Desa" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Anomena i Desa" -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Anomena i desa\nHaurà d'especificar on desar l'arxiu" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Desa canvis a %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Desa canvis" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Desa revisió &a..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Desa el document actiu amb un nom nou\nAnomena i desa" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Desa el document actiu\nDesa" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8662,13 +8791,13 @@ msgstr "Desa diff unificat" msgid "Save unified diff since HEAD" msgstr "Desa diff unificat des de HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Desa\nDesa l'arxiu amb els marcadors de conflicte" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8680,28 +8809,28 @@ msgstr "Desa\nLes modificacions s'han desat a\n%s" msgid "Saved Data" msgstr "Dades desades" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "No s'ha pogut desar la configuració (clau: \"%s\", valor: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "No s'han pogut desar les notes." #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Escaneja" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Mou cap a l'Esquerra" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Mou cap a la Dreta" @@ -8709,32 +8838,32 @@ msgstr "Mou cap a la Dreta" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Cerca missatges &log..." #. Resource IDs: (1074) msgid "Search &up" -msgstr "" +msgstr "Cerca am&unt" #. Resource IDs: (65535) msgid "Search for:" msgstr "Cerca:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Cercant un camí millor on aplicar el pedaç..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Cerca fallida a %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Selecciona" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Selecciona &Tot" @@ -8750,59 +8879,59 @@ msgstr "Selecciona Menú de &contexte:" msgid "Select &window:" msgstr "Selecciona &finestra" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Selecciona Eina de Color\nSelecciona Color" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Selecciona Fitxer..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Selecciona client SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Selecciona un botó." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Selecciona un objecte per obtenir-ne ajuda" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Selecciona llista de canvis" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Selecciona aplicació comparació" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Seleccioneu carpeta que s'ha d'associar amb el seguidor d'incidències" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Seleccioneu la carpeta a on voleu exportar.\nPotser vulgueu crear una carpeta nova abans de fer la exportació." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Selecciona carpeta a on córrer el script" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Selecciona carpeta a on desar els fitxers seleccionats" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Selecciona fitxer amb l'script d'interconnexió" @@ -8810,20 +8939,20 @@ msgstr "Selecciona fitxer amb l'script d'interconnexió" msgid "Select items automatically" msgstr "Selecciona elements automàticament" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Selecciona aplicació de fusió" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Selecciona destinació de la fusió" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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ó." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8833,17 +8962,21 @@ msgstr "Selecciona el document sencer\nSeleciona tot" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Selecciona l'idioma per aquest projecte. Aquesta configuració afecta el corrector ortogràfic utilitzat en els missatges d'entrega." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Selecciona visualitzador per fitxers diff" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Seleccioni l'arxiu que voleu anomenar i desar" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8853,7 +8986,7 @@ msgstr "Seleccioni l'arxiu que voleu anomenar i desar\nNota: Hi ha un conflicte msgid "Select/deselect &all" msgstr "Selecciona/Desselecciona tots" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8861,7 +8994,7 @@ msgstr "" msgid "Send" msgstr "Envia" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Envia email" @@ -8869,11 +9002,11 @@ msgstr "Envia email" msgid "Send Mail after create" msgstr "Envia email després de crear" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Envia Correu no ha pogut enviar el missatge" -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Envia Correu..." @@ -8881,19 +9014,19 @@ msgstr "Envia Correu..." msgid "Send Patch" msgstr "Envia pedaç" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Envia pedaç per email" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Envia pedaç(os) per email" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Enviant contingut" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Enviant..." @@ -8913,28 +9046,28 @@ msgstr "Estableix &autor" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Estableix el remot com a \"pushremote\" de la branca seleccionada" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Estableix la branca remota com la \"pushbranch\" per la branca local seleccionada." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Establint propietats..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Configuració" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Configuració - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8942,7 +9075,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Shell Extended" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "El cache d'icones de shell s'ha regenerat!" @@ -8954,7 +9087,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Format curt de &data/hora als missatges de log " -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Escurça llista de propietats" @@ -8966,7 +9099,7 @@ msgstr "Mostra" msgid "Show &Accelerator for:" msgstr "Mostra &Accelerador per:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Mostra RefLog" @@ -8974,15 +9107,15 @@ msgstr "Mostra RefLog" msgid "Show &Unversioned Files" msgstr "Mostra arxius no versionats" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Mostra projecte &sencer" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Mostra &canvis" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Mostra &log" @@ -8990,15 +9123,19 @@ msgstr "Mostra &log" msgid "Show &log..." msgstr "Mostra &log..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Mostra &sobreposiscions i menú només a l'explorador" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Mostra Amunt de la Cinta" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Mostra Avall de la Cinta" @@ -9006,35 +9143,35 @@ msgstr "Mostra Avall de la Cinta" msgid "Show Environment Variables" msgstr "Mostra variables d'entorn" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Mostra Menys Botons" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Mostra nodes revisió HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) 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" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Mostra Diff en-línea\nDiff en-línea" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Mostra Més Botons" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Mostra Barra d'Eines de Ràpid Accés Amunt de la Cinta" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Mostra Barra d'Eines de Ràpid Accés sota la Cinta" @@ -9042,11 +9179,11 @@ msgstr "Mostra Barra d'Eines de Ràpid Accés sota la Cinta" msgid "Show Screen&Tips on toolbars" msgstr "Mostra Ajude sDe&Pantalla a les barres d'eina" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Mostra espais en blanc" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Mostra una visió general del gràfic complert" @@ -9054,7 +9191,7 @@ msgstr "Mostra una visió general del gràfic complert" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9062,11 +9199,11 @@ msgstr "" msgid "Show author" msgstr "Mostra l'autor" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Mostra les branques que tenen aquesta entrega" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Mostra canvis com a diff &unificat" @@ -9086,15 +9223,15 @@ msgstr "Mostra data" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Mostra la carpeta de destí" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Mostra Diff" @@ -9106,11 +9243,15 @@ msgstr "Mostra el diff amb l'anterior entrega" msgid "Show excluded folders as normal" msgstr "Mostra els directoris exclosos com si fossin normals" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Mostra menús &sencers després d'un temps curt" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9126,7 +9267,7 @@ msgstr "Mostra arxius ignorats" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9134,90 +9275,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Mostra número&s de línea" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Mostra el registre" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Mostra el registre abans de canviar el nom/copiar" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Mostra el registre de %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Mostra el registre del sub-mòdul" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Mostra el registre d'aquesta carpeta" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Mostra el registre..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Mostra els arxius modificat en el directori de treball" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Mostra el següent canvi de les entregues seleccionades\nMostra el següent" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Mostra node més vell a dalt" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Mostra o amaga barra de diferències de Línea\nMostra o Amaga BarDifLin" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Mostra o amaga barra localització\nMostra la barra de localització" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Mostra o amaga la barra d'estat\nCanvia la barra d'estat" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Mostra o amaga barra d'estat\nMostra Barra d'estat" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Mostra o amaga barra d'estat\nMostra Barra d'Estat" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Mostra el següent anterior de les entregues seleccionades\nMostra l'anterior" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Mostra propietats de la revisió" @@ -9225,7 +9366,7 @@ msgstr "Mostra propietats de la revisió" msgid "Show shortcut &keys in ScreenTips" msgstr "Mostra acceleradors de &teclat a les Ajudes de Pantalla" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9235,7 +9376,7 @@ msgstr "Mostra caràcters especials pels espais en blanc i els canvis de línia\ msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Mostra símbols a les etiquetes de refs que substitueixin part dels noms de refs" @@ -9247,45 +9388,43 @@ msgstr "Mostra arxius no modificats" msgid "Show un&versioned files" msgstr "Mostra arxius no versionats" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Mostra/Amaga" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Mostrant %ld revision(s), des de la %s fins a la %s - %ld revision(s) seleccionades, %ld arxiu(s) seleccionats\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Mostra representació gràfica de còpies/etiquetes/branques" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Mostra tots els fitxers modificats des de la darrera actualització, localment i en el diposit" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Mostra informació sobre TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Mostra el registre de referencies" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Mostra el fitxer d'accions de log amb l'editor de texte per defecte" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Mostra el registre per l'arxiu/carpeta seleccionat" @@ -9297,7 +9436,7 @@ msgstr "&Signa" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Estil platejat" @@ -9305,20 +9444,20 @@ msgstr "Estil platejat" msgid "Since" msgstr "Des de" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Mida" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Omet" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Omet pedaç: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Omet arbre de treball" @@ -9326,23 +9465,23 @@ msgstr "Omet arbre de treball" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Omet arbre de treball (\"Bloquejat\" a TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Ignorat" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Objectiu no trobat ignorat" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Desplaça" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" -msgstr "" +msgstr "Caràcter tabulador intel·ligent" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Soft" @@ -9350,13 +9489,13 @@ msgstr "Soft" msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Deixa el directori de treball i l'index sense modificar" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Alguns arxiu(s) han estat modificats fora de TortoiseGitMerge.\nVoleu carregar aquests els canvis?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9370,7 +9509,7 @@ msgstr "Ordena per nombre d'entregues" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9380,57 +9519,61 @@ msgstr "Especifica quants elements es volen mantenir en el diàleg de missatges msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Parteix línies" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Divideix la finestra activa en panells\nDivideix" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Esclafa" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Gràfic de barres apilades" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Gràfic de línies apilades" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Estàndard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Inici (avançament ràpid)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Inicia la tria" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Interconnexió d'inici Entrega" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Inicia Rebase" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Inicia mode Bisect..." #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Inicia editor del registre" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Inicia un servidor git utilitzant el protocol git" @@ -9442,39 +9585,47 @@ msgstr "Stash" msgid "Stash &Message" msgstr "Missatge de Stash" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Aplica des de l'Stash" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Llista del Stash" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Treu del Stash" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Desa al Stash" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "L'operació del Stash s'està executant..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Estàtic" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Estadístiques" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Estat" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configuració Barra d'Estat" @@ -9486,32 +9637,32 @@ msgstr "Estat i colors d'acció" msgid "Status cache" msgstr "Memòria cau d'Estat" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Caché d'Estat només per a una carpeta, amb sobreposicions recursives" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "La cache d'estats s'emmagatzema en un procés extern que detecta canvis en els arxius i pot mostrar sobreposicions recursivament" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Memòria cau d'Estat només per a una carpeta, sense sobreposicions recursives" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Atura el mode bisect" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." -msgstr "" +msgstr "Desa el camí del fitxer que s'utilitzarà per la comparació en un clic posterior amb el botó dret. Manté premuda la tecla Ctrl per suprimir el darrer camí desat." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Estratègia" @@ -9519,15 +9670,15 @@ msgstr "Estratègia" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Estil" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Assumpte" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Assumpte:" @@ -9535,7 +9686,7 @@ msgstr "Assumpte:" msgid "Submodule" msgstr "Sub-mòdul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9543,7 +9694,7 @@ msgstr "" msgid "Submodule Add" msgstr "Afegeix al sub-mòdul" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9551,15 +9702,15 @@ msgstr "" msgid "Submodule Diff" msgstr "Diff del sub-mòdul" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Inicialització del sub-mòdul" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Sincronització de sub-mòdul" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Actualització del sub-mòdul" @@ -9567,7 +9718,7 @@ msgstr "Actualització del sub-mòdul" msgid "Submodule Update Options" msgstr "Opcions d'actualització del sub-mòdul" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9582,15 +9733,15 @@ msgstr "" msgid "Submodules" msgstr "Sub-mòduls" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Èxit" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Canvia" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Canvia %s a %s, Revisió %s" @@ -9599,43 +9750,43 @@ msgstr "Canvia %s a %s, Revisió %s" msgid "Switch To" msgstr "canvia a" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Torna al panell previ\nPanell Previ" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Canvia entre visualització de panell doble i de panell simple" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Canvia entre visualització de panell doble i de panell simple\nCanvia entre visualització de panell doble i de panell simple" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Intercanvia la vista esquerra amb la dreta" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Intercanvia els continguts de les visualitzacions esquerra i dreta\nIntercanvia visualitzacions esquerra i dreta" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Canvia a la següent finestra de document" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Canvia al següent panell\nSegüent Panell" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Canvia a la finestra de document prèvia" @@ -9643,21 +9794,21 @@ msgstr "Canvia a la finestra de document prèvia" msgid "Switch/Checkout" msgstr "Canvia a/Extreu" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Canvia a/Extreu a" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Canvia/Extreu a aquest..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Extreu a/canvia el directori de treball a una altra branca/etiqueta" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Canvia la comparació esquerra<->dreta" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9667,23 +9818,23 @@ msgstr "Simbolitza noms de refs" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Sincronitza dipòsits remots, incloent Pull, Push, Email patch, etc..." -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sincronitza..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Sistema" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9693,13 +9844,13 @@ msgstr "S'han esborrat valors del registre i el fitxer INI (si existia) s'ha esb msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9713,7 +9864,7 @@ msgstr "Posicions Tabulador" msgid "Tab size:" msgstr "Mida tabulador:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Etiqueta" @@ -9721,16 +9872,16 @@ msgstr "Etiqueta" msgid "Tag (FF)" msgstr "Etiqueta (avançament ràpid)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Informació de l'etiqueta" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "S'ha etiquetat el directori de treball amb %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Etiquetes" @@ -9738,11 +9889,11 @@ msgstr "Etiquetes" msgid "Tags:" msgstr "&Etiquetes:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tasques" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Zona de Tasques" @@ -9754,11 +9905,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Només prova" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9766,13 +9917,19 @@ msgstr "" msgid "Thai" msgstr "Thai" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "La configuració del remot ha canviat.\nVoleu desar-ho ara, o descartar els canvis?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9780,64 +9937,78 @@ msgid "" "Do you really want to delete it?" msgstr "La branca \"%s\" és una branca remota.\n\nRealment voleu eliminar-la?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "El tamany del troç no correspon al nombre de línies afegides/esborrades!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "El missatge d'entrega no pot estar buit." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Ja existeix l'auxiliar de credencials amb URL \"%s\".\nVoleu sobreescriure'l?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "S'ha canviat l'auxiliar de credencials.\nVoleu desar els canvis o descartar-los?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "L'arbre de treball actual no està net.\nVoleu stash els canvis?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "L'eina de diferències s'ha aturat degut a un error:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "El ref introduït és ambigu.\nHeu de fer-lo úni (per exemple: afegint \"refs/heads/\" com a prefix per branques o \"regs/tags/\" per etiquetes)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "El fitxer %s no existeix!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "El fitxer %s no s'ha trobat al fitxer pedaç!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "L'arxius \"%s\" no existeix en el seu directori de treball." -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9846,15 +10017,15 @@ msgid "" "Do you want to remove the file?" msgstr "El fitxer \n%s\nés buit.\nVoleu esborrar-lo?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Aquest fitxer és massa gran" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "El fitxer és massa gran per obrir-lo." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9862,7 +10033,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "El fitxer\n%s\nja existeix! Voleu sobre-escriure'l?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9870,14 +10041,14 @@ msgid "" "is not a valid text file!" msgstr "L'arxiu\n%s\nno és un arxiu de text vàlid!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Aquesta carpeta %s\nconté un(s) fitxer(s) sense versionar o sense modificar. Voleu eliminar-la igualment?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9886,78 +10057,78 @@ msgid "" "Would you like to create it first?" msgstr "La carpeta \n%s\nno existeix.\nVoleu crear-la?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "L'script d'interconnexió ha retornat un error:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "La imatge no es pot mostrar." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "El proveïdor del seguidor d'incidències no s'ha pogut crear. Comproveu que s'hagi instal·lat correctament." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "El proveïdor del seguidor d'incidències no ha pogut validar la cadena de paràmetres" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "S'esperava una línia indicant que s'esperava un nou fitxer a la línea %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "El número de línia ha d'estar entre %d i %d." -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "La branca local \"%s\" no pot fer un avançament ràpid fins a la branca remota \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "La branques local i remota tenen noms buits.\nVol continuar?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "No s'ha especificat la branca local. Aixo eliminara la branca remota.\nVol continuar?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Màxim nombre de línies d'acció que s'han de guardar.\nTotes les línies per sobre d'aquest límit esborraran les anteriors del fitxer." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "L'operació ha fallat." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Els paràmetres '/path' i '/pathfile' són mutuament exclusius.\nHas d'especificar-ne només un." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "El pedaç no s'aplica de manera neta a %s i no hi ha informació de la versió.\nNo és possible aplicar el pedaç!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9967,7 +10138,7 @@ msgid "" "do not match!" msgstr "El pedaç sembla antic. La línia de l'arxiu:\n%s\ni la línia del pedaç\n%s\nno encaixen!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9978,7 +10149,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "La ruta que heu introduït no sembla legal.\nPodeu fer-la servir, però pot ser que tingueu problemes més endavant.\n\nUna ruta vàlida no pot contenir els següents caràcters '<<>|\"?*:' o un dels \nsegüents noms de dispositiu: com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nVoleu continuar de totes maneres?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9989,36 +10160,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "La ruta\n%s\nsembla no encaixar les rutes del pedaç.\nPerò TortoiseGitMerge ha trobat la ruta\n%s\nque millor encaixa. Voleu utilitzar la ruta suggerida?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "L'expressió regular és incorrecta.\nIntroduïu una expressió regular correcta." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "El remot %s ja existeix!\nVoleu sobre-escriure'l?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "S'ha creat el dipòsit correctament." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "El fitxer seleccionat sembla que té encara un o més marcadors de conflicte.\nEsteu segur que voleu marcar el fitxer coma resolt?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10026,7 +10204,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "El sub-mòdul \"%s\" no està net.\nSimplement fent una entrega en el super-projecte pare no pot registrar els canvis fets al sub-mòdul.\nFeu una entrega del sub-mòdul ara, o voleu ignorar els canvis bruts?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10035,7 +10213,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10044,26 +10222,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "La carpeta de destí\n%s\nno està buida!\nEsteu segurs que voleu inicialitzar un nou dipòsit git en aquesta carpeta?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" -msgstr "" +msgstr "El text és idèntic, però els fitxers no coincideixen!\nS'han trobat les següents diferències:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Temps en segons després del qual l'anàlisi dels fitxers seleccionats s'atura.\nUn valor baix fa que la llista d'autocompletació es generi més aviat,\nperò pot fer que no s'escanegin tot els fitxers." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Les dues URL's seleccionades no s'han creat des de la mateixa arrel.\nNo és possible mostrar els missatges de log entre elles!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10073,34 +10251,34 @@ msgstr "" msgid "Their file:" msgstr "El seu fitxer:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Els seus" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Hi ha arxius canviats o sense versionar dins d'un o més sub-mòduls.\nAquests arxius no apareixen llistats en l'entrega. Has d'entregar aquells arxius en el sub-mòdul" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Ara mateix hi ha %d icones de superposició instal·lades, a part de les que fa servir Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Hi ha més vistes editables.\nQuina vista vol desar?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "No hi ha proveïdors de seguidors d'incidències disponibles." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10109,85 +10287,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Encara hi ha conflictes sense resoldre a la línea %d!\nHeu de resoldre aquests conflictes abans de desar.\nVoleu desar el fitxer amb conflictes?\nSi cliqueu SÍ, llavors heu de resoldre els conflictes manualment en un altre editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Hi ha modificacions sense desar!\nVoleu desar els canvis?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "No hi ha res a afegir. Tots els arxius i directoris, o bé ja estan sota control de versions, o han estat ignorats local o globalment." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Diccionari" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Aquests han estat desats més recentment que els documents actualment oberts, i contenen canvis que es van fer abans de tancar l'aplicació." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "El camp és obligatori i no es pot deixar buit." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Això no és una URL vàlida.\nSi us plau introduïu una URL vàlida." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "La ruta que heu introduït no sembla legal.\nUna ruta vàlida no pot contenir els següents caràcters '<<>|\"?*:' o un dels \nsegüents noms de dispositiu: com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Aquest programa és enllaçat a una funció que no es troba a %s del fitxer %s. Aquesta màquina pot tenir una versió incompatible de %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Aquest programa requereix el fitxer %s, que no s'ha trobat al sistema." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Aquesta propietat només s'accepta en carpetes, no en fitxers." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Aquesta operació necessita que el directori de treball estigui net." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Això esborrarà el registre de les comandes que heu utilitzat en aquesta aplicació i restaurarà el conjunt per defecte de comandes visibles als menús i barres d'eines. No desfarà cap personalització explícita. Esteu segur que voleu fer això?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Diff a tres bandes" @@ -10203,14 +10381,14 @@ msgstr "Mosaic horitzontal" msgid "To" msgstr "A" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "Per evitar recuperar etiquetes incorrectes, si aquest no és un remot oficial,\nes recomana que desactivi la captura d'etiquetes d'aquest remot.\nVol desactivar la captura d'etiquetes?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10222,13 +10400,13 @@ msgstr "" msgid "To:" msgstr "A:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Commuta Una/Dues Pàgines\nCommuta Una/Dues Pàgines" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10240,11 +10418,11 @@ msgstr "Barra d'Eines" msgid "Toolbar Name" msgstr "Nom Barra d'Eines" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opcions Barra d'Eines" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Error intern de la Barra d'eines. Si us plau contacteu amb el venedor de la vostra aplicació." @@ -10260,16 +10438,16 @@ msgstr "Eines" msgid "Tools:" msgstr "Eines:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10279,20 +10457,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit ha detectat que l'arxiu \"%s\" no existeix, però esta marcat com a \"afegit\".\nLa finestra d'entrega no sap com manejar aquesta situació.\n\nVoleu treure el fitxer de l'index?" +"Do you want to restore or remove it from the index?" +msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit ha detectat noms similars. Vol que reanomeni els arxius %s?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit no mostrarà les següents icones de superposició: %s" @@ -10301,18 +10479,18 @@ msgstr "TortoiseGit no mostrarà les següents icones de superposició: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame ja estava inicialitzat pel dipòsit \"%s\". No es pot canviar a un altre dipòsit (\"%s\") mentre n'hi ha un d'obert." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10328,7 +10506,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10336,7 +10514,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Una eina per a fer diffs d'imatges, part de TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10350,16 +10528,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10368,18 +10546,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge no pot processar aquest arxiu de pedaç. L'arxiu \"%s\" apareix més d'una vegada." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10418,11 +10596,11 @@ msgstr "Rastreja" msgid "Tracked Remote Branch:" msgstr "Segueix branca remota:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Transferint a %s" @@ -10431,39 +10609,35 @@ msgstr "Transferint a %s" msgid "Transparent &color..." msgstr "&Color Transparent..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Retalla espais de la dreta" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Prova de fer 'Neteja'. Si això no funciona haureu de fer una nova extracció." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Proveu un altre cop" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turkish" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Personalitza TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tipus" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Tipus:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10487,24 +10661,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "No s 'ha pogut carregar suport pel sistema d'e-mail" -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "No es pot processar la comanda. El servidor es troba ocupat." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "No ha pogut llegir des de %1, és obert per algú altre." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "No es pot llegir propietat només d'escriptura." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10512,91 +10686,95 @@ msgid "" "from the top pane in the log dialog." msgstr "No s'ha pogut reconstruir la ruta de l'arbre de treball!\nAixò pot passar si l'arxiu ha estat modificat.\nSi us plau, inicii el diàleg de registre només en aquest arxiu i després restitueixi els canvis en el tauler superior del diàleg de registre." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "No es pot escriure propietat només de lectura." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "No es possible escriure a %1, es de només lectura o és oberta per algú altre." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Desactiva" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Desfés" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Desfés %d Accions" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Desfés 1 Acció" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Desfés afegir" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Desfés la última acció\nDesfés" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Desfés les últimes modificacions\nDesfés" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Format de fitxer no esperat" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Desplega" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Text sense Format\ntext sense cap format" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "&Diff unificades de revisions HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Desconegut" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "&Profunditat desconeguda" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Conflictes sense resoldre!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Sense títol" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Sense versionar" @@ -10604,7 +10782,7 @@ msgstr "Sense versionar" msgid "Unversioned files mark parent folder as modified" msgstr "Els fitxers sense versionar marquen la carpeta contenidora com a modificada" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Deixant de versionar %s" @@ -10617,23 +10795,23 @@ msgstr "Amunt" msgid "Update" msgstr "Actualitza" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Actualitza Ref" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Actualitza Sub-mòduls" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Actuallitzat" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Actualitzant objectes ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Actualitzant index" @@ -10645,30 +10823,26 @@ msgstr "Utilitza Imatge per &Defecte:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Utilitza per defecte la visualització &un-panell per trobar diferències de 2 fitxers" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Utilitza un altre &bloc de text" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Utilitza el bloc de text \"meu\"" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Utilitza el bloc de text \"meu\", i després el \"d'ells\"" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Utilitza el bloc de text \"d'ells\"" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Utilitza el bloc de text \"d'ells\", i després el \"meu\"" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Utilitza blocs" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Utilitza component de ruta HTTP" @@ -10689,15 +10863,15 @@ msgstr "Utilitza empaquetatge lleuger (per a connexions lentes)" msgid "Use Unified Diff from &clipboard" msgstr "Utilitza Diff Unificat des del p&ortapapers" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Faci servir un altre nom o activi la opció \"Força\" per tal de sobre-escriure-ho." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Faci servir un nom diferent, o activi la opció \"sobreescriu la branca\"." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10707,7 +10881,7 @@ msgstr "Utilitza tot el contingut de la vista esquerra\nUtilitza fitxer esquerra msgid "Use block from left before right" msgstr "Utilitza bloc esquerra abans que dreta" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10717,25 +10891,25 @@ msgstr "Utilitza bloc de la vista esquerra abans que bloc de la vista dreta\nUti msgid "Use block from right before left" msgstr "Utilitza bloc dreta abans que esquerra" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Utilitza bloc de la vista dreta abans que bloc de la vista esquerra\nUtilitza bloc de la dreta abans que de l'esquerra" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Utilitza els dos blocs de text (primer aquest)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Utilitza els dos blocs de text (aquest el darrer)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Utilitza el bloc de l'esquerra" @@ -10751,77 +10925,77 @@ msgstr "Utilitza el color de la branca local per la branca actual" msgid "Use recycle bin when reverting" msgstr "No eliminis els arxius a restituir, envia'ls a la paperera." -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Utilitzar expressió regular " -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Utilitza el bloc de la dreta" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" -msgstr "" +msgstr "Utilitza espais" #. Resource IDs: (1426) msgid "Use system locale for date/time" msgstr "Utilitzeu la configuració local per la data/hora" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Utilitza bloc de text de '&el meu'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Utilitza bloc de text de '&el seu'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Utilitza bloc de text de 'el m&eu' abans de 'el seu'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Utilitza bloc de text 'el meu' abans de 'el seu'\nUtilitza bloc de text 'el meu' llavors 'el seu'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Utilitza bloc de text del 'el meu'\nUtilitza bloc de text 'el meu'" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Utilitza bloc de text de 'el &seu' abans de 'el meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Utilitza bloc de text 'el seu' abans que 'el meu'\nBloc de text 'el seu' llavors 'el meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Utilitza bloc de text de 'el seu'\nUtilitza bloc de text 'el seu'" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Utilitza bloc text de la vista esquerra\nUtilitza bloc esquerra" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Utilitza a&quest bloc de text" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10829,7 +11003,7 @@ msgid "" "%s" msgstr "Utilitza el pedaç trobat.\nAplica el pedaç a\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10841,19 +11015,19 @@ msgstr "Utilitza el pedaç original\nAplica el pedaç a\n%s" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Utilitza &tot aquest fitxer" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Utilitza a&quest bloc a l'esquerra" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Utilitza l'altre &fitxer sencer" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Fes-lo servir per a corregir la punta de la branca actual." @@ -10869,11 +11043,11 @@ msgstr "Informació de l'usuari" msgid "User Name:" msgstr "Nom d'usuari:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Cancel·lat pel usuari" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10883,11 +11057,11 @@ msgstr "El nom d'usuari i email s'han de configurar abans de crear una entrega.\ msgid "User&name:" msgstr "Nom d'usuari:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nom d'usuari" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10904,9 +11078,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "Opcions vàlides de la línia d'ordres:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valor" @@ -10914,24 +11088,24 @@ msgstr "Valor" msgid "Version" msgstr "Versió" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Versió %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Versió 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Versió 1 (Hora d'entrega més nova)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Versió 2 (Base)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Versió 2 (Base) (Hora d'entrega més nova)" @@ -10939,11 +11113,11 @@ msgstr "Versió 2 (Base) (Hora d'entrega més nova)" msgid "Version Information" msgstr "Informació de la Versió" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versió:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versionat" @@ -10955,23 +11129,27 @@ msgstr "Vietnamese" msgid "View" msgstr "Visualiització" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Mostra .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Veure pedaç" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Veure pedaç>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Visualitza revisió pel camí al visor &web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Veure revisió en editor alternatiu" @@ -10983,11 +11161,11 @@ msgstr "Obre gitconfig per tot el sistema" msgid "Visit our website" msgstr "Visiteu el nostre lloc web" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10998,7 +11176,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ADVERTIMENT:\nNo canvii aquestes opcions a menys que sàpiga exactament què està fent!\nPer a restaurar aquests elements al seu valor original, elimini el text." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Espereu" @@ -11006,7 +11184,7 @@ msgstr "Espereu" msgid "Wait for the script to finish" msgstr "Espereu que acabi el script" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Esperant una entrada" @@ -11014,15 +11192,15 @@ msgstr "Esperant una entrada" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Atenció" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Atenció!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11030,7 +11208,7 @@ msgid "" "Do you really want to continue?" msgstr "Avís: \"%s\" serà eliminat permanentment i NO es podrà recuperar!\n\nRealment voleu continuar?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11038,56 +11216,56 @@ msgstr "Web" msgid "Western European" msgstr "Western European" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Quan s'activa, pot mantenir premuda la tecla MAJUSC. mentre clica amb el botó dret, per a incloure el menu de TortoiseGit al menu contextual normal." -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Quan s'apliqui un pedaç, ignora els canvis en els espais en blanc, si fós necessari" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Quan està habilitat, els elements versionats llistats se seleccionen automàticament" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Quan el pedaç no s'aplica fàcilment, intenta fer una fusió a 3 bandes, si és que el pedaç té referencies dels blobs on s'ha d'aplicar, i aquests blobs estan disponibles localment." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11097,15 +11275,15 @@ msgid "" "authentication and/or encryption." msgstr "Mentre s'executa el dimoni, totes les dades d'aquest dipòsit queden exposades, sense autenticació ni encriptació." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" -msgstr "" +msgstr "Canvis d'espai en blanc (tabuladors, espais)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Espais en Blanc" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Posició de la finestra" @@ -11113,15 +11291,15 @@ msgstr "Posició de la finestra" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11165,11 +11343,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Directori de treball" @@ -11177,29 +11355,25 @@ msgstr "Directori de treball" msgid "Working Tree Path:" msgstr "Ruta del directori de treball:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Canvis en el directori de treball" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Ajusta les línies llargues" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Ajusta les línies llargues a la part dreta de la vista\nAjusta les línies llargues" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Sí" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Sí a tot" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Ja heu provat la darrera versió instal·lada" @@ -11209,51 +11383,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Pot desactivar la sobreposició d'icones aquí.\nSi es desactiven, no s'usaran recursos de superposició, i altres extensions de Shell podran mostrar la seva pròpia superposició " -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Només podeu enganxar bitmaps de tamany (%d x %d) !" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "No podeu crear més de %d barres d'eines definides pel usuari!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "No podeu establir aquesta propietat a les carpetes, només als fitxers!\nSi voleu establir-la a tots els fitxers dins d'aquesta carpeta,\nheu de marcar la casella 'recursivament'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "No podeu canviar el tipus d'aquesta referència canviant el nom." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Heu activat la casella \"Inclou arxius no rastrejats\".\nAixò requereix executar \"git clean -fd\", per tal de treure els arxius/directoris sense fer servir la paperera de reciclatge." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" -msgstr "" +msgstr "Heu marcat blocs modificats. Com caldria desar aquests blocs?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Heu modificat propietats sense desar-les.\nVoleu desar-les ara?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11261,67 +11435,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Heu escollit %d elements per a mostrar el diff.\nS'obrirà una instància del visor de Diffs per a cadascún d'aquests elements.\nRealment voleu mostrar els Diffs de tots aquests elements a la vegada?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "No heu introduit un número d'emissió!\nEsteu segur que voleu fer una entrega sense número d'emissió?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "No heu introduït res al camp \"Signat per\"!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Heu marcat alguns arxius com \"restaura després de l'entrega\".\nVoleu restaurar-los ara? Podeu perdre tots els canvis fets a aquest arxiu després de marcar-lo." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Podeu definir fins a %d eines." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Heu d'introduir un missatge per aquesta entrega" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Heu de reiniciar el sistema per tal que els canvis tinguin efecte." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Heu d'especificar un nom per l'arxiu ZIP" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Heu escollit una carpeta.\nNomés és possible exportar a un arxiu ZIP (*.zip)" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Heu seleccionat un fitxer sense versionar.\nEl fitxer serà afegit al control de versions quan feu una entrega." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Heu d'introduir un text!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Heu de seleccionar una imatge!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Heu canviat les icones de %s a %s.\nEls canvis no tindran efecte fins que es reinicii l'ordinador." -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11331,7 +11505,7 @@ msgstr "Els missatges de log han sigut desats.\nFeu clic aquí per llegir-los i msgid "Your version is:" msgstr "La versió és:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "La teva versió és: %d.%d.%d.%d" @@ -11341,10 +11515,10 @@ msgid "Zip File" msgstr "Arxiu ZIP" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Allunya" +msgid "Zoo&m out\t-" +msgstr "Allunya\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zoom" @@ -11356,80 +11530,80 @@ msgstr "&Ampliar" msgid "Zoom &Out" msgstr "Reduir" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Ampliar\nAmpliar" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Reduir\nReduir" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Ampliar" +msgid "Zoom i&n\t+" +msgstr "Ampliar\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Ampliar" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Reduir" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zoom per ajustar" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zoom per ajustar en alçada" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zoom per ajustar en amplada" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Predeterminat]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Sense assignar]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" no és valid." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" no és un dipòsit git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11443,7 +11617,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "afegeix \"escollit des de\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "afegit" @@ -11451,7 +11625,7 @@ msgstr "afegit" msgid "added files" msgstr "fitxers afegits" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "un fitxer sense nom" @@ -11459,14 +11633,19 @@ msgstr "un fitxer sense nom" msgid "and support the developers" msgstr "i suporteu els desenvolupadors" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "Considera'l vàlid" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "Basat en TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11499,30 +11678,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "Entregues" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "en conflicte" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copiat desde\n%s - revisió %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dia" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "suprimit" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11534,7 +11713,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "Configuració de correu electrònic" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11543,16 +11722,16 @@ msgid "" "%s" msgstr "exportat\n%s\na\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "extern" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "Git no s'ha tancat bé (codi de sortida %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorat" @@ -11560,23 +11739,23 @@ msgstr "ignorat" msgid "include &untracked" msgstr "Inclou arxius no rastrejats" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incomplet" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "Element guardat localment" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "manté les llistes de fitxers en anglès" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11585,7 +11764,7 @@ msgid "" "%s = %ld" msgstr "línia: %d(+) %d(-) arxius: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11600,11 +11779,11 @@ msgstr "línia: %d(+) %d(-) arxius: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "fusionat" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "manca" @@ -11612,7 +11791,7 @@ msgstr "manca" msgid "missing/deleted/replaced" msgstr "No trobat/eliminat/substituït" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "modificat" @@ -11620,7 +11799,7 @@ msgstr "modificat" msgid "modified/copied" msgstr "Modificat/copiat" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mes" @@ -11628,40 +11807,44 @@ msgstr "mes" msgid "new branch" msgstr "Nova branca" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "no" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "no hi ha descripció disponible per aquesta comanda" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "sense versionar" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "no trobat" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "obstruït" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "a %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "píxels" @@ -11669,11 +11852,11 @@ msgstr "píxels" msgid "possible or real conflict/obstructed" msgstr "Un conflicte possible o real s'ha evitat" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestre" @@ -11681,35 +11864,35 @@ msgstr "trimestre" msgid "renamed" msgstr "Reanomenat" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "substituït" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "escanejant camí:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "Omet arbre de treball" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "canviat a\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "Ocupa't dels canvis als sub-mòduls" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "a %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "a %s" @@ -11718,35 +11901,35 @@ msgstr "a %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "setmana" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - tots els usuaris de Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - l'usuari de windows actual" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - només aquest dipòsit" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - l'usuari de windows actual" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - només aquest dipòsit" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "any" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "sí" diff --git a/Languages/Tortoise_cs.po b/Languages/Tortoise_cs.po index aae722d8e..5c0201b9d 100644 --- a/Languages/Tortoise_cs.po +++ b/Languages/Tortoise_cs.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-03 07:21+0000\n" +"PO-Revision-Date: 2015-08-02 17:13+0000\n" "Last-Translator: Zbyněk Schwarz \n" "Language-Team: Czech (http://www.transifex.com/projects/p/tortoisegit/language/cs/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -47,138 +47,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "poč. autorů zobrazených jednotlivě:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "Přeneseno %.2f MiB" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 obsahovalo neočekávaný objekt." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 obsahuje nesprávnou cestu." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 obsahuje nesprávné schéma." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 má špatný formát." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 nebylo nalezeno." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "Před %1!d! dnem" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "Před %1!d! dny" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "Před %1!d! hodinou" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "Před %1!d! hodinami" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "Před %1!d! minutou" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "Před %1!d! měsícem" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "Před %1!d! měsíci" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "Před %1!d! vteřinou" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "Před %1!d! vteřinami" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "Před %1!d! týdnem" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "Před %1!d! týdny" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "Před %1!d! rokem" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "Před %1!d! lety" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "Zvoleno %1!d! položek" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "Před %1!d! minutami" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nZobrazeno %2!d! souborů, %3!d! podmodulů a %4!d! složek, %5!d! položek celkem" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nVelikost %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nPokračovat ve spouštění skriptu?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -186,52 +186,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nNelze najít tento soubor.\nOvěřte, že je zadána správná cesta a název souboru." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig nebo %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "Přeneseno %I64d Bajtů" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "Přeneseno %I64d KiB" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d odevzdání chybí v \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d souborů změněno" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d souborů odstraněno." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d souborů vráceno na %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d souborů vybráno, %d souborů celkem" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d nejaktivnějších autorů, každý s alespoň %d odevzdáními (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -239,78 +239,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% průhlednost\nklikněte pro přepnutí průhlednosti\ndvojitým kliknutím bude průhlednost přepínána automaticky" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minut(a) a %ld vteřin(a)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld z %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - v revizi: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Obnoveno]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s v %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s vyžaduje Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, v %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Pracovní strom" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) z %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Export z %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nNelze zcela záplatovat." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nChcete ho přesto odstranit?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -326,6 +326,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&Trojité porovnání" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Ukončit" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&O TortoiseGitBlame..." @@ -354,15 +358,15 @@ msgstr "&Přidat filtr" msgid "&Add New/Save" msgstr "&Přidat nový/Uložit" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Přidat" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Přidat nebo odstranit tlačítka" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Přidat..." @@ -402,7 +406,7 @@ msgstr "&Přidělit" msgid "&Associate double-click event with:" msgstr "&Přidružit událost dvojitého kliknutí k:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Automaticky skrýt" @@ -418,15 +422,15 @@ msgstr "&Automaticky načíst klíč Putty" msgid "&Backup original file" msgstr "&Zálohovat původní soubor" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Anotovat" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Anotovat změny" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Anotovat revize" @@ -450,7 +454,7 @@ msgstr "&Větev:" msgid "&Browse Dir" msgstr "&Procházet adr" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Procházet úložiště" @@ -486,7 +490,7 @@ msgstr "&Kategorie:" msgid "&Choose commands from:" msgstr "&Zvolit příkazy z:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Vyčistit..." @@ -510,7 +514,7 @@ msgstr "&Zavřít okna" msgid "&Command:" msgstr "&Příkaz:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Odevzdat" @@ -518,23 +522,27 @@ msgstr "&Odevzdat" msgid "&Commit submodule..." msgstr "&Odevzdat podmodul..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Odevzdat bez" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Odevzdat..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Porovnat revize" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Zhuštěný graf" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Pokračovat" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopírovat" @@ -554,11 +562,11 @@ msgstr "&Vlastní" msgid "&Default" msgstr "&Výchozí" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Smazat" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Smazat (ponechat místní)" @@ -566,7 +574,7 @@ msgstr "&Smazat (ponechat místní)" msgid "&Delete Filter" msgstr "&Smazat filtr" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Smazat vzdálené a místní" @@ -578,11 +586,11 @@ msgstr "&Zjistit přesunuté nebo zkopírované řádky" msgid "&Detect moved or copied lines:" msgstr "&Zjistit přesunuté nebo zkopírované řádky:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Porovnat" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Porovnat s předchozí verzí" @@ -594,7 +602,7 @@ msgstr "&Adresář:" msgid "&Disabled" msgstr "&Zakázáno" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Zahodit" @@ -602,7 +610,7 @@ msgstr "&Zahodit" msgid "&Do the same for the rest" msgstr "&Provést totéž u ostatních" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Ukotvení" @@ -610,11 +618,15 @@ msgstr "&Ukotvení" msgid "&Don't ask me again" msgstr "&Již se mě neptat" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "&Tuto zprávu již nezobrazovat" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Dolů" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Stáhnout" @@ -622,11 +634,11 @@ msgstr "&Stáhnout" msgid "&Edit" msgstr "&Upravit" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Upravit .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Upravit VŠE" @@ -634,7 +646,7 @@ msgstr "&Upravit VŠE" msgid "&Edit Filter" msgstr "&Upravit filtr" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Upravit konflikty" @@ -659,10 +671,10 @@ msgid "&Enable edit" msgstr "&Povolit úpravy" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "&Ukončit" +msgid "&Exit\tCtrl+W" +msgstr "&Ukončit\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportovat výběr do..." @@ -674,27 +686,27 @@ msgstr "&Externí" msgid "&File" msgstr "&Soubor" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Najít" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Hledat\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Přizpůsobit obrázky oknu" +msgid "&Fit images in window\tF" +msgstr "&Přizpůsobit obrázky dle okna\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Pevné disky" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Plovoucí" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Sledovat přejmenování" @@ -706,7 +718,7 @@ msgstr "&Písmo pro zprávy protokolu:" msgid "&Font:" msgstr "&Písmo:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Vynutit" @@ -726,7 +738,7 @@ msgstr "&Odevzdávání ve stylu Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Přejít na\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "Zašedivět &Nesouvisející změněné cesty" @@ -738,7 +750,7 @@ msgstr "&Zelená:" msgid "&HEAD" msgstr "Č&elo" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Nápověda" @@ -746,7 +758,7 @@ msgstr "&Nápověda" msgid "&Help Topics" msgstr "&Témata nápovědy" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Skrýt" @@ -754,11 +766,11 @@ msgstr "&Skrýt" msgid "&Icon Set:" msgstr "&Sada ikon:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorovat" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorovat %d položek podle názvu" @@ -772,14 +784,14 @@ msgid "&Image" msgstr "&Obrázek" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informace o obrázku" +msgid "&Image info\tI" +msgstr "&Informace o obrázku\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Pouze obrázek" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importovat..." @@ -791,7 +803,7 @@ msgstr "&Počáteční adresář:" msgid "&Initialize submodules (--init)" msgstr "&Zavést podmoduly (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Instalovat" @@ -803,11 +815,11 @@ msgstr "&Při načtení přejít na první rozdíl" msgid "&Keep CR" msgstr "&Zanechat CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Ponechat současný stav" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "Š&títky" @@ -835,7 +847,7 @@ msgstr "&Limit:" msgid "&Line number" msgstr "Čí&slo řádku" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Čí&slo řádku (%d - %d)" @@ -852,7 +864,7 @@ msgstr "&Seznam" msgid "&Local Branch:" msgstr "&Místní větev:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Místní větve" @@ -876,11 +888,11 @@ msgstr "&Animace nabídky:" msgid "&Menu contents:" msgstr "&Obsahy nabídky:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Sloučení" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Sloučit..." @@ -936,6 +948,10 @@ msgstr "&Další >" msgid "&Next Page" msgstr "&Další stránka" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Ne" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "Žádná &událost při dvojitém kliknutí" @@ -952,11 +968,11 @@ msgstr "Žád&né" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Jedna stránka" @@ -964,19 +980,15 @@ msgstr "&Jedna stránka" msgid "&Onto" msgstr "&Na" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Otevřít" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Otevřít stránku Git for Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Otevřít..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Otevřít...\tCtrl+O" @@ -989,18 +1001,18 @@ msgid "&Overlay Icon:" msgstr "&Ikona překryvu:" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Překryvné obrázky" +msgid "&Overlay images\tO" +msgstr "Překryvné &obrázky\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Heslo:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Vložit" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Vybrat VŠE" @@ -1008,7 +1020,7 @@ msgstr "&Vybrat VŠE" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Náhled tisku" @@ -1016,11 +1028,15 @@ msgstr "&Náhled tisku" msgid "&Print..." msgstr "&Tisk..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Tisk...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Pokračovat" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Stáhnout" @@ -1028,10 +1044,14 @@ msgstr "&Stáhnout" msgid "&Push all branches" msgstr "&Odeslat všechny větve" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&Znovu odevzdat" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "&Přeskládat" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Nedávné zprávy" @@ -1044,7 +1064,7 @@ msgstr "&Rekurzivní" msgid "&Red:" msgstr "Č&ervená:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Znovu" @@ -1060,7 +1080,7 @@ msgstr "&Obnovit" msgid "&Regular Expression" msgstr "&Regulární výraz" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Zeptat se mě později" @@ -1068,7 +1088,7 @@ msgstr "&Zeptat se mě později" msgid "&Remote Branch:" msgstr "&Vzdálená větev:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "&Vzdálené větve" @@ -1076,7 +1096,7 @@ msgstr "&Vzdálené větve" msgid "&Remote:" msgstr "&Vzdálené:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Odstranit" @@ -1088,7 +1108,7 @@ msgstr "&Odstranit tento soubor z rejstříku" msgid "&Replace" msgstr "&Nahradit" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "P&růzkumník úložiště" @@ -1096,7 +1116,7 @@ msgstr "P&růzkumník úložiště" msgid "&Reset" msgstr "&Resetovat" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Resetovat panel nástrojů" @@ -1112,23 +1132,27 @@ msgstr "&Resetovat mé údaje o používání" msgid "&Reset to Default" msgstr "&Resetovat na výchozí" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Vyřešeno" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Obnovit" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Obnovit starý stav" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "&Zkusit znovu" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Vrátit změnu od tohoto odevzdání" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Vrátit změnu od těchto odevzdání" @@ -1140,7 +1164,7 @@ msgstr "&Klient SSH:" msgid "&Saturation:" msgstr "&Saturace:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Uložit" @@ -1148,15 +1172,19 @@ msgstr "&Uložit" msgid "&Save authentication" msgstr "&Uložit ověření" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Uložit graf jako..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Uložit seznam vybraných souborů do..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "U&ložit\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Nastavit cestu pro Git" @@ -1164,7 +1192,7 @@ msgstr "&Nastavit cestu pro Git" msgid "&Set upstream/track remote branch" msgstr "&Nastavit jako pramen/sledovat vzdálenou větev" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Nastavení" @@ -1184,7 +1212,7 @@ msgstr "&Zobrazit textové popisky" msgid "&Signing key ID:" msgstr "&ID podpisového klíče:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Přeskočit" @@ -1192,7 +1220,7 @@ msgstr "&Přeskočit" msgid "&Squash" msgstr "&Slisovat" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Slisovat VŠE" @@ -1204,7 +1232,7 @@ msgstr "&Spustit" msgid "&Start Group" msgstr "&Počáteční skupina" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "Ú&schova" @@ -1224,7 +1252,7 @@ msgstr "Zobrazení &symbolů" msgid "&Tab size:" msgstr "&Velikost karty:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Dokument s kartami" @@ -1232,7 +1260,7 @@ msgstr "&Dokument s kartami" msgid "&Tag" msgstr "&Značka" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Značky" @@ -1268,7 +1296,7 @@ msgstr "&Panely nástrojů a ukotvená okna" msgid "&Toolbars:" msgstr "&Panely nástrojů:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1280,7 +1308,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Kmen:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "&Zkusit znovu" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dvoustránkový" @@ -1288,15 +1320,15 @@ msgstr "&Dvoustránkový" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Zpět" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Sjednocený rozdíl" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Sjednoceně porovnat s" @@ -1308,7 +1340,7 @@ msgstr "&Neznámé disky" msgid "&Up" msgstr "&Nahoru" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Aktualizovat položku na revizi" @@ -1320,11 +1352,11 @@ msgstr "&Pramen:" msgid "&Use auto-completion of file paths and keywords" msgstr "&Použít automatické dokončení cest souborů a klíčových slov" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Uživatelské jméno:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Zobrazení" @@ -1332,7 +1364,7 @@ msgstr "&Zobrazení" msgid "&View:" msgstr "&Zobrazení:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Varovat když v odevzdání chybí Podepsal(a)" @@ -1348,6 +1380,10 @@ msgstr "&Celé slovo" msgid "&Within file" msgstr "&Uvnitř souboru" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "&Ano" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&ignorovat změny mezer" @@ -1356,46 +1392,46 @@ msgstr "&ignorovat změny mezer" msgid "&known changes" msgstr "&známé změny" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(Výchozí v TortoiseGit)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(od %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(žádný seznam změn)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(žádné číslo řádku)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(bez hodnoty)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nenalezeno)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(neznámé)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- vše -" @@ -1403,13 +1439,14 @@ msgstr "- vše -" msgid "--&all" msgstr "--&vše" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1417,7 +1454,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config v kořeni úložiště" @@ -1433,7 +1470,7 @@ msgstr ".gitignore v adresářích obsahujících položky" msgid ".gitignore in the repository root" msgstr ".gitignore v kořeni úložiště" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig v kořeni úložiště" @@ -1449,31 +1486,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<Žádná větev>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1482,66 +1519,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit je rozšíření shellu.\nTo znamená, že je začleněn do průzkumníka Windows.\nAbyste TortoiseGit použili, stačí otevřít průzkumníka a kliknout\npravým tlačítkem na jakoukoli složku, kterou chcete,\nabyste zobrazili kontextovou nabídku, kde najdete všechny příkazy TortoiseGit.\nA přečtěte si manuál!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Varování: nebyla provedena kontrola úplného sloučení těchto větví do čela." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Varování: Tato činnost odstraní větve ve vzdálené." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Varování: Tato větev není plně sloučena do čela." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "Současné čelo odděleno, nyní pracujete na (žádná větev).\nChcete ji nyní vytvořit?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Opravdu chcete smazat VŠECHNY úschovy?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Použití úschovy selhalo!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Výběr z úschovy selhal!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Přidání do úschovy selhalo!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "předchozí adresář přeskládání rebase-apply stále existuje, ale byl zadán mbox\n\nChcete" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Použití úschovy selhalo, vyskytly se konflikty" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Vyjmutí z úschovy selhalo, vyskytly se konflikty" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Použití úschovy bylo úspěšné" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Vyjmutí z úschovy bylo úspěšné" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Přidání do úschovy bylo úspěšné" @@ -1549,7 +1586,7 @@ msgstr "Přidání do úschovy bylo úspěšné" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1561,71 +1598,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Existuje větev se stejným názvem jako vaše zadaná značka (takže krátký odkaz je nejednoznačný).\nTo může způsobit problémy, takže byste se tomuto měli vyhnout." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Větev s tímto názvem již existuje" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Proces sloučení je aktivní, takže toto odevzdání bude slučovací. Abyste sloučení přerušili, musíte provést reset nebo vynucené získání." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Je dostupná novější verze. Prosím stáhněte si nejnovější verzi!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Seznam cest, oddělených novým řádkem, v kterých jsou zobrazeny překryvy ikon.\nPokud na konci cesty přidáte znak '*', pak jsou také zahrnuty všechny soubory a podadresáře v této cestě." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Seznam cest, oddělených novým řádkem, v kterých není zobrazena kontextová nabídka.\nPokud na konci cesty přidáte znak '*', pak jsou také vynechány všechny soubory a podadresáře v této cestě.\nPrázdný seznam umožňuje zobrazovat nabídku ve všech cestách." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Seznam cest, oddělených novým řádkem, v kterých nejsou překryvy ikon zobrazeny.\nPokud na konci cesty přidáte znak '*', pak jsou také vynechány všechny soubory a podadresáře v této cestě.\nPrázdný seznam umožňuje zobrazovat překryvy ve všech cestách." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Požadovaný zdroj je nedostupný." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Značka se stejným názvem jako název vaší zadané větve již existuje (takže krátký odkaz je nejednoznačný).\nTo může způsobit problémy, takže byste se tomuto měli vyhnout." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Značka s takovýmto názvem již existuje." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Program pro zobrazení souborů GNU diff (záplatové soubory).\nPokud ho nemáte, použijte Poznámkový blok." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "&Ukončit" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&O programu" @@ -1641,11 +1678,11 @@ msgstr "Zkrátit přejmenování" msgid "Abbreviated size" msgstr "Zkrátit velikost" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Ukončit" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Zrušit &Sloučení" @@ -1653,11 +1690,11 @@ msgstr "Zrušit &Sloučení" msgid "Abort Merge" msgstr "Přerušit Sloučení" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Přerušit běžící sloučení." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "O aplikaci" @@ -1677,12 +1714,12 @@ msgstr "O TortoiseGotMerge" msgid "Accept certificate" msgstr "Přijmout certifikát" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Přístup k %1 byl zamítnut" -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Činnost" @@ -1690,26 +1727,26 @@ msgstr "Činnost" msgid "Action log" msgstr "Protokol činností" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Činnosti" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Aktivovat seznam úkolů" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktivní soubory" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Objekty ActiveX nemohou být uloženy při ukončování Windows!\nZahodit všechny změny v %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Přidat" @@ -1717,7 +1754,7 @@ msgstr "Přidat" msgid "Add &Signed-off-by" msgstr "Přidat &podpis" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Přidat '%s' do slovníku" @@ -1730,15 +1767,15 @@ msgstr "Přidat vzdálenou" msgid "Add \"&Signed-off-by\"" msgstr "&Přidat \"Podepsal(a)\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "Přidat další odevzdání?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Přidat program pro porovnání na základě přípony" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Přidat program pro sloučení na základě přípony" @@ -1746,15 +1783,15 @@ msgstr "Přidat program pro sloučení na základě přípony" msgid "Add new files automatically to Git" msgstr "Nové soubory automaticky přidávat do Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Přidat do seznamu k &ignorování" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Přidat na panel rychlého přístupu" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Přidat..." @@ -1762,11 +1799,11 @@ msgstr "Přidat..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Přidat/Upravit program sloučení/porovnání na základě přípony" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Přidáno" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1774,25 +1811,25 @@ msgid "" "to the ignore list." msgstr "Vzor(y) souboru\n%s\npřidán(y) do seznamu k ignorování." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Přidávání" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Přidá soubor(y) do správy Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Přidá vybrané soubory nebo masku souborů do seznamu 'ignore'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Upravit nastavení\nNastavení" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Pokročilé" @@ -1800,43 +1837,43 @@ msgstr "Pokročilé" msgid "Advanced Diff/Merge Settings" msgstr "Pokročilé nastavení porovnání/sloučení" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Pokročilá nastavení porovnání" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Pokročilá nastavení sloučení" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Vše" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Všechny příkazy" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Všechny soubory (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Všechny soubory (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Všichni rodičové" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Všechny místní větve" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Všechny odkazy" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Všechny značky" @@ -1844,47 +1881,47 @@ msgstr "Všechny značky" msgid "All tags only" msgstr "Pouze všechny značky" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Všechny vše změny budou ztraceny! Opravdu chcete resetovat všechny panely nástrojů a nabídky?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Všechny vše změny budou ztraceny! Opravdu chcete resetovat přiřazení klávesnice?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Všechny vaše změny budou ztraceny! Opravdu chcete resetovat nabídku '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Všechny vaše změny budou ztraceny! Opravdu chcete resetovat panel nástrojů '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Povolit úpravy tohoto zobrazení\nPovolit úpravy" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Povolit používání vlastních URL Gravatar" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "Umožní vytvořit prázdné odevzdání obsahující pouze zprávu a žádné soubory (srov. git commit --allow-empty)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Již je aktuální." @@ -1900,11 +1937,11 @@ msgstr "Vždy odesílat na zvolenou vzdálenou větev pro tuto místní větev" msgid "Always show long format" msgstr "Vždy zobrazit dlouhý formát" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Vždy použít místní nastavení systému pro zobrazení dat a časů" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Pozměnit" @@ -1912,12 +1949,12 @@ msgstr "Pozměnit" msgid "Amend &Last Commit" msgstr "&Pozměnit poslední odevzdání" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Alternativní editor. Bylo by dobré, kdyby podporoval konce řádku stylu *nix." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1928,7 +1965,7 @@ msgid "" "%mine: the modified file" msgstr "Externí program pro porovnání použitý k\nporovnání různých revizí souborů.\n\nK cestě můžete zadat následující parametry:\n%base: základní soubor\n%mine: změněný soubor" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1941,34 +1978,34 @@ msgid "" "%base: the original file without your changes" msgstr "Externí program sloučení použitý\npro vyřešení konfliktů v souborech.\n\nV cestě můžete zadat následující parametry:\n%merged: konfliktní soubor, kde uložit\n%theirs: soubor tak jak je v úložišti\n%mine: váš vlastní soubor, s vašimi změnami\n%base: původní soubor bez vašich změn" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Ke %1 je připojena nesprávná obslužná rutina." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Vyskytla se neznámá chyba." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Při přístupu k %1 došlo k neznámé chybě." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Na řádku %d byl nalezen neznámý typ řádku!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Anotované značky" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Umístit za pravý blok" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Umístit tento blok za konec levého" @@ -1980,11 +2017,11 @@ msgstr "Nabídky rámečků aplikace" msgid "Apply &Patch..." msgstr "Použít &záplatu..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Použít řadovou záplatu..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Použít záplatu..." @@ -1992,7 +2029,7 @@ msgstr "Použít záplatu..." msgid "Apply Patches" msgstr "Použít záplaty" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Použít řadu záplat z poštovní schránky" @@ -2000,7 +2037,7 @@ msgstr "Použít řadu záplat z poštovní schránky" msgid "Apply unified diff" msgstr "Použít sjednocený rozdíl" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Vodní Styl" @@ -2008,39 +2045,39 @@ msgstr "Vodní Styl" msgid "Arabic" msgstr "Arabština" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "Libovolná &URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Opravdu chcete resetovat sloupce?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Opravdu chcete přerušit proces přeskládání?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Opravdu chcete označit konfliktní soubory jako vyřešené?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Opravdu chcete vrátit %d položek? Ztratíte všechny změny od poslední aktualizace!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Chcete uložit do \"%s\"?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "&Uspořádat svisle" +msgid "Arrange &vertical\tV" +msgstr "Uspořádat &svisle\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Přiděleno k seznamu změn '%s'" @@ -2049,11 +2086,11 @@ msgstr "Přiděleno k seznamu změn '%s'" msgid "Assigned to:" msgstr "Přiděleno k:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Předpokládat nezměněné" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Předpokládat platné/nezměněné" @@ -2065,34 +2102,34 @@ msgstr "Považovat za platné/nezměněné (Stejné jako \"Potřebuje zámek\" v msgid "At file &creation" msgstr "Při &vytvoření souboru" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "Při vytvoření souboru" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Při revizi: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "V tuto chvíli můžete přejmenovávat pouze větve." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Pokus o nepodporovanou operaci." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Pokus o přístupu k %1 přes jeho konec." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Pokus o čtení ze zápisu %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Pokus o zápis do čtení %1." @@ -2109,11 +2146,11 @@ msgstr "Ověření" msgid "Authentication data" msgstr "Data ověření" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Email autora" @@ -2121,7 +2158,7 @@ msgstr "Email autora" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autoři" @@ -2143,11 +2180,11 @@ msgstr "Automatický převod CrLf" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Automaticky skrýt" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Automaticky skrýt vše" @@ -2155,23 +2192,23 @@ msgstr "Automaticky skrýt vše" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Automaticky zavřít když nejsou konflikty" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Automaticky zavřít pokud nejsou chyby" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Automaticky zavřít, pokud nejsou dostupné další možnosti" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Automaticky zavřít, pokud nejsou sloučení, přidání nebo smazání" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2185,7 +2222,7 @@ msgstr "Automaticky načíst &klíč Putty" msgid "Autoload Putty &Key" msgstr "Automaticky načíst &klíč Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatické" @@ -2205,7 +2242,7 @@ msgstr "Průměr" msgid "B&rowse..." msgstr "&Procházet..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Zpět" @@ -2217,7 +2254,7 @@ msgstr "Pozadí" msgid "Baltic" msgstr "Pobaltské" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Sloupcový graf" @@ -2237,7 +2274,7 @@ msgstr "Základní soubor:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Založeno na TortoiseIDiff z TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Základní informace" @@ -2249,45 +2286,45 @@ msgstr "Mezi soubory?" msgid "Big5 (Traditional)" msgstr "Big5 (Tradiční)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Špatné půlení" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Dobré půlení" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Reset půlení" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Spuštění půlení" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmapa\nbitmapa" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Černý styl" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Anotovat" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Chyba anotace" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Anotovat předchozí revizi" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Anotuje autora v každém řádku souboru" @@ -2295,26 +2332,30 @@ msgstr "Anotuje autora v každém řádku souboru" msgid "Blend alpha" msgstr "Mísit průhlednost" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "Bloky" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Modrý styl" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Tělo" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Byly zadány /logmsg a /logmsgfile!\nPouze jedno z tohoto musí být zadáno." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Jak cesta k záplatovému souboru, tak cesta cíle musí být absolutní!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Dolní pohled:" @@ -2326,30 +2367,30 @@ msgstr "P&rocházet..." msgid "Branc&h:" msgstr "&Větev:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Větev" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Větev %s je za %s\n%s bude rychle posunuta vpřed na %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Větev (RP)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Název větve" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Název větve/značky je neplatný." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Název větve/značky je buď neplatný nebo prázdný." @@ -2361,11 +2402,11 @@ msgstr "Větev:" msgid "Bro&wse" msgstr "Pr&ocházet" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Procházet odkazy" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Procházet pro externí program pro porovnání" @@ -2377,7 +2418,7 @@ msgstr "Procházet odkazy" msgid "Browse..." msgstr "Procházet..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID chyby" @@ -2389,7 +2430,7 @@ msgstr "&Výraz části ID chyby:" msgid "Bug-ID/Issue-Nr:" msgstr "ID chyby/Č. úlohy:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "ID chyb" @@ -2405,7 +2446,7 @@ msgstr "Zkouška regulárního výrazu Bugtraq - TortoiseGit" msgid "Button Appearance" msgstr "Vzhled tlačítka" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Tlačítko1" @@ -2421,7 +2462,7 @@ msgstr "&Zkontrolovat nyní" msgid "C&ommands:" msgstr "&Příkazy:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "&Vytvořit větev/značku z revize" @@ -2429,11 +2470,11 @@ msgstr "&Vytvořit větev/značku z revize" msgid "C&urrent Keys:" msgstr "&Současné klávesy:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Vyjmout" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2449,11 +2490,11 @@ msgstr "Vypočítat" msgid "Can double-click in log list to compare with previous revision" msgstr "V seznamu protokolů lze dvojklikem porovnat s předchozí revizí" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Nelze aktivovat statický objekt ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2462,80 +2503,80 @@ msgid "" "%s" msgstr "Nelze zkopírovat\n%s\ndo\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Nelze zkopírovat bitmapový obrázek do schránky!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Nelze vytvořit nový obraz!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Není možno přizpůsobit menu!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Nelze vložit bitmapový obrázek ze schránky!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Zrušit" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Zrušit\nNeukončovat TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Zrušit\nNepřepínat zobrazení" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Zrušit\nPonechat prázdný soubor." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Zrušit\nNejdříve vyřešit konflikty." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Zrušit\nZůstat u současných souborů" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Zrušit\nZůstat u současných nastavení" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Nyní nelze odevzdání spojit.\nUjistěte se, že máte zobrazen protokol své současné větve a že nepoužíváte žádné filtry." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Nemůžu vynutit aktualizaci současné větve. Použijte příkaz reset, chcete li tak učinit." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Nelze zobrazit anotaci. \"%s\" není pod správou verzí git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Nelze zobrazit porovnání z důvodu nesrovnalostí v nových řádcích v souboru." @@ -2547,7 +2588,7 @@ msgstr "Kaská&da" msgid "Cascaded context menu" msgstr "Kaskádová kontextová nabídka" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Citlivé na velikost písmen" @@ -2571,33 +2612,33 @@ msgstr "Ověření certifikátu selhalo!" msgid "Change log" msgstr "Změnit protokol" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Změnit tiskárnu a možnosti tisku\nNastavení tisku" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Změnit možnosti tisku\nNastavení stránky" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Změnit styl aplikace\nZměnit styl" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Změnit pozici okna" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Změnit velikost okna" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Změnit typ" @@ -2605,38 +2646,38 @@ msgstr "Změnit typ" msgid "Changed Files" msgstr "Změněné soubory" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Změněné soubory mezi %s a %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Změněné soubory mezi %s, %s a %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Změněné soubory: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Změněné řádky včetně přidaných/smazaných souborů" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Změněné řádky včetně přidaných/smazaných souborů podle data" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Změněné řádky bez přidaných/smazaných souborů" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Změněné řádky bez přidaných/smazaných souborů podle data" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Seznam změn %s přesunut" @@ -2645,7 +2686,7 @@ msgstr "Seznam změn %s přesunut" msgid "Changes made (double-click on file for diff):" msgstr "Provedené změny (klikněte dvakrát na soubor pro porovnání):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Změní styl aplikace" @@ -2653,7 +2694,7 @@ msgstr "Změní styl aplikace" msgid "Char position where to show a border line in commit text boxes:" msgstr "Pozice znaku, kde zobrazit čáru okraje v rámečcích textu odevzdání:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Zkontrolovat" @@ -2665,31 +2706,31 @@ msgstr "Zkontrolovat aktualizace - TortoiseGit" msgid "Check For Updates..." msgstr "Zkontrolovat aktualizace..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Z&kontrolovat změny" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Zkontrolovat cestu a/nebo URL, které jste zadali." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Zvolte ty položky nabídky, které chcete zobrazit v hlavní kontextové nabídce místo podnabídky TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Zaškrtněte ty položky, které chcete mít zobrazeny pouze v rozšířené kontextové nabídce (SHIFT + kliknutí levým tlačítkem myši)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Zaškrtněte pro zobrazení poměrných časů ve zprávách protokolu" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Zaškrtněte pro použití méně podrobných formátů data a času ve zprávách protokolu" @@ -2697,31 +2738,31 @@ msgstr "Zaškrtněte pro použití méně podrobných formátů data a času ve msgid "Check:" msgstr "Zkontrolovat:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Získat" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "Získání se sloučením" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Výběr nejlepšího" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Výběr nejlepšího selhal" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Vybrat nejlepší ze zvolených odevzdání..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Vybrat toto odevzdání jako nejlepší..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Vybrat toto odevzdání selhal! Chcete ho přeskočit?" @@ -2729,11 +2770,11 @@ msgstr "Vybrat toto odevzdání selhal! Chcete ho přeskočit?" msgid "Chinese" msgstr "Čínština" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Zvolte úložiště" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Opačně chronologicky (výchozí v git)" @@ -2745,78 +2786,78 @@ msgstr "Vyčistit" msgid "Clean Type" msgstr "Typ vyčištění" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Natrvalo smazat" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Přesunout do Koše" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Vyčistit zastaralé vzdálené větve" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Čištění" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Čištění." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Vyčištění nemohlo zpracovat následující cesty:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Vyčištění úspěšně zpracovalo následující cesty:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Vyčistit" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Nástroj vyčištění\nVyčistit" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Vyčistí %ld URL uložených pro %ld pracovních stromů" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Vyčistí %ld zpráv protokolu uložených pro %ld pracovních stromů" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Vyčistí %ld párů hesel/uživatelských jmen, %ld certifikátů ssl a %ld uživatelských jmen" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Uložené protokoly vyčištěny z %ld úložišť" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Vyčistí uložená ověření.\nBudete muset znovu zadat vaše uživatelské jméno/heslo pro všechny úložiště." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Vyčistí uložené velikosti a umístění %ld dialogových oken" @@ -2825,7 +2866,7 @@ msgstr "Vyčistí uložené velikosti a umístění %ld dialogových oken" msgid "Click here to go to the website" msgstr "Klikněte sem pro zobrazení stránky" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Klikněte sem pro výběr nedávno napsané zprávy" @@ -2841,17 +2882,17 @@ msgid "" "extension" msgstr "Klikněte na \"Pokročilé\" pro zadání náhradního programu pro sloučení na základě přípony souboru" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Klikněte pro zobrazení příkazů pro přesun částí textu\nPoužít textové bloky" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Schránka" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Klonovat" @@ -2859,7 +2900,7 @@ msgstr "Klonovat" msgid "Clone Existing Repository" msgstr "Klonovat existující úložiště" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Klonovat úložiště" @@ -2867,49 +2908,49 @@ msgstr "Klonovat úložiště" msgid "Clone into Bare Repo" msgstr "Klonovat do prázd. úlož." -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Klonovat..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Zavřít" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Zavřít celou obrazovku" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Zavřít náhled tisku\n&Zavřít" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Zavřít ručně" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Zavřít režim náhledu tisku\nZrušit náhled" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Zavřít aktivní dokument\nZavřít" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Zavřít aktivní okna a výzvy k uloženi dokumentů" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Sbalit" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2935,7 +2976,7 @@ msgstr "Barvy:" msgid "Combine One Mail" msgstr "Spojit jeden email" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Spojit do jednoho odevzdání" @@ -2943,11 +2984,11 @@ msgstr "Spojit do jednoho odevzdání" msgid "Comman&ds:" msgstr "&Příkazy:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Příkaz" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Příkazový řádek" @@ -2955,7 +2996,7 @@ msgstr "Příkazový řádek" msgid "Command Line To Execute:" msgstr "Příkazový řádek ke spuštění:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Příkaz selhal." @@ -2963,41 +3004,41 @@ msgstr "Příkaz selhal." msgid "Commands" msgstr "Příkazy" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Odevzdat" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "Odevzdání %s NENÍ nyní viditelné." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Odeslání %s nenalezeno v \"%s\". Chcete podmodul aktualizovat nyní?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Datum odevzdání" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Odevzdat email" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Dokončit odevzdání" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Informace o odevzdání" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Zpráva odevzdání" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Název odevzdání" @@ -3005,7 +3046,7 @@ msgstr "Název odevzdání" msgid "Commit Ordering:" msgstr "Seřazení odevzdání:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Odevzdat super projekt" @@ -3013,19 +3054,19 @@ msgstr "Odevzdat super projekt" msgid "Commit to:" msgstr "Odevzdat do:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Odevzdat..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Odevzdání podle autora" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Odevzdání podle data" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Odevzdání každých %s" @@ -3034,15 +3075,15 @@ msgstr "Odevzdání každých %s" msgid "Commits each week:" msgstr "Odevzdání za každý týden:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Odevzdá vaše změny do úložiště" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Email odevzdávajícího" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3054,52 +3095,52 @@ msgstr "Odevzdáním složky bez verze nebudou rekurzivně přidány její podř msgid "Common Name:" msgstr "Společný název:" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "&Porovnat čelní revize" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Porovnat zvolené odkazy" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Porovnat dva soubory" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Porovnat mezery" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Porovnat s &pracovním stromem" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Porovnat se &zdrojem" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Porovnat s předchozí revizí" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Porovná všechny mezery při porovnávání\nPorovnat mezery" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Porovná soubor s poslední odevzdanou revizí pro zobrazení změn, které jste provedli." -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Porovnávání %s a %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Dokončeno" @@ -3115,7 +3156,7 @@ msgstr "Zdroj nastavení" msgid "Config type:" msgstr "Typ nastavení:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Nastavit regulární výrazy filtrů" @@ -3149,11 +3190,11 @@ msgstr "Nastavit program pro zobrazování souborů rozdílů GNU (záplatové s msgid "Confirm to kill running git process" msgstr "Potvrzení ukončení běžícího procesu git" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Konflikt" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Konfliktní soubory" @@ -3161,15 +3202,15 @@ msgstr "Konfliktní soubory" msgid "Conflict resolved" msgstr "Konflikt vyřešen" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "V konfliktu" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Konflikty" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konfliktů: %d" @@ -3182,98 +3223,98 @@ msgstr "Kontextové nabídky: " msgid "Context lines for patches" msgstr "Kontextové řádky pro záplaty" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Pokračovat" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Smrštit ukotvené okno" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Převést mezery na tabulátory" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Převést tabulátory na mezery" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Kopírovat" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Zkopírováno" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopírovat" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Kopírovat %s do %s, revize %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Kopírovat SHA-1 do schránky" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Nástroj kopírování\nKopírovat" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Kopírovat všechny informace do schránky" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopírovat a přejmenovat" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Zkopírovat zprávy protokolu do schránky" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Kopírovat protokol do schránky" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Kopírovat cesty do schránky" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Kopírovat názvy odkazů" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "&Kopírovat výběr do schránky" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Zkopírovat výběr a umístit ho do schránky\nKopírovat" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Kopírovat do schránky" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopie: Nový název pro %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Kopírování %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopírování..." @@ -3281,25 +3322,25 @@ msgstr "Kopírování..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "Všechna práva vyhrazena (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Opravy" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Nelze přidat %s do seznamu k ignorování!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Nelze zkontrolovat novou verzi!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "Nelze zkontrolovat novou verzi! %s (Kód chyby: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3307,76 +3348,76 @@ msgid "" "%s" msgstr "Nelze zkopírovat soubory!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Nelze vytvořit %1 protože adresář je plný." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Nelze zjistit poslední odevzdanou revizi!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Nelze najít super projekt" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Nelze získat stav!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Nelze otevřít %1 protože je příliš mnoho otevřených souborů." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Nelze otevřít soubor\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Nelze odstranit %1 protože se jedná o současný adresář." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Nelze odstranit %s ze seznamu pro ignorování" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Nelze resetovat na první odevzdání (první krok). Ukončování..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Nelze resetovat na poslední odevzdání (druhý krok). Ukončování..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Nelze resetovat na původní čelo." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Nelze získat URL souboru!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Nelze získat revizi %s souboru %s.\nZáplatování není možné!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Nelze spustit TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3384,7 +3425,7 @@ msgid "" "%s" msgstr "Nelze spustit prohlížeč porovnání\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3392,7 +3433,7 @@ msgid "" "%s" msgstr "Nelze spustit externí program porovnání!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3400,11 +3441,11 @@ msgid "" "%s" msgstr "Nelze spustit externí program sloučení!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Nelze zahájit tiskovou úlohu." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3412,11 +3453,11 @@ msgid "" "%s" msgstr "Nelze spustit prohlížeč textu!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Nelze spustit zprostředkovatele Putty (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Nelze spustit vlákno!" @@ -3424,7 +3465,7 @@ msgstr "Nelze spustit vlákno!" msgid "Coun&t" msgstr "Spočíta&t" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Počet: %u shod." @@ -3437,15 +3478,15 @@ msgstr "Vytvořit &knihovnu" msgid "Create .gitignore file" msgstr "Vytvořit soubor .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Vytvořit větev" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Vytvořit větev při této verzi..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Vytvořit větev..." @@ -3457,29 +3498,29 @@ msgstr "Vytvořit sadu změn" msgid "Create New Branch" msgstr "Vytvořit novou větev" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Vytvořit řadovou záplatu..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Vytvořit značku" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Vytvořit značku při této verzi..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Vytvořit značku..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Vytvořit nový dokument\nNový" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3488,49 +3529,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Vytvořit řídký klon s historií zkrácenou na zadaný počet revizí. Řídké úložiště má několik omezení (nemůže z něj klonovat, nebo přinášet, ani z něj nebo do něj nemůžete odesílat), ale pokud máte zájem pouze o nedávnou historii velkého projektu s dlouhou historií a opravy chcete odesílat pouze jako záplaty, pak se může hodit." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Vytvořit záplatový soubor" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "&Vytvořit žádost o stažení" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Zde &vytvořit úložiště..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Vytvořeno" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Vytvoří větev nebo značku" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Vytvoří adresář knihovny se speciálními nastaveními pro pracovní stromy Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Vytvoří záplatový soubor z rozdílů dvou souborů\nVytvořit záplatový soubor" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Vytvoří databázi úložiště v tomto umístění" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Vytvoří soubor sjednoceného rozdílu se všemi provedenými změnami" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Vytvořit žádost o stažení" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Pomocník s pověřením nesmí být prázdný." @@ -3542,7 +3583,7 @@ msgstr "Pomocník pověření:" msgid "Credentials" msgstr "Pověření" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Vyjmout" @@ -3550,7 +3591,7 @@ msgstr "&Vyjmout" msgid "Current" msgstr "Současný" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Současná větev" @@ -3558,7 +3599,7 @@ msgstr "Současná větev" msgid "Current Branch:" msgstr "Současná větev:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3570,7 +3611,7 @@ msgstr "Současná větev %s je aktuální\n\nPokud chcete vynutit přeskládán msgid "Current version is:" msgstr "Současná verze je:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Současná verze je: %s" @@ -3583,7 +3624,7 @@ msgstr "&Přizpůsobit..." msgid "Custom" msgstr "Vlastní" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Přizpůsobit" @@ -3591,19 +3632,19 @@ msgstr "Přizpůsobit" msgid "Customize Keyboard" msgstr "Přizpůsobit klávesnici" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Přizpůsobit panel rychlého přístupu" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Přizpůsobit panel rychlého přístupu" -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Přizpůsobit..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3617,88 +3658,92 @@ msgstr "Cyrilice" msgid "DCommit Type" msgstr "Typ odevzdání" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Daemon" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Datum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Datum posledního odevzdání" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Výchozí" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Výchozí nabídka" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Výchozí nabídka aplikace. Je zobrazena, když nejsou otevřeny žádné dokumenty." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "Výchozí omezení zprávy záznamu:" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Standardně kódovat v UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Smazat" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Smazat %d větví" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Smazat %d vzdálených větví" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Smazat %d značek" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Smazat &místní" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Smazat odkaz..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Smazat všechny značky" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Smazat a &ignorovat %d položek podle názvu" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Smazat a přidat do &seznamu k ignorování" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Smazat a ignorovat %d položek podle &přípony" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Smazat větev" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Smazat větev/značku" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Smazat vzdálenou větev" @@ -3706,34 +3751,34 @@ msgstr "Smazat vzdálenou větev" msgid "Delete remote tag - TortoiseGit" msgstr "Smazat vzdálenou značku - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Smazat vzdálené značky v \"%s\"..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Smazat vzdálené značky..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Smazat podmodul" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Smazat značku" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Smazat existující větev nebo použít jiný název." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Smazat\nSoubor je odstraněn." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Smazáno" @@ -3741,36 +3786,36 @@ msgstr "Smazáno" msgid "Deleted merge conflict" msgstr "Konflikt sloučení smazán" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Smaže a přidá zvolené soubory nebo masky do seznamu k 'ignorování'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Smaže soubory/složky ze správy verzí!" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Smaže soubory/složky ze správy verzí ale soubor je zachován" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Smaže soubor protokolu činností" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Mazání" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Mazání dat v mezipaměti" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Mazání souboru" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Smazat vzdálené odkazy..." @@ -3790,7 +3835,7 @@ msgstr "Popsat" msgid "Describe Strategy" msgstr "Popsat strategii" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Popis" @@ -3798,7 +3843,7 @@ msgstr "Popis" msgid "Description:" msgstr "Popis:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Odznačit sadu změn" @@ -3806,33 +3851,33 @@ msgstr "Odznačit sadu změn" msgid "Destination" msgstr "Cíl" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Cílová disková jednotka je plná." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Najít a zvýraznit přesunuté bloky" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Zjistit přesunuté a zkopírované řádky v existujících souborech v jakémkoliv odevzdání" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Zjistit přesunuté a zkopírované řádky v existujících souborech v odevzdání, kde byl vytvořen cílový soubor" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Zjistit přesunuté a zkopírované řádky ve změněných souborů ve stejném odevzdání" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Zjistit přesunuté nebo zkopírované řádky uvnitř souboru" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3846,11 +3891,15 @@ msgstr "Velikosti a pozice dialogových oken" msgid "Dialogs" msgstr "Dialogová okna" +#. Resource IDs: (156) +msgid "Diff" +msgstr "Porovnat" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Volby Diffu" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Porovnat dvě odevzdání" @@ -3882,7 +3931,7 @@ msgstr "Soubor porovnání:" msgid "Diff header" msgstr "Porovnat hlavičku" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Porovnat později" @@ -3894,12 +3943,12 @@ msgstr "Porovnat umístění" msgid "Diff removed lines" msgstr "Porovnat odstraněné řádky" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Porovnat s \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Porovnat s rodičem %d" @@ -3912,19 +3961,19 @@ msgstr "Rozdíl mezi" msgid "Diffing" msgstr "Porovnávání" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Porovnávání odevzdání" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Porovná soubor pracovního strom u se souborem z posledního odevzdání" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Porovná jakékoliv dvě odevzdání" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Adresář..." @@ -3936,26 +3985,26 @@ msgstr "Adresář:" msgid "Disable sounds" msgstr "Zakázat zvuky" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Tuto možnost zakažte, pokud máte opravdu velké pracovní stromy a pokud se stává,\nže máte příliš velké přístupy na disk při procházení pracovního stromu." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Zakázat kontrolu aktualizací" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Zakázáno" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Při přístupu k %1 došlo k zaplnění disku." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Výjimka odeslání: %1" @@ -3964,44 +4013,52 @@ msgstr "Výjimka odeslání: %1" msgid "Display &buttons in this order" msgstr "&Tlačítka zobrazit v tomto pořadí" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Zobrazit celé stránky\nNáhled tisku" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Zobrazit nápovědu pro stisknutá tlačítka, nabídky a okna\nNápověda" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Zobrazit nápovědu pro současný úkol nebo příkaz\nNápověda" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Zobrazit pokyny pro použití nápovědy\nNápověda" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Zobrazit informace o programu, čísla verzí a autorská práva\nO programu" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "Zobrazit předmět a tělo zpráv odevzdání" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "&Toto varování již nepotřebuji vidět (pokud je zvoleno Pokračovat)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "&Toto varování již nepotřebuji vidět (pokud je zvoleno Ignorovat)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "Nevybírat automaticky \"chybějící\" soubory (smazané, ale nezařazené)" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Podmoduly nevybírat automaticky" @@ -4014,54 +4071,71 @@ msgstr "Nezobrazovat kontextovou nabídku v následujících cestách:" msgid "Do not use recycle bin" msgstr "Nepoužívat Koš" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Opravdu chcete smazat %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Opravdu chcete smazat panel nástrojů '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "Opravdu chcete zakázat automatickou kontrolu aktualizací TortoiseGit?\n\nAutomatická kontrola aktualizací může být znovu povolena v nastavení TortoiseGit na stránce obecné." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Chcete označit vybrané soubory jako \"považovat za platné\"?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Opravdu chcete označit vybrané soubory jako \"přeskočit pracovní strom\"?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Opravdu chcete přesunout tento soubor nebo složku?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Opravdu chcete smazat %d zvolených odkazů? NEMOHOU být obnoveny!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "Opravdu chcete odstranit \"%s\" z indexu?" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Chcete opravdu odstranit \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "Opravdu chcete odstranit %d vybraných souborů/složek z indexu?" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "Opravdu chcete odstranit %d vybraných souborů/složek?" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Opravdu chcete kopii obnovit? Po vytvoření kopie ztratíte všechny své provedené změny." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4069,7 +4143,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Opravdu chcete vrátit všechny změny v\n%s\na přejít na tuto revizi? Tyto změny budou vráceny zpětným sloučením revizí do vašeho pracovního stromu." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,21 +4151,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Opravdu chcete vrátit všechny změny v\n%s\nkteré byly provedeny v této revizí? Tyto změny budou vráceny procesem zpětného sloučení revize do vašeho pracovního stromu." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "Opravdu chcete změnit příznak zvolených souborů na \"přeskočit pracovní strom\" nebo \"považovat za nezměněné\"?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Chcete přinést vzdálené větve z nové přidané vzdálené?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Chcete načíst změněné soubory?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4099,21 +4173,21 @@ msgid "" "as resolved?" msgstr "Chcete soubor\n%s\noznačit jako vyřešený?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Chcete obnovit tyto automaticky uložené dokumenty?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Chcete znovu načíst dokumenty, aby se projevili změny nastavení?\nPoznámka: ztratíte všechny změny, které jste provedli!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Chcete vidět změny?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Chcete nyní vybrat z úschovy?" @@ -4121,28 +4195,28 @@ msgstr "Chcete nyní vybrat z úschovy?" msgid "Document :" msgstr "Dokument:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Není známo, co bude odesláno, protože větev \"%s\" je neznámá" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Není známo, co bude odesláno, protože jste zadali URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Neobnovovat automaticky uložené dokumenty\nPoužít poslední jednoznačně uloženou verzi dokumentu" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Neukládat\nUzavřít zobrazení bez uložení změn" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4152,11 +4226,11 @@ msgstr "Neukládat\nZnovu načíst zobrazení bez uložení změn" msgid "Don't show the selected items: (press shift key to show them)" msgstr "Nezobrazovat zvolené položky: (pro jejich zobrazení stiskněte klávesu shift)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Tuto zprávu již nezobrazovat" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Hotovo" @@ -4168,7 +4242,7 @@ msgstr "Dolů" msgid "Download" msgstr "Stáhnout" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Přetáhněte, aby tato nabídka byla plovoucí" @@ -4196,6 +4270,10 @@ msgstr "Maketa tlačítka formuláře" msgid "Dumy Group For locat TabCtr" msgstr "Maketa skupiny pro místní kontrolu karty" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "&Upravit nevybrané" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Vynechat cesty:" @@ -4204,7 +4282,7 @@ msgstr "&Vynechat cesty:" msgid "E&xit" msgstr "&Ukončit" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportovat..." @@ -4224,11 +4302,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Východoevropské" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Upravit" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Upravit &globální .gitconfig" @@ -4244,23 +4322,23 @@ msgstr "Upravit .tgitconfig" msgid "Edit Button Image" msgstr "Upravit obrázek tlačítka" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Upravit poznámky" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Upravit autora" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Upravit popis" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Upravit program pro porovnání na základě přípony" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Upravit program pro sloučení na základě přípony" @@ -4272,11 +4350,11 @@ msgstr "&Upravit globální .gitconfig" msgid "Edit global &XDG git/config" msgstr "Upravit globální &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Upravit místní nastavení git" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Upravit zprávu protokolu" @@ -4296,25 +4374,25 @@ msgstr "Upravit/Rozdělit odevzdání" msgid "Effective" msgstr "Účinné" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Buď název nebo IP proxy serveru" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Nástroje elipsy\nElipsa" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Emailová adresa příjemce a kopie nemůžou být ve stejnou dobu prázdné." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Emaily" @@ -4322,7 +4400,7 @@ msgstr "Emaily" msgid "Empty" msgstr "Prázdné" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Povolit úpravy" @@ -4338,7 +4416,7 @@ msgstr "Povolit Gravatar" msgid "Enable drag context menu" msgstr "Povolit nabídku přetažení" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Povolit načítání/ukládání souborů mezipaměti protokolu (tortoisegit.data, tortoisegit.index)" @@ -4347,10 +4425,14 @@ msgstr "Povolit načítání/ukládání souborů mezipaměti protokolu (tortois msgid "Enable log cache" msgstr "Povolit mezipaměť protokolu" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Povolit zobrazení obrázku Gravatar v dialogovém okně protokolu" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "Povolit zvýraznění syntaxe" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Povolené obslužné rutiny překrytí" @@ -4359,35 +4441,35 @@ msgstr "Povolené obslužné rutiny překrytí" msgid "Encode" msgstr "Kódování" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Kódování" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Při přístupu k %1 došlo k hardwarové I/O chybě" -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Při přístupu k %1 došlo k porušení uzamčení." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Při přístupu k %1 došlo k porušení sdílení." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Zjištěn nesprávný argument" -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Při čtení %1 došlo k neznámé chybě" -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Při zápisu %1 došlo k neznámé chybě" @@ -4400,11 +4482,11 @@ msgstr "Šifrování" msgid "End" msgstr "Konec" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Styl konce řádku" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Zvětšit okno na úplnou velikost" @@ -4412,23 +4494,23 @@ msgstr "Zvětšit okno na úplnou velikost" msgid "Enter Log Message" msgstr "Zadejte zprávu protokolu" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Zadejte URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Zadejte GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Zadejte měnu." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Zadejte datum a/nebo čas." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Zadejte datum." @@ -4436,33 +4518,33 @@ msgstr "Zadejte datum." msgid "Enter a name for the changelist:" msgstr "Zadejte název seznamu změn." -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Zadejte číslo mezi %1 a %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Zadejte číslo." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Zadejte kladné celé číslo." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Zadejte čas." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Zadejte celé číslo mezi %1 a %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Zadejte celé číslo mezi 0 a 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Zadejte celé číslo." @@ -4474,7 +4556,7 @@ msgstr "Níže zadejte obsah souboru pro vyzkoušení:" msgid "Enter log &message:" msgstr "&Zadejte zprávu protokolu:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Nezadávejte více než %1 znaků." @@ -4483,43 +4565,43 @@ msgstr "Nezadávejte více než %1 znaků." msgid "Enter the regex string below:" msgstr "Níže zadejte řetězec regulárního výrazu:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Smazat vše\nSmazat vše" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Smazat výběr\nSmazat" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Chyba" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Chyba při znovu sestavování mezipaměti ikon Shellu!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "Chyba při ověřování certifikátu serveru pro \"%s\":" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Chyba při čtení/zápisu klíče registru %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Všechno bylo aktualizováno." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4529,28 +4611,28 @@ msgstr "Spustitelné (*.exe)|*.exe|Příkaz (*.com)|*.com|Informace (*.pdf)|*.pd msgid "Executable (+x)" msgstr "Spustitelný (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existující" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Ukončit" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Rozšířit (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Roztáhnout ukotvené okno" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Přejít do" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportovat" @@ -4558,36 +4640,36 @@ msgstr "Exportovat" msgid "Export Zip File" msgstr "Exportovat soubor zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportovat adresář:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exportovat výběr do..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exportovat tuto verzi..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportovat také soubory bez verze" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportování %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportování..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exportuje revizi do souboru zip" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Přípona" @@ -4603,7 +4685,7 @@ msgstr "Přípona:" msgid "Extern DLL Path:" msgstr "Externí cesta DLL:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Externí" @@ -4611,101 +4693,101 @@ msgstr "Externí" msgid "External Program:" msgstr "Externí program:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Slábnout" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Selhání" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Nelze vrátit zpět" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Nelze získat soubor \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Nelze získat soubor \"%s\" z revize %s do \"%s\"" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Nelze se připojit.\nOdkaz může být nefunkční." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Nelze převést objekt ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Nelze vytvořit prázdný dokument." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Nelze vytvořit objekt. Ujistěte se, že aplikace ja zadána v registrech.systému." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Nelze vytvořit žádost o stažení" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Nelze získat základní soubor." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Nelze získat soubor sloučení." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Nelze spustit nápovědu." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Nelze spustit serverovou aplikaci." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Nelze otevřít dokument" -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Nelze provést serverovou operaci." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Dokument nelze uložit." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Nelze nastavit/odstranit seznam změn '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Nelze spustit COM poskytovatele systému pro sledování chyb '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Selhání při čekání na pageant na dokončení načtení klíče." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Selhalo!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Rychlý posun vpřed" @@ -4713,62 +4795,62 @@ msgstr "Rychlý posun vpřed" msgid "Fast Forward o&nly" msgstr "Pouze &rychlý posun vpřed" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Rychlý posun vpřed na %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "&Získat" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Přinést" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "&Přinést a přeskládat" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Přinést z úložiště SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Přinést z \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "&Přinést a přeskládat" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Přinést..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Přinášení stavu..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Přinášení změněných souborů..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Přinášení souboru..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Přinášení revize %s souboru:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Soubor" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Kódování souboru" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Změny souborů každých %s" @@ -4777,27 +4859,27 @@ msgstr "Změny souborů každých %s" msgid "File changes each week:" msgstr "Změny souborů v každém týdnu:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Rozdíly souborů" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Soubor nemá konflikty" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Soubor je prázdný." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Seznam souborů je prázdný" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Záplaty souboru" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4809,7 +4891,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Velikost souboru:\t\t%s (%s)\nŠířka:\t\t\t%ld pixelů\nVýška:\t\t\t%ld pixelů\nVodorovné rozlišení:\t%.1f dpi\nSvislé rozlišení:\t%.1f dpi\nHloubka:\t\t\t%d bit\nPřiblížení:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4829,7 +4911,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Velikost souboru:\t\t%s (%s)\nŠířka:\t\t\t%ld pixelů\nVýška:\t\t\t%ld pixelů\nVodorovné rozlišení: \t%.1f dpi\nPříčné rozlišení:\t%.1f dpi\nHloubka:\t\t\t%d bitů\nPřiblížení:\t\t\t%d%%\n\nVelikost souboru:\t\t%s (%s)\nŠířka:\t\t\t%ld pixelů\nVýška:\t\t\t%ld pixelů\nVodorovné rozlišení: \t%.1f dpi\nPříčné rozlišení:\t%.1f dpi\nHloubka:\t\t\t%d bitů\nPřiblížení:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4841,7 +4923,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Velikost souboru:\t\t%s (%s)\nŠírka:\t\t\t%ld pixelů\nVýška:\t\t\t%ld pixelů\nVodorovné rozlišení: \t%.1f dpi\nPříčné rozlišení:\t\t%.1f dpi\nHloubka:\t\t\t%d bitů\nPřiblížení:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4861,7 +4943,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Velikost souboru:\t\t%s (%s)\nŠírka:\t\t\t%ld pixelů\nVýška:\t\t\t%ld pixelů\nVodorovné rozlišení: \t%.1f dpi\nPříčné rozlišení:\t\t%.1f dpi\nHloubka:\t\t\t%d bitů\nPřiblížení:\t\t\t%d%%\n\nVelikost souboru:\t\t%s (%s)\nŠírka:\t\t\t%ld pixelů\nVýška:\t\t\t%ld pixelů\nVodorovné rozlišení: \t%.1f dpi\nPříčné rozlišení:\t\t%.1f dpi\nHloubka:\t\t\t%d bitů\nPřiblížení:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Název souboru" @@ -4869,17 +4951,17 @@ msgstr "Název souboru" msgid "Files" msgstr "Soubory" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Nástroj vyplnění\nVyplnit" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrovat podle" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtrovat cesty" @@ -4891,11 +4973,11 @@ msgstr "Filtr:" msgid "Filter: " msgstr "Filtr: " -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Najít" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4905,17 +4987,17 @@ msgstr "Najít zadaný text\nNajít" msgid "Find:" msgstr "Najít:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Hledání: Nelze najít text \"%s\"" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Hledání: Nalezen první výskyt při hledání zdola. Dosaženo začátku dokumentu." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Hledání: Nalezen první výskyt při hledání shora. Dosaženo konce dokumentu." @@ -4923,23 +5005,23 @@ msgstr "Hledání: Nalezen první výskyt při hledání shora. Dosaženo konce msgid "Fingerprints" msgstr "Otisky" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Dokončit" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Přeskládání dokončeno." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Hotovo!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "První rodič" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Pouze první rodič" @@ -4948,18 +5030,18 @@ msgid "First known &bad:" msgstr "&První známá špatná:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Přizpůsobit &výšky obrázku" +msgid "Fit image &heights\tH" +msgstr "Přizpůsobit &výšky obrázku\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Př&izpůsobit šířky obrázku" +msgid "Fit image &widths\tW" +msgstr "Př&izpůsobit šířky obrázku\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Disketové jednotky (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Složka" @@ -4971,38 +5053,34 @@ msgstr "Sledovat přejmenování" msgid "Font" msgstr "Písmo" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Stiskněte F1 pro nápovědu. Použijte Ctrl-Kolečko myši pro posunování vodorovně " -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Pro celou historii odškrtněte 'Zastavit na kopírování/přejmenování'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Vynutit" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Vynutit vytvoření větve/značky i když jedna se stejným názvem již existuje." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "Vynutit odevzdání pouze pokud vzdálený odkaz ukazuje na stejné odevzdání jako sledovaná vzdálená větev.\nTo může způsobit ztrátu odevzdání ve vzdáleném úložišti; používejte opatrně.\nTato volba odpovídá volbě git --force-with-lease." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "Vynutit odeslání do vybraného vzdáleného odkazu a potlačit ho bez kontrol bezpečnosti.\nTo může způsobit ztrátu neviděných odevzdání ve vzdáleném úložišti; používejte opatrně.\nTato volba odpovídá volbě git --force." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5020,20 +5098,20 @@ msgstr "Pořpedí" msgid "Format Patch" msgstr "Formát záplaty" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Formátovat záplatu..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Dopředu" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Dopředu %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5063,11 +5141,11 @@ msgstr "Ze &změněných souborů" msgid "From SVN Repository" msgstr "Z úložiště SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Z existujících souborů" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Ze změněných souborů" @@ -5075,7 +5153,7 @@ msgstr "Ze změněných souborů" msgid "From:" msgstr "Od:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Celá obrazovka" @@ -5083,7 +5161,7 @@ msgstr "Celá obrazovka" msgid "Full text search" msgstr "Fulltextové vyhledávání" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Plně rekurzivní" @@ -5091,7 +5169,7 @@ msgstr "Plně rekurzivní" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Další možnosti pro okno odevzdání jsou na stránce Dialogová okna 3." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5099,24 +5177,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Zjednodušené)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Nelze zavést GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ nemůže vytvořit bitmapový objekt. Pravděpodobně nemáte dostatek paměti." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "Značka je podepisována pomocí GPG, pro další informace se podívejte do uživatelské příručky" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Shromažďování informací. Prosím čekejte..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Shromažďování statistik" @@ -5160,29 +5238,29 @@ msgstr "Obecné::Dialogová okna 3" msgid "General::Set Extend Menu Item" msgstr "Obecné::Nastavit položky rozšířené nabídky" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Získat protokoly sloučení" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Získávání souboru %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Získávání souboru %s, revize %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Získávání informací..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Získávání požadovaných informací..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Získávání sjednoceného rozdílu" @@ -5194,23 +5272,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Postup příkazu Git" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Kopírovat a přidat soubory do pracovní kopie" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Kopírovat a přejmenovat položku s verzí sem" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Kopírovat položky s verzí sem" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Exportovat všechny položky zde pomocí Git export" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Exportovat položky s verzí sem" @@ -5218,35 +5296,35 @@ msgstr "Git Exportovat položky s verzí sem" msgid "Git Init" msgstr "Zavedení Git" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Cesta instalace Git" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Protokol Git" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Přesunout a přejmenovat položku s verzí sem" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git přesunout položky s verzí sem" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Nastavení Vzdálených Git" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Seznam revizí Git" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Přeskládání Git SVN" @@ -5258,7 +5336,7 @@ msgstr "Synchronizace Git" msgid "Git clone - TortoiseGit" msgstr "Git klonování - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Adresář Git nenastaven (viz stránka nastavení \"Obecné\")." @@ -5266,23 +5344,23 @@ msgstr "Adresář Git nenastaven (viz stránka nastavení \"Obecné\")." msgid "Git for Windows" msgstr "Git pro Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git pro Windows (https://msysgit.github.io/) nenalezen." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Při vytváření úložiště nahlásil Git chybu!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Seznam revizí Git obsahuje celou historii souboru" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Seznam revizí Git sleduje přejmenování souboru" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5303,7 +5381,7 @@ msgstr "Git::Pověření" msgid "Git::Remote" msgstr "Git::Vzdálené" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Globální" @@ -5315,47 +5393,47 @@ msgstr "Přejít na řádek" msgid "Go to line" msgstr "Přejít na řádek" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Přejít na další konflikt\nDalší konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Přejít na další rozdíl\nDalší rozdíl" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Přejít na další rozdíl v řádku\nDalší rozdíl v řádku" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Přejít na předchozí konflikt\nPředchozí konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Přejít na předchozí rozdíl\nPředchozí rozdíl" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Přejít na předchozí rozdíl v řádku\nPředchozí rozdíl v řádku" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Přejít na řádek" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Graf" @@ -5371,11 +5449,11 @@ msgstr "Šedá" msgid "Greek" msgstr "Řečtina" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Seskupit sady změn" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "&Skrýt nesouvisející změněné cesty" @@ -5391,7 +5469,7 @@ msgstr "Čelo" msgid "HEAD:" msgstr "Čelo:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Pevné" @@ -5403,7 +5481,7 @@ msgstr "Tvrdé: Resetovat pracovní strom a index (zahodit všechny místní zm msgid "Hebrew" msgstr "Hebrejština" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Nápověda" @@ -5427,11 +5505,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Skrýt nabídku pro cesty bez verze" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Skrýt záplatu<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Skrýt ukotvené okno" @@ -5439,25 +5517,25 @@ msgstr "Skrýt ukotvené okno" msgid "Hide the script while running" msgstr "Skrýt skript při spuštění" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Skrýt nezměněné" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Skrýt nezměněné odkazy v seznamu porovnávání" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Skrýt/Zobrazit seznam záplatových souborů" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Skrýt/Zobrazit seznam záplatových souborů\nSkryje nebo zobrazí seznam záplatových souborů" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Nápověda" @@ -5467,7 +5545,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Rada: vyberte kontextovou nabídku, přejděte na stránku 'Příkazy' a přetáhněte tlačítka panelu nástrojů do okna nabídky." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Domů" @@ -5483,7 +5561,7 @@ msgstr "Hákové skripty::Nastavení systému pro sledování chyb" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Hákové skripty::Systém sledování chyb" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Typ háku" @@ -5499,7 +5577,7 @@ msgstr "&Zahrnout cesty:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5507,55 +5585,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5563,15 +5642,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5595,7 +5674,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5603,7 +5682,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5611,7 +5690,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5619,16 +5698,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5639,17 +5718,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5661,7 +5740,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5725,7 +5804,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Překryvy ikon" @@ -5737,7 +5816,7 @@ msgstr "Překryvy ikon::Sada ikon" msgid "Icon Overlays::Overlay Handlers" msgstr "Překryvy ikon::Obslužné rutiny překrytí" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5747,52 +5826,52 @@ msgstr "Ikony (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ikony/Návrh/Kód:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Identické" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Pokud je aktivováno, zabraňuje zobrazení překryvů a kontextových nabídek v dialogových oknech 'uložit jako...' a 'otevřít' " -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Pokud zaškrtnuto, je git předáno --track, pokud ne, pak je předáno --no-track, jinak není předáno nic (viz nápověda)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Pokud zaškrtnuto, dvojitým kliknutím na revizi v seznamu protokolů ji porovná s předchozí revizí" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Pokud zaškrtnuto bude dialogové okno odevzdání po chybě automaticky spuštěno\nzachovávajíc váš poslední výběr a zprávu protokolu." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Pokud povoleno, TortoiseGit jednou týdně zkontroluje dostupnost nové verze" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Pokud zapnuto, složky pracovního stromu, které jsou vyloučeny ze\nzobrazování překryvů stále zobrazují stav překryvu 'normální'" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Pokud nastaveno mohou být soubory uvnitř složek bez verzí zobrazeny v kontrole stavu.\nKontrola stavu je používána například v dialogovém okně odevzdání." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5805,16 +5884,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Pokud plánujete pracovat v této složce, nechejte toto odtržené. Obvykle může holé úložiště obsahovat pouze ty změny, které do něj byly odeslány. (Podle úmluvy by název složky holého úložiště měl končit na '.git')" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorovat" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorovat %d položek podle &přípony" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignorovat komentáře" @@ -5826,15 +5905,15 @@ msgstr "Ignorovat soubor" msgid "Ignore Type" msgstr "Typ ignorování" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignorovat všechny mezery" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorovat všechny změny mezer" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignorovat prázdné řádky" @@ -5842,7 +5921,7 @@ msgstr "Ignorovat prázdné řádky" msgid "Ignore case cha&nges" msgstr "Ignorovat &změny velikosti" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5860,11 +5939,11 @@ msgstr "Ignorovat položky rekurzivně" msgid "Ignore line &endings (recommended)" msgstr "Ignorovat &ukončení řádků (doporučeno)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignorovat mezeru na konci řádku" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignorovat zmenu mezer" @@ -5872,29 +5951,29 @@ msgstr "Ignorovat zmenu mezer" msgid "Ignore whitespace" msgstr "Ignorovat mezery" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorovat změny mezer" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Ignorovat mezery při porovnávání verze rodiče a jeho potomka" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorováno" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Ignorované soubory" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignoruje všechny mezery při porovnávání\nIgnorovat všechny změny mezer" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5912,24 +5991,24 @@ msgstr "Obrázek &a text" msgid "Images" msgstr "Obrázky" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Přímí následníci, včetně složek" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importovat" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importovat %s do %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importovat ignorování SVN" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Import ignorování SVN ..." @@ -5938,16 +6017,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importovat soubor ignorování svn do souboru .git/info/exclude (soubor bude přespán)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importování souboru %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Seznam změn" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Odevzdání" @@ -5971,24 +6050,24 @@ msgstr "Zahrnout FETCH_HEAD v seznamech výběru větví" msgid "Include only the following revision range:" msgstr "Zahrnout pouze následující rozsah revizí:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nesprávný název souboru." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Počáteční import" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "V %s vytvořeno prázdné úložiště Git." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Rozdíl v řádku" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Rozdíl v řádku podle slov" @@ -6000,25 +6079,25 @@ msgstr "Rozdíly v řádku" msgid "Input" msgstr "Vstup" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Vložit obsah schránky\nVložit" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "K provedení operace není dostatek paměti." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Vnitřní chyba aplikace." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Neplatná měna." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Neplatné číslo revize!" @@ -6026,7 +6105,7 @@ msgstr "Neplatné číslo revize!" msgid "Issuer:" msgstr "Vydavatel:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6049,7 +6128,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Ponechat" @@ -6057,11 +6136,11 @@ msgstr "Ponechat" msgid "Keep changelists" msgstr "Ponechat seznamy změn" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Ponechat si soubor místně?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6075,7 +6154,7 @@ msgstr "Klávesnice" msgid "Keyboard shortcuts:" msgstr "Klávesové zkratky:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Klávesy" @@ -6119,19 +6198,39 @@ msgstr "ŘÁDEK8" msgid "Language:" msgstr "Jazyk:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "Poslední(ch) %s odevzdání" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "Poslední %s měsíc(e)" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "Poslední(ch) %s týden/týdnů" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "Poslední(ch) %s rok(ů)" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Poslední autor" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Poslední odevzdání" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Naposledy změněno" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Naposledy změněno:" @@ -6139,7 +6238,11 @@ msgstr "Naposledy změněno:" msgid "Last known &good:" msgstr "Poslední známá &dobrá:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "Poslední zvolené datum" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Spustí externí program pro sloučení/porovnání k vyřešení konfliktů" @@ -6147,17 +6250,17 @@ msgstr "Spustí externí program pro sloučení/porovnání k vyřešení konfli msgid "Least active author:" msgstr "Nejméně aktivní autor:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Ponechat v konfliktu\nJe ponechán konfliktní stav souboru" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "Ponechat pouze označené bloky" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Levé zobrazení:" @@ -6165,11 +6268,11 @@ msgstr "Levé zobrazení:" msgid "Left image" msgstr "Levý obrázek" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Čárový graf" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6183,12 +6286,12 @@ msgstr "Lišta rozdílů řádku" msgid "Line differences" msgstr "Rozdíly v řádku" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Řádek přesunut z řádku %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Řádek přesunut na řádek %ld" @@ -6201,26 +6304,26 @@ msgstr "Šířka čáry" msgid "Line:" msgstr "Řádek:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Řádek: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Řádků přidáno" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Řádků odstraněno" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Vypsat témata nápovědy\nTémata nápovědy" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6238,23 +6341,23 @@ msgstr "Nahrát obrázky" msgid "Load Putty &Key" msgstr "Načíst &klíč Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Načíst změny\nZměny provedené v TortoiseGitMerge jsou ztraceny a nahrazeny novým obsahem." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Načíst změny\nZobrazení jsou aktualizována novým obsahem." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Načítání..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Místní" @@ -6262,13 +6365,13 @@ msgstr "Místní" msgid "Local Branch" msgstr "Místní větev" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "Místní změny ignorovány (soubory označeny jako \"považovat za platné/nezměněné\" nebo \"přeskočit pracovní strom\")" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Místní stav" @@ -6276,7 +6379,7 @@ msgstr "Místní stav" msgid "Local:" msgstr "Místní:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6286,7 +6389,7 @@ msgstr "Umístění kam obsah\nzvolené revize úložiště bude uložen." msgid "Locator Bar" msgstr "Lišta umístění" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Protokol" @@ -6326,12 +6429,12 @@ msgstr "Protokol zpráv (Dialogové okno zobrazení protokolu)" msgid "Login:" msgstr "Přihlášení:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Nejnižší zobrazená revize: %ld - Nejvyšší zobrazená revize: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6342,7 +6445,7 @@ msgstr "Nejnižší zobrazená revize: %ld - Nejvyšší zobrazená revize: %ld msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6354,14 +6457,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Pošta" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL poštovního systému je neplatné." -#. Resource IDs: (156) -msgid "Main" -msgstr "Hlavní" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Vytvořit jako prázdné (Žádné pracovní adresáře)" @@ -6374,47 +6473,47 @@ msgstr "&Spravovat" msgid "Manage" msgstr "Spravovat" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Spravovat vzdálené" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Označit jako vyřešený" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Označit jako vyřešené\nStav souboru bude změněn na Změněno" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "Označit pro porovnání" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Označit tento blok" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Označené bloky" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Označí soubor jako vyřešený v Git\nOznačit jako vyřešený" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Označí revizi jako špatnou" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Označí revizi jako dobrou" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Shoda s &velikostí písmen" @@ -6438,7 +6537,7 @@ msgstr "&Nabídky zobrazují nedávno použité příkazy jako první" msgid "Menu" msgstr "Nabídka" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Lišta nabídky" @@ -6446,7 +6545,7 @@ msgstr "Lišta nabídky" msgid "Menu s&hadows" msgstr "Stíny &nabídky" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Sloučit" @@ -6454,34 +6553,34 @@ msgstr "Sloučit" msgid "Merge &Message" msgstr "Sloučit &zprávu" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Bod sloučení" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Znovuzačlenění sloučení" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Sloučení mezi původní větví, obsahem pracovního stromu a větví na kterou přejít" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Sloučit do \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Sloučeno" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Sloučené soubory" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Sloučí jinou větev" @@ -6489,22 +6588,22 @@ msgstr "Sloučí jinou větev" msgid "Merging" msgstr "Slučování" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Slučování z %s, revize %s až %s, revize %s do %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Sloučení vyžaduje různé revize nebo různé URL v 'Od' a 'Do:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Slučování revizí %s z %s do %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Zpráva" @@ -6516,7 +6615,7 @@ msgstr "&Pouze zpráva" msgid "Message part &expression:" msgstr "Vý&raz části Zpráva: " -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Zprávy" @@ -6524,11 +6623,11 @@ msgstr "Zprávy" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Můj" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimalizovat Ribbon" @@ -6540,7 +6639,11 @@ msgstr "Minimální počet znaků ve zprávě odevzdání:" msgid "Misc" msgstr "Ostatní" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Chybějící" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Smíšené" @@ -6548,35 +6651,35 @@ msgstr "Smíšené" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Smíšené: Ponechat pracovní strom netknutý, index resetovat" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Datum změny" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Změněno" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Změněné soubory" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Další" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Další tlačítka" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Další příkazy..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Další barvy..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Další..." @@ -6596,41 +6699,41 @@ msgstr "Přesunout &dolů" msgid "Move &Up" msgstr "Přesunout &nahoru" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Přesunout položku dolů" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Přesunout položku nahoru" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Přesunout a přejmenovat" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Přesunout do seznamu změn" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Přesunout/Přejmenovat" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Přesun: Nový název pro %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Před vrácením přesune změněné soubory do koše" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Přesunování %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Přesunování..." @@ -6638,11 +6741,11 @@ msgstr "Přesunování..." msgid "My file:" msgstr "Můj soubor:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "ČÍSLO" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Název" @@ -6654,7 +6757,7 @@ msgstr "Jméno:" msgid "Navigate" msgstr "Navigovat" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6664,11 +6767,11 @@ msgstr "Přejít na určitý řádek v zobrazení\nPřejít na řádek" msgid "Navigation Pane Options" msgstr "Možnosti navigačního panelu" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Možnosti navigačního panelu..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Vnořené" @@ -6680,7 +6783,7 @@ msgstr "Síť" msgid "Network::Email" msgstr "Síť::Email" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nové" @@ -6689,43 +6792,43 @@ msgid "New &name:" msgstr "&Nový název:" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "Nová větev/značka" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nová nabídka" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Nový kontrolní součet" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nová zpráva" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nový název pro %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Nový název nesmí být prázdný nebo stejný jako původní!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nový název:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Nový podmodul" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Novější čas odevzdání" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Nové řádky" @@ -6733,33 +6836,29 @@ msgstr "Nové řádky" msgid "Next" msgstr "Další" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Další stránka\nDalší stránka" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Další konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Další rozdíl" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Další rozdíl v řádku" -#. Resource IDs: (73) -msgid "No" -msgstr "Ne" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Žádný &rychlý posun vpřed" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Žádná &sloučení" @@ -6771,102 +6870,107 @@ msgstr "Bez získání" msgid "No Co&mmit" msgstr "&Bez odevzdání" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "Žádné čelo nenalezeno" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Nebyl zadán žádný příkaz\n\nTortoiseGitProc.exe je používán rozšířením Shellu a neměl by být volán přímo!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nezadána žádná hodnota příkazu!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Nenalezeny žádné rozdíly!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Nenalezeny žádné rozdíly! Podmoduly nemusí být aktuální. Chcete je nyní aktualizovat?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Není dostupná žádná chybová zpráva." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nevyskytla se žádná chyba." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "Žádné dodatečné změny po sloučení" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Nebyly změněny žádné soubory či složky! TortoiseGit nemá co vrátit zpět!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Při současném nastavení nejsou žádné soubory k zobrazení.\nNíže zaškrtněte jednu nebo více možností pro zobrazení nezměněných, ignorovaných souborů nebo bez verze.\nPro zobrazení vzdálených změn, klikněte na 'Zkontrolovat úložiště'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "Při současném nastavení nejsou žádné soubory k zobrazení.\nNíže zaškrtněte jednu nebo více možností pro zobrazení nezměněných, ignorovaných souborů nebo bez verze." -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Od posledního odevzdání nebyly změněny nebo přidány\nžádné soubory. TortoiseGit zde\nnemá co dělat..." +"the last commit." +msgstr "Od posledního odevzdání\nnebyly žádné soubory změněny, nebo přidány." -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Od posledního odevzdání nebyly změněny nebo přidány\nžádné soubory. TortoiseGit zde\nnemá co dělat...\nChcete zobrazit soubory bez verze?" +msgstr "Od posledního odevzdání\nnebyly žádné soubory změněny, nebo přidány.\nChcete zobrazit soubory bez verze?" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Graf není dostupný" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Pro %s nenalezen žádný kodér obrázku." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "Bez omezení" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Žádné další revize nenalezeny." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Žádná předchozí verze." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Žádný odkaz nenalezen" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Žádné opravy pravopisu" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Žádná mezipaměť stavu. Pouze složky s verzí mají překryv, soubory ho nemají" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Žádné návrhy od thesaurus" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Nenalezen žádný pracovní adresář." @@ -6874,11 +6978,11 @@ msgstr "Nenalezen žádný pracovní adresář." msgid "Node size" msgstr "Velikost uzlu" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Žádné" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normální" @@ -6890,30 +6994,30 @@ msgstr "Normální odevzdání &SVN" msgid "North European" msgstr "Severoevropské" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Soubory bez verze" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Ne všechny soubory mohly být staženy a ověřeny." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Ne všechny záznamy v registru (nebo v souboru INI) byl odstraněny." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Pro dokončení operace není dostatek paměti." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Nedostatek paměti!\nZkuste zmenšit velikost grafu revizí\nsbalením uzlů nebo snížením zvětšení." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Žádné záplaty nevytvořeny." @@ -6921,7 +7025,7 @@ msgstr "Žádné záplaty nevytvořeny." msgid "Note node" msgstr "Uzel poznámky" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6940,26 +7044,26 @@ msgstr "Upozornění: složka obsahuje položky bez verze" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Poznámka: toto má vliv na všechny klienty Tortoise, ne jenom TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Poznámky" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Nic není potřeba přeskládat\n%s se rovná %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Nic k přeskládání" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Nic k odevzdání" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Oznámení" @@ -6967,7 +7071,7 @@ msgstr "Oznámení" msgid "Number Commits" msgstr "Číslovat odevzdání" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Počet %s" @@ -6980,7 +7084,7 @@ msgstr "Počet autorů:" msgid "Number of characters required for moved or copied line detection:" msgstr "Počet znaků nutných pro zjištění přesunutého nebo zkopírovaného řádku:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Počet zobrazených znaků ve zkrácené části kontrolního součtu" @@ -7052,41 +7156,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Zavedení OLE selhalo. Zkontrolujte, zda knihovny OLE jsou ze správné verze." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Barvy Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Starý kontrolní součet" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Stará zpráva" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Starší čas odevzdání" @@ -7094,15 +7198,15 @@ msgstr "Starší čas odevzdání" msgid "Older lines" msgstr "Starší řádky" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Na žádost" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Jeden nebo více automaticky uložené dokumenty byly nalezeny." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Jeden nebo více souborů je v konfliktním stavu." @@ -7114,29 +7218,29 @@ msgstr "Pouze současná větev" msgid "Only Local Branches" msgstr "Pouze místní větve" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Pouze sloučené soubory" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Pouze podřazené souboru" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Jsou povolena pouze čísla!\n(můžou být oddělena čárkami)" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Pouze tato položka" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Otevřít" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7146,51 +7250,52 @@ msgstr "Otevřít existující dokument\nOtevřít" msgid "Open certificate" msgstr "Otevřít certifikát" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Otevřít soubory pro porovnání či použití záplaty\nOtevřít soubory" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Otevřít ze schránky" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Otevřít obrázkový soubor..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Otevřít nadřazenou složku" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "Otevřít záplatový soubor" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Otevřít tento dokument" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Otevřít pomocí..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Otevře nápovědu\nTémata nápovědy" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Otevře dialogové okno odkazů." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Otevře průzkumníka úložiště" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Volba" @@ -7199,30 +7304,30 @@ msgid "Options" msgstr "Volby" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "&Původní velikost" +msgid "Ori&ginal size\tS" +msgstr "Původní &velikost\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Původní název" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Další panely úloh" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Další" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Seznam odchozích změn" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Odchozí odevzdání" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Nedostatek paměti." @@ -7230,7 +7335,7 @@ msgstr "Nedostatek paměti." msgid "Output Directory" msgstr "Výstupní adresář" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Výstup.prn" @@ -7238,20 +7343,24 @@ msgstr "Výstup.prn" msgid "Override branch if exists" msgstr "Přepsat větev pokud existuje" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Přepsat" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "Přepsat změny pracovního stromu (vynuceně)" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "&Nastavení stránky..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Stránka %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7262,15 +7371,15 @@ msgstr "Stránka %u\nStránky %u-%u\n" msgid "Page :" msgstr "Stránka :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Panel 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Panel 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametry" @@ -7278,25 +7387,25 @@ msgstr "Parametry" msgid "Parameters:" msgstr "Parametry:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Rodič %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Rodič %d neexistuje" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Rodič 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Rodič 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Rodič(ové)" @@ -7308,39 +7417,39 @@ msgstr "Části kódu pocházejí z TortoiseSVN Blame" msgid "Password" msgstr "Heslo" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Heslo:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Vložit" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Vložit nedávnou zprávu..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "Vložit &seznam názvů souborů" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "Vložit &poslední zprávu odevzdání" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "Vložit &nedávnou zprávu..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Nástroj vkládání\nVložení" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Vložit seznam názvů souborů" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Vložit poslední zprávu odevzdání" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Vloží cestu svn ze schránky, čímž se provede operace přesunutí (vyjmutí) nebo kopírování" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Záplata" @@ -7356,32 +7465,32 @@ msgstr "Záplatovat &zvolenou položku" msgid "Patch As Attachment" msgstr "Záplata jako příloha" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Záplatovat všechny soubory" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Záplatovat vybrané soubory" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Soubory záplaty (*.diff, *.patch)|*.diff;*.patch|Všechny soubory (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Záplatování" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Záplatování souboru '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Cesta" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Nalezená cesta lépe odpovídá záplatě." @@ -7389,21 +7498,21 @@ msgstr "Nalezená cesta lépe odpovídá záplatě." msgid "Path:" msgstr "Cesta:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Cesty" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Nástroj tužky\nTužka" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Procento autorství" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Procenta" @@ -7411,24 +7520,24 @@ msgstr "Procenta" msgid "Personalized Menus and Toolbars" msgstr "Přizpůsobené nabídky a panely nástrojů" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Vybrat" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Vyberte kontrolní součet odevzdání" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "Vyberte &kontrolní součet odevzdání" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Vybrat zprávu odevzdání" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "Vybrat &zprávu odevzdání" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Zvednout %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7438,56 +7547,56 @@ msgstr "Obrázek (Metasoubor)\nobrázek" msgid "Picture:" msgstr "Obrázek:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Obrázky (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Grafy (*.gv)|*.gv|Všechny soubory (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Obrázky (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Všechny soubory (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Koláčový graf" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Prosím zadejte hákový skript pro spuštění." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Prosím zadejte cestu kde použít hákový skript." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Prosím vyberte typ háku" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Prosím vyberte větev" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Prosím vyberte upstream větev" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Podívejte se prosím na přeskočená odevzdání" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Čekejte prosím. Probíhá rušení..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Získávání rozdílů... Prosím čekejte." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Prosím čekejte..." @@ -7503,11 +7612,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Hák po odevzdání" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Hák po odeslání" @@ -7515,23 +7624,23 @@ msgstr "Hák po odeslání" msgid "Pre&v Page" msgstr "&Předchozí stránka" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Hák před odevzdáním" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Hák před odesláním" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Připravování odevzdání..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Umístit před pravý blok" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Umístit tento blok na začátek levého" @@ -7543,11 +7652,11 @@ msgstr "Stiskněte &novou klávesovou zkratku:" msgid "Press &new shortcut key:" msgstr "Stiskněte &novou klávesovou zkratku:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Náhled" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Náhled záplatového souboru" @@ -7559,51 +7668,51 @@ msgstr "Náhled:" msgid "Previous" msgstr "Předchozí" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Předchozí stránka\nPředchozí stránka" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Předchozí verze" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Předchozí konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Předchozí rozdíl" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Předchozí rozdíl v řádku" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Tisk" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Vytisknout dokument\n&Tisk" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Vytisknout aktivní dokument použitím současných voleb\nRychlý tisk" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Vytisknout aktivní dokument\nTisk" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Tisk do souboru" @@ -7611,7 +7720,7 @@ msgstr "Tisk do souboru" msgid "Printer :" msgstr "Tiskárna :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Soubory tiskárny (*.prn)|*.prn|Všechny soubory (*.*)|*.*||" @@ -7619,11 +7728,11 @@ msgstr "Soubory tiskárny (*.prn)|*.prn|Všechny soubory (*.*)|*.*||" msgid "Printing" msgstr "Tisk" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programy (*.exe)|*.exe|Všechny soubory (*.*)|*.*||" @@ -7631,11 +7740,11 @@ msgstr "Programy (*.exe)|*.exe|Všechny soubory (*.*)|*.*||" msgid "Progress" msgstr "Postup" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Projekt" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Vlastnost" @@ -7643,7 +7752,7 @@ msgstr "Vlastnost" msgid "Property Page" msgstr "Stránka vlastností" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Poskytovatel" @@ -7675,15 +7784,15 @@ msgstr "Ořezat" msgid "Prune (All remotes)" msgstr "Ořezat (Všechny vzdálené)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Odeslat" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Stažení vyžaduje, aby vybraná místní větev byla aktuální větev." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Stáhnout..." @@ -7691,19 +7800,19 @@ msgstr "Stáhnout..." msgid "Pull/Fetch" msgstr "Stáhnout/Přinést" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Rozdíl stažen" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Protokol stažen" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "O&deslat" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Odeslat" @@ -7719,11 +7828,11 @@ msgstr "URL odeslání:" msgid "Push notes" msgstr "Poznámky odeslání" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Odeslat &značky" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Odeslat..." @@ -7731,22 +7840,22 @@ msgstr "Odeslat..." msgid "Putty Key:" msgstr "Klíč Putty:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Soukromý klíč Putty (*.ppk)|*.ppk|Všechny soubory (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Ukončení aplikace; zobrazen dotaz k uložení dokumentů\nOdejít" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7764,11 +7873,15 @@ msgstr "Jednotky R&AM" msgid "R&eset" msgstr "R&esetovat" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "&Odstranit tento soubor z rejstříku" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "&Vrátit na tuto revizi" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "PŘESKLÁDAT" @@ -7776,7 +7889,7 @@ msgstr "PŘESKLÁDAT" msgid "Randomize Sync Dialog startup position" msgstr "Znáhodnit počáteční pozici okna Synchronizace" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7798,7 +7911,7 @@ msgstr "&Vzdálené:" msgid "Re&movable drives" msgstr "&Vyjímatelné jednotky" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "&Přejmenovat..." @@ -7814,15 +7927,15 @@ msgstr "Re&setovat vše" msgid "Re&store defaults" msgstr "&Obnovit výchozí" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Vrátit..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Dosažitelné" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Pokud si nevíte rady, přečtěte si 'Příručku každodenního použití'..." @@ -7830,21 +7943,21 @@ msgstr "Pokud si nevíte rady, přečtěte si 'Příručku každodenního použi msgid "Rebase" msgstr "Přeskládat" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Přeskládat \"%s\" nad toto..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Přeskládat..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Přeskládávání... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Nedávné" @@ -7856,21 +7969,21 @@ msgstr "Nedávný soubor" msgid "Recently modified lines" msgstr "Nedávno změněné řádky" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Pouze záznam" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Obnovit automaticky uložené dokumenty\nOtevřít automaticky uložené dokumenty místo jednoznačně uložených verzí" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Obnovit na stav před přeskládáním" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7884,17 +7997,21 @@ msgstr "Podmodul rekurzivně" msgid "Recursive" msgstr "Rekurzivní" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "Znovu" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Znovu provést předtím vrácenou činnost\nZnovu" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Zmenšit okno na ikonu" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Odkaz" @@ -7902,31 +8019,31 @@ msgstr "Odkaz" msgid "Ref (Click it then go to)" msgstr "Odkaz (Klikněte na něj a pak přejděte)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Seznam revizí" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Prohlížení odkazů" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "Protokol odkazů" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Název odkazu" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Obnovit" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Obnovování..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Filtr s regulárním výrazem" @@ -7938,7 +8055,7 @@ msgstr "Filtry s regulárním výrazem" msgid "Regex:" msgstr "Regulární výraz:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7957,7 +8074,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtrování regulárním výrazem:\n. : jakýkoli znak\nc+ : zahrnout znak c jednou nebo vícekrát\nc* : zahrnout znak c nulakrát nebo vícekrát\n^ : začátek řádku\n$ : konec řádku\n(řetězec){n} : zahrnou řetězec n krát\n(abcd) : podvýraz\n[aei0-9] : zahrnout a,e,i a 0..9\n[^aei0-9] : všechno kromě a,e,i a 0..9\n\n\\w : zahrnout a-z,A-Z,0-9 a _\n\\W : všechny nealfanumerické znaky\n\\d : číslice 0-9\n\\s : mezery" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Odmítnutá hunk záplata pro \"%s\"" @@ -7970,7 +8087,7 @@ msgstr "Relativní časy v protokolu" msgid "Reload" msgstr "Znovu načíst" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8004,19 +8121,19 @@ msgstr "Vzdálená větev &sledování" msgid "Remote Branch" msgstr "Vzdálená větev" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "Vzdálená URL nesmí být prázdná." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Vzdálená aktualizace" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Název vzdálené nesmí být prázdné." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Vzdálený stav" @@ -8028,12 +8145,12 @@ msgstr "Vzdálený:" msgid "Remove" msgstr "Odstranit" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Odstranit %ld položek" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Odstranit %s" @@ -8042,7 +8159,7 @@ msgstr "Odstranit %s" msgid "Remove &all untracked files (-fx)" msgstr "Odstranit &všechny nesledované soubory (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "&Odstranit větev" @@ -8050,21 +8167,21 @@ msgstr "&Odstranit větev" msgid "Remove &non-ignored untracked files (-f)" msgstr "Odstranit &neignorované nesledované soubory (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Odstranit všechny komentáře před provedením rozdílu, aby změny v nich nebyly zobrazeny jako rozdíl" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Odstranit ze seznamu &ignorování" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Odstranit z panelu rychlého přístupu" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Odstranit ze seznamu změn" @@ -8076,7 +8193,7 @@ msgstr "Odstranit ignorované soubory (-fX)" msgid "Remove untracked directories (-d)" msgstr "Odstranit nesledované adresáře (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Odstranit nesledované soubory z pracovního stromu, ..." @@ -8084,11 +8201,11 @@ msgstr "Odstranit nesledované soubory z pracovního stromu, ..." msgid "Removed" msgstr "Odstraněno" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Odstraněno ze seznamu změn" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8096,7 +8213,7 @@ msgid "" "from the ignore list." msgstr "Odstraněny vzor(y) souboru\n%s\nze seznamu ignorování." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Odstraní soubor nebo masku souboru ze seznamu ignorovaných položek" @@ -8104,11 +8221,11 @@ msgstr "Odstraní soubor nebo masku souboru ze seznamu ignorovaných položek" msgid "Rena&me..." msgstr "&Přejmenovat..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Přejmenovat" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Přejmenovat %s" @@ -8117,20 +8234,20 @@ msgstr "Přejmenovat %s" msgid "Rename - TortoiseGit" msgstr "Přejmenovat - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Přejmenovat \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Přejmenovat/přesunout" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Přejmenuje soubory/složky pod správou verzí" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8140,7 +8257,7 @@ msgstr "Zopakovat poslední činnost\nOpakovat" msgid "Replace &All" msgstr "&Nahradit vše" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8154,12 +8271,12 @@ msgstr "Nahradit čím:" msgid "Replace:" msgstr "Nahradit:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Nahrazeno %d shod" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Nahrazování" @@ -8183,11 +8300,11 @@ msgstr "Zažádat o stažení" msgid "Requests a username and a password" msgstr "Žádá o uživatelské jméno a heslo" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "&Vyřešit" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Resetovat" @@ -8199,25 +8316,25 @@ msgstr "Resetovat &vše" msgid "Reset Type" msgstr "Typ resetování" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Resetovat \"%s\" na toto..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "resetovat aktivní větev" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Resetovat sloupce" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Resetovat současnou větev \"%s\" na" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Vyřešit" @@ -8225,126 +8342,122 @@ msgstr "Vyřešit" msgid "Resolve Submodule Conflict" msgstr "Vyřešit konflikt podmodulu" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Vyřešit konflikt pomocí 'můj'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Vyřešit konflikt pomocí 'jejich'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Vyřešeno" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Vyřešeno:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Vyřeší soubory v konfliktu" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Restartovat přeskládání" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Obnovit" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Obnovit výchozí" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Obnovit po odevzdání" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Obnovit normální velikost okna" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Obnoveno" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Zkusit znovu" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Další pokus za 2 vteřiny..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Vrátit" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Vrátit odevzdání" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Vrátit odevzdání %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Vrátit na rodičovskou revizi" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Vrátit na revizi %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Vráceno" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Vrátí všechny změny které jste provedli od poslední aktualizace" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Vrátí přidání do správy verzí" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Zkontrolovat záplatu pomocí TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Zkontrolovat/Použít soubor sjednoceného rozdílu v TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "&Zkontrolovat/Použít jednu záplatu..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revize" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revize %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revize %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Graf revizí" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Soubory revize" @@ -8360,31 +8473,31 @@ msgstr "Filtr grafu revizí" msgid "Revision graph" msgstr "Graf revizí" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Revize vráceny. Všechny změny jsou nyní začleněny do vašeho pracovního stromu." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revize:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Přetočit zpět" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Přetočit %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntext s formátováním písma a odstavců" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Pravé zobrazení:" @@ -8392,21 +8505,21 @@ msgstr "Pravé zobrazení:" msgid "Right image" msgstr "Pravý obrázek" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Řádek %d z %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Řádek %d-%d z %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Řádka dolů" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Řádka nahoru" @@ -8414,11 +8527,11 @@ msgstr "Řádka nahoru" msgid "S&elect..." msgstr "&Vybrat..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Zobrazit tlačítka v jedné řadě" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Zobrazit tlačítka ve dvou řadách" @@ -8426,15 +8539,23 @@ msgstr "&Zobrazit tlačítka ve dvou řadách" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Zobrazit panel nástrojů rychlého přístupu pod pásem karet" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "&Přeskočit nevybrané" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "S&lisovat nevybrané" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatistiky" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "&Přepnout/Získat..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8454,7 +8575,7 @@ msgstr "Server SMTP vyžaduje ověření" msgid "SMTP Server:" msgstr "Server SMTP:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTp, přímo k cílovému serveru" @@ -8462,11 +8583,11 @@ msgstr "SMTp, přímo k cílovému serveru" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8474,19 +8595,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "Typ odevzdání SVN" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN přinést..." -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN Přeskládat" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN Rev" @@ -8498,15 +8619,15 @@ msgstr "&BezpCrlf:" msgid "Safe Crlf:" msgstr "Bezpečné Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Stejné" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Stejný čas odevzdání" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8524,35 +8645,39 @@ msgstr "Vzorová zpráva protokolu pro vyzkoušení regulárních řetězců bug msgid "Sample text:" msgstr "Vzorový text:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Uložit" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "&Uložit jako..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Ul&ožit jako...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Uložit jako" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Uložit spodní soubor jako\nJste požádáni o zadání místa pro uložení spodního souboru" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Uložit soubor" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Uložit soubor vlevo jako\nJste požádáni o zadání místa pro uložení souboru vlevo" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8560,13 +8685,13 @@ msgid "" "%s" msgstr "Uložit soubor vlevo\nZměny jsou uloženy do\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Uložit soubor vpravo jako\nJste požádáni o zadání místa pro uložení souboru vpravo" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8574,74 +8699,74 @@ msgid "" "%s" msgstr "Uložit soubor vpravo\nZměny jsou uloženy do\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Uložit vše\nOba soubory jsou uloženy" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "Uložit a vyloučit\nJe použit původní obsah a vaše změny jsou uloženy." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "Uložit a ignorovat označené bloky\nPouze vaše ruční úpravy jsou uloženy, označené bloky jsou ponechány tak jak jsou" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "Uložit a zahrnout\nVaše změny jsou uloženy a označené bloky jsou zahrnuty" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Uložit jako" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Uložit jako..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Uložit jako\nJste požádáni o zadání místa pro uložení souboru" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Uložit změny do %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Uložit změny." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "Uložit záplatový soubor" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Uložit revizi &do..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Uložit aktivní dokument s novým názvem\nUložit jako" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Uložit aktivní dokument\nUložit" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8663,13 +8788,13 @@ msgstr "Uložit sjednocený rozdíl" msgid "Save unified diff since HEAD" msgstr "Uložit sjednocený rozdíl zahrnující vše od čela větve" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Uložit\nUložit soubor se značkami konfliktu." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8681,12 +8806,12 @@ msgstr "Uložit\nZměny jsou uloženy do\n%s" msgid "Saved Data" msgstr "Uložená data" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Uložení nastavení selhalo (klíč: \"%s\", hodnota: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Ukládání poznámek selhalo." @@ -8698,11 +8823,11 @@ msgstr "Skenovat" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Posunout doleva" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Posunout doprava" @@ -8710,7 +8835,7 @@ msgstr "Posunout doprava" msgid "Se&ttings..." msgstr "N&astavení" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Prohledat &zprávy protokolu..." @@ -8722,20 +8847,20 @@ msgstr "&Hledat nahoru" msgid "Search for:" msgstr "Hledat:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Hledám lepší cestu pro použití záplaty..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Hledání selhalo v %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Vybrat" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Vybrat &vše" @@ -8751,59 +8876,59 @@ msgstr "&Vybrat kontextovou nabídku:" msgid "Select &window:" msgstr "Vybrat &okno:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Vybrat nástroj barvy\nVybrat barvu" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Vybrat soubor..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Vybrat klienta SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Vybrat tlačítko." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Vyberte objekt pro který chcete zobrazit nápovědu" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Vybrat seznam změn" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Vybrat aplikaci pro porovnání" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Vyberte soubor" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Vyberte složku kterou spojit s tímto systémem pro sledování chyb" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Vyberte složku do které exportovat.\nPřed provedením tohoto exportu bude možná třeba vytvořit novou složku." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Vybrat složku pro kterou skript spustit" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Vybrat složku do které vybrané soubory uložit" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Vybrat souboru hákového skriptu" @@ -8811,20 +8936,20 @@ msgstr "Vybrat souboru hákového skriptu" msgid "Select items automatically" msgstr "Vybrat položky automaticky" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Vybrat aplikaci pro sloučení" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Vybrat cíl sloučení" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8836,15 +8961,19 @@ msgid "" "checker used for commit messages." msgstr "Vybrat jazyk, který tento projekt používá. Toto nastavení ovlivňuje kontrolu pravopisu ve zprávě odevzdání." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "Vybrat sledovanou větev" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Vybrat prohlížeč pro soubory rozdílů" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Vyberte který soubor chcete uložit jako" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8854,7 +8983,7 @@ msgstr "Vyberte který soubor chcete uložit jako\nPoznámka: Zjištěn nevyře msgid "Select/deselect &all" msgstr "&Označit/Odznačit vše" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "Historie výběru" @@ -8862,7 +8991,7 @@ msgstr "Historie výběru" msgid "Send" msgstr "Odeslat" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Odeslat email" @@ -8870,11 +8999,11 @@ msgstr "Odeslat email" msgid "Send Mail after create" msgstr "Odeslat poštu po vytvoření" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Send Mail nemohl odeslat zprávu." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Odeslat poštu..." @@ -8882,19 +9011,19 @@ msgstr "Odeslat poštu..." msgid "Send Patch" msgstr "Poslat záplatu" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Odeslat záplatu emailem" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Odeslat záplat(u/y) emailem" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Odesílání obsahu" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Odesílání..." @@ -8914,28 +9043,28 @@ msgstr "Nastavit au&tora" msgid "Set author &date" msgstr "Nastavit &datum vytvoření" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Nastavit vzdálenou jako \"pushremote\" (vzdálená pro odevzdání) pro zvolenou místní větev." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Nastaví vzdálenou větev jako \"větev pro odeslání\" pro zvolenou místní větev." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Nastavování vlastností..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Nastavení" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Nastavení - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8943,7 +9072,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Rozšířený shell" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Mezipaměť ikon shellu byla znovu sestavena!" @@ -8955,7 +9084,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Krátký formát &data/času ve zprávách protokolu" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Zkrátit seznam vlastností" @@ -8967,7 +9096,7 @@ msgstr "Zobrazit" msgid "Show &Accelerator for:" msgstr "&Zobrazit zkratku pro:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "&Zobrazit protokol odkazů" @@ -8975,15 +9104,15 @@ msgstr "&Zobrazit protokol odkazů" msgid "Show &Unversioned Files" msgstr "&Zobrazit soubory bez verze" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Zobrazit &celý projekt" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Zobrazit &změny" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Zobrazit &protokol" @@ -8991,15 +9120,19 @@ msgstr "Zobrazit &protokol" msgid "Show &log..." msgstr "Zobrazit &protokol..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "Zobrazit &vnořené odkazy" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "&Překryv a kontextovou nabídku zobrazit pouze v průzkumníku" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Zobrazit nad pásem karet" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Zobrazit pod pásem karet" @@ -9007,35 +9140,35 @@ msgstr "Zobrazit pod pásem karet" msgid "Show Environment Variables" msgstr "Zobrazit proměnné prostředí" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Zobrazit méně tlačítek" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Zobrazit uzly čelní revize" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Zobrazit rozdíl v řádku slovo po slově\nRozdíl v řádku podle slov" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Zobrazit Rozdíl v řádku\nRozdíl v řádku" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Zobrazit více tlačítek" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Zobrazit panel nástrojů rychlého přístupu nad pásem karet" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Zobrazit panel nástrojů rychlého přístupu pod pásem karet" @@ -9043,11 +9176,11 @@ msgstr "Zobrazit panel nástrojů rychlého přístupu pod pásem karet" msgid "Show Screen&Tips on toolbars" msgstr "Zobrazit &názvy tlačítek v panelech nástrojů" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Zobrazit mezery" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Zobrazit přehled celého grafu" @@ -9055,7 +9188,7 @@ msgstr "Zobrazit přehled celého grafu" msgid "Show asterisk log prefix" msgstr "Zobrazit před záznamem hvězdičku" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "Zobrazit před záznamem hvězdičku v dialogovém okně záznamu" @@ -9063,11 +9196,11 @@ msgstr "Zobrazit před záznamem hvězdičku v dialogovém okně záznamu" msgid "Show author" msgstr "Zobrazit autora" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Zobrazit větve na kterých je odevzdání" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Zobrazit změny jako &sjednocený rozdíl" @@ -9087,15 +9220,15 @@ msgstr "Zobrazit datum" msgid "Show describe in log" msgstr "Zobrazit popis v záznamu" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "Zobrazit popis v dialogovém okně záznamu" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Zobrazit cílovou složku" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Zobrazit rozdíl" @@ -9107,11 +9240,15 @@ msgstr "Zobrazit rozdíl od posledního odevzdání" msgid "Show excluded folders as normal" msgstr "Zobrazit vyloučené složky jako normální" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "Zobrazit dodatečné změny po sloučení" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Zobrazit &celá menu po krátké prodlevě" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Zobrazit název souboru" @@ -9127,7 +9264,7 @@ msgstr "Zobrazit i&gnorované soubory" msgid "Show ignore local changes flagged files" msgstr "Zobrazit soubory označené příznakem \"ignorovat místní změny\"" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "&Zobrazit pouze označené komentáře" @@ -9135,90 +9272,90 @@ msgstr "&Zobrazit pouze označené komentáře" msgid "Show linenumber&s" msgstr "&Zobrazit čísla řádků" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Zobrazit protokol" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Zobrazit protokol &před přejmenováním/kopírováním" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Zobrazit protokol %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Zobrazit protokol podmodulu" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Zobrazit protokol této složky" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Zobrazit protokol..." -#. Resource IDs: (96) +#. Resource IDs: (1535) 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: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Zobrazit změněné soubory v pracovním stromě" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Zobrazit další změnu zvoleného odevzdání\nZobrazit další" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Zobrazit nejstarší uzel nahoře" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Zobrazit nebo skrýt lištu rozdílů v řádku\nPřepnout lištu rozdílů v řádku" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Zobrazit nebo skrýt lištu umístění\nPřepnout lištu umístění" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Zobrazit nebo skrýt lištu stavu\nPřepnout lištu stavu" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Zobrazit nebo skrýt lištu stavu\nPřepnout lištu stavu" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Zobrazit nebo skrýt panel nástrojů\nPřepnout panel nástrojů" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Zobrazit původní číslo řádku" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Zobrazit předchozí změnu zvoleného odevzdání\nZobrazit předchozí" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Zobrazit vlastnosti revize" @@ -9226,7 +9363,7 @@ msgstr "Zobrazit vlastnosti revize" msgid "Show shortcut &keys in ScreenTips" msgstr "Zobrazit &klávesové zkratky v názvech tlačítek" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9236,7 +9373,7 @@ msgstr "Zobrazí zvláštní znaky pro mezery a nové řádky\nZobrazit mezery" msgid "Show status of subrepositories in parent folders" msgstr "Zobrazit stav podúložišť v nadřazených složkách" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Zobrazit symboly ve jmenovkách odkazů pro nahrazení části názvů" @@ -9248,45 +9385,43 @@ msgstr "Zobrazit &nezměněné soubory" msgid "Show un&versioned files" msgstr "Zobrazit soubory bez &verze" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Zobrazit/Skrýt" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Zobrazováno %1!d! odkaz(ů), vybráno %2!d! odkaz(ů)" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Zobrazeno %ld revizí, od revize %s do revize %s - zvoleno %ld revizí, zvoleno %ld souborů\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Zobrazí grafické znázornění kopií/značek/větví" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Zobrazí všechny soubory se změnou od poslední aktualizace, lokálně a v úložišti" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "Zobrazí všechny soubory se změnou od posledního odevzdání." -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Zobrazí informace o TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Zobrazí protokol odkazů" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Zobrazit soubor protokolu činností ve výchozím textovém editoru" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Zobrazí protokol pro zvolený soubor/složku" @@ -9298,7 +9433,7 @@ msgstr "&Podepsat" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "Významně přispěli: (viz úložiště Git pro úplný seznam)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Stříbrný Styl" @@ -9306,20 +9441,20 @@ msgstr "Stříbrný Styl" msgid "Since" msgstr "Od" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Velikost" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Přeskočit" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Přeskočit záplatu: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Přeskočit pracovní strom" @@ -9327,23 +9462,23 @@ msgstr "Přeskočit pracovní strom" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Přeskočit pracovní strom (Stejné jako \"Uzamčeno\" v TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Přeskočeno" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Chybějící cíl přeskočen" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Posunout" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Chytrý znak tabulátoru" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Měkké" @@ -9351,13 +9486,13 @@ msgstr "Měkké" msgid "Soft: Leave working tree and index untouched" msgstr "Mírné: Ponechat pracovní strom a index tak jak jsou" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Některé soubory byly změněny mimo TortoiseGitMerge.\nChcete změny načíst?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9371,7 +9506,7 @@ msgstr "Seřadit podle počtu odevzdání" msgid "Sort tag list in reversed order" msgstr "Seřadit seznam značek v opačném pořadí" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9381,49 +9516,53 @@ msgstr "Určuje kolik položek chcete uchovat v dialogovém okně nedávných zp msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Rozdělit řádky" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Rozdělit aktivní okno na panely\nRozdělit" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Slisovat" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "Slisovat (s níže uvedeným odevzdáním)" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Skládaný sloupcový graf" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "skládaný čárový graf" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Spustit (Rychlý posun vpřed)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Spustit výběr nejlepšího" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Spustit hák odevzdání" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Spustit přeskládání" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Spustit režim půlení..." @@ -9431,7 +9570,7 @@ msgstr "Spustit režim půlení..." msgid "Start registry editor" msgstr "Spustit editor registru" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Spustí server git s protokolem git" @@ -9443,39 +9582,47 @@ msgstr "Schovat" msgid "Stash &Message" msgstr "&Zpráva úschovy" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Použití úschovy" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Seznam úschov" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Výběr z úschovy" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Uložení do úschovy" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Probíhá operace úschovy..." +#. Resource IDs: (2705) +msgid "State" +msgstr "Stav" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statické" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistiky" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Stav" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "Lišta stavu" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Nastavení lišty stavu" @@ -9487,32 +9634,32 @@ msgstr "Stav a barvy činností" msgid "Status cache" msgstr "Ukládání stavu do mezipaměti" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Mezipaměť stavu pouze pro jednu složku, s podrobným stavem a rekurzivními překrytími" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Mezipaměť stavu je ukládána do externího procesu, který zjišťuje změny souborů, překryv může zobrazit rekurzivně" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Ukládat stav do mezipaměti pouze pro jednu složku, žádné rekurzivní překryvy" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Zastaví režim půlení" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "Uloží cestu souboru použitého pro porovnání při pozdějším kliknutí pravým tlačítkem. Podržte klávesu Ctrl pro smazání poslední uložené cesty." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Strategie" @@ -9520,15 +9667,15 @@ msgstr "Strategie" msgid "Strip lines starting with \"#\" in commit message" msgstr "Odstranit řádky začínající znakem \"#\" ve zprávě odevzdání" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Styl" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Předmět" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Předmět:" @@ -9536,7 +9683,7 @@ msgstr "Předmět:" msgid "Submodule" msgstr "Podmodul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "&Aktualizace podmodulu..." @@ -9544,7 +9691,7 @@ msgstr "&Aktualizace podmodulu..." msgid "Submodule Add" msgstr "Přidat podmodul" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Přidání podmodulu..." @@ -9552,15 +9699,15 @@ msgstr "Přidání podmodulu..." msgid "Submodule Diff" msgstr "Porovnat podmodul" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Zavedení podmodulů" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Synchronizace podmodulu" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Aktualizace podmodulů" @@ -9568,7 +9715,7 @@ msgstr "Aktualizace podmodulů" msgid "Submodule Update Options" msgstr "Možnosti aktualizace podmodulů" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9583,15 +9730,15 @@ msgstr "Podmodul projektu:" msgid "Submodules" msgstr "Podmoduly" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Úspěch" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Přejít" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Přechod %s na %s, Revize %s" @@ -9600,43 +9747,43 @@ msgstr "Přechod %s na %s, Revize %s" msgid "Switch To" msgstr "Přejít na" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Přepne zpět na předchozí okno panelu\nPředchozí panel" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Přepnout mezi jedno- a dvou- panelovým zobrazením" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Přepnout mezi jedno- a dvou-panelovým zobrazením\nPřepnout mezi jedno- a dvou-panelovým zobrazením" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Zaměnit levé a pravé zobrazení" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Vyměnit obsah levého a pravého zobrazení\nVyměnit levé a pravé zobrazení" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Přepnout na další okno dokumentu" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Přepnout na další zobrazení okna\nDalší panel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Přepnout na předchozí okno dokumentu" @@ -9644,19 +9791,19 @@ msgstr "Přepnout na předchozí okno dokumentu" msgid "Switch/Checkout" msgstr "Přejít/Získat" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Přejít/Získat na" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Přejít/Získat na toto..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Přepnout/Získat pracovní strom do jiné větve/značky" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Přepíná porovnání levá<->pravá" @@ -9668,23 +9815,23 @@ msgstr "Názvy odkazů vyjádřit symboly" msgid "Symlink" msgstr "Symbolický odkaz" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Synchronizace vzdálených úložišť, včetně stažení, odeslání, emailové záplaty atd." -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Synchronizace..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Systém" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Systém je v režimu offline. Zkontrolujte Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9694,11 +9841,11 @@ msgstr "Položky registru systému byly odstraněny a soubor INI (pokud byl něj msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" @@ -9714,7 +9861,7 @@ msgstr "Zástupné místo karty" msgid "Tab size:" msgstr "Velkost karty:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Značka" @@ -9722,16 +9869,16 @@ msgstr "Značka" msgid "Tag (FF)" msgstr "Značka (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Informace o značce" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Pracovní strom označen na %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Značky" @@ -9739,11 +9886,11 @@ msgstr "Značky" msgid "Tags:" msgstr "Značky:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Úkoly" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Panel úkolů" @@ -9755,11 +9902,11 @@ msgstr "Dočasné soubory (včetně obrázků Gravatar)" msgid "Test" msgstr "Vyzkoušet" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Pouze test" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Textové soubory (*.txt)|*.txt|Všechny soubory (*.*)|*.*||" @@ -9767,13 +9914,19 @@ msgstr "Textové soubory (*.txt)|*.txt|Všechny soubory (*.*)|*.*||" msgid "Thai" msgstr "Thajština" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "Vzdálené nastavení bylo změněno.\nChcete ho uložit nebo změny zahodit?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "Hodnota \"počet\" pro volby \"Posledních N\".\nMěla by být > 0" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9781,64 +9934,78 @@ msgid "" "Do you really want to delete it?" msgstr "Větev \"%s\" je vzdálená větev.\n\nOpravdu ji chcete smazat?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Velikost kusu neodpovídá počtu přidaných/odstraněných řádků!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Zpráva odevzdání nesmí být prázdná." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "URL pomocníka ověření \"%s\" již existuje.\nChcete ji přepsat?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "Pomocník s pověřením byl změněn.\nChcete změny nyní uložit nebo zahodit?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "Současný pracovní strom není čistý.\nChcete změnit dát do úschovy?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "Výchozí omezení zpráv záznamu při otevření dialogového okna zpráv záznamu.\nPoznámka: Pro zobrazení všech zpráv v dialogovém okně\nmůžete kliknout pravým tlačítkem na datové pole \"OD\" a pak kliknout na položku \"Bez omezení\"." + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Jádro porovnávání bylo ukončeno kvůli chybě:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "Zadaný zdrojový odkaz je nejasný.\nMusí být jedinečný (např. přidáním \"refs/heads/\" pro větve" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "Získaná větev rychle posouvá vpřed současnou větev.\n\nChcete přesto sloučit nebo otevřít dialogové okno přeskládání?" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Soubor %s neexistuje!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "V záplatovém souboru nebyl nalezen soubor %s !" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Soubor \"%s\" ve vašem pracovním stromu neexistuje.\nChcete vybrat jiný soubor k porovnání?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9847,15 +10014,15 @@ msgid "" "Do you want to remove the file?" msgstr "Soubor\n%s\nje prázdný.\nChcete ho odstranit?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Soubor je příliš velký" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Soubor je příliš velký na otevření." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9863,7 +10030,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Soubor\n%s\njiž existuje! Chcete ho přepsat?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9871,14 +10038,14 @@ msgid "" "is not a valid text file!" msgstr "Soubor\n%s\nnení platným textovým souborem!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Složka %s\nobsahuje změněné soubory a/nebo bez verze. Chcete ji přesto odstranit?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9887,78 +10054,78 @@ msgid "" "Would you like to create it first?" msgstr "Složka\n%s\nneexistuje.\nChtěli byste ji nejdříve vytvořit?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Hákový skript vrátil chybu:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Tento obrázek nemůže být zobrazen." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Poskytovatel systému pro sledování chyb nemohl být vytvořen. Prosím zkontrolujte, že je správně nainstalován." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Poskytovatel systému pro sledování chyb nemohl ověřit řetězec parametru" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Na řádku %d byl očekáván řádek označující nový soubor!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Číslo řádku musí být mezi %d a %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "Místní větev \"%s\" nebyla rychle posunuta vpřed při vzdálené větvi \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "Názvy místní i vzdálené větve jsou prázdné.\nChcete pokračovat?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "Název místní větve/značky je prázdný. To má za následek odstranění vzdálené.\nPokračovat?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Maximální počet řádků, které v protokolu činností ponechat.\nVšechny řádky přidané nad tento limit nahradí nejstarší v tomto souboru." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Operace selhala." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Parametry '/path' a '/pathfile' se vzájemně vylučují.\nMůžete zadat pouze jeden z nich." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "Záplata nebyla v %s správně použita a nebyly zadány žádné informace o verzi.\nZáplatování není možné!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9968,7 +10135,7 @@ msgid "" "do not match!" msgstr "Záplata se zdá být zastaralá! Řádek souboru\n%s\na řádek záplaty\n%s\nse neshodují!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9979,7 +10146,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Cesta/URL, kterou jste zadali, se zdá být ve Windows neplatná!\nMůžete ji zkusit použít, ale později může dojít k chybám.\n\n\nPlatná cesta nesmí obsahovat '<<>|\"?*:' nebo jeden z následujících názvů zařízení:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nChcete přesto pokračovat?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9990,36 +10157,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Cesta\n%s\nse pravděpodobně neshoduje s cestami v záplatovém souboru.\nAle TortoiseGitMerge nalezl cestu\n%s\nkterá odpovídá lépe. Chcete místo vaší cesty použít navrhovanou?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Proces stále probíhá.\nOpravdu ho chcete přerušit?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "Regulární výraz je neplatný!\nZadejte prosím platný regulární výraz." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Vzdálená \"%s\" již existuje.\nChcete ji přepsat?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "Vzdálená větev se nezměnila.\n\nChcete přesto otevřít dialogové okno přeskládání?" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Úložiště bylo úspěšně vytvořeno." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Vypadá to, že ve zvoleném souboru se stále vyskytují jeden nebo více značek konfliktů.\nOpravdu chcete tento soubor označit jako vyřešený?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10027,7 +10201,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "Podmodul \"%s\" je znečištěn.\nPouhým odevzdáním superprojektu nelze takovéto změny sledovat či uložit do podmodulu.\nOdevzdat podmodul nyní, nebo ignorovat znečištěné změny?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10036,7 +10210,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Cílová složka\n%s\nje speciální složkou a nemá být kořenem úložiště!\nOpravdu chcete zavést úložiště git v této složce?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10045,26 +10219,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Cílová složka\n%s\nnení prázdná!\nOpravdu chcete zavést úložiště git v této složce?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "Text je stejný, ale soubory se neshodují!\nByly nalezeny následující rozdíly:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Doba ve vteřinách po které bude zpracování souborů zastaveno.\nS nižší hodnotou bude seznam automatického dokončení dostupný dříve,\nale nemusí prozkoumat všechny soubory." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Dvě vybrané URL nejsou vytvořeny ze stejného kořene.\nNení možné zobrazit zprávy protokolu mezi nimi!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10074,34 +10248,34 @@ msgstr "Pracovní strom není čistý a obsahuje nezařazené změny. \nChcete z msgid "Their file:" msgstr "Jejich soubor:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Jejich" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "V jednom nebo více podmodulů existují změny nebo položky bez verze.\nTyto soubory nejsou určeny pro odevzdání, proto je musíte v podmodulu odevzdat" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "V současnosti je nainstalováno %d obslužných rutin překryvů mimo těch, které používá Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Existuje více upravitelných zobrazení.\nKteré zobrazení chcete uložit?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Nejsou dostupní žádní poskytovatelé systému pro sledování chyb." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10110,85 +10284,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Na řádku %d jsou stále nevyřešené konflikty!\nPřed uložením byste je měli vyřešit.\nChcete uložit soubor obsahující konflikty?\nPokud kliknete na ANO, pak budete muset konflikty vyřešit v jiném editoru!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Existují neuložené změny!\nChcete je uložit?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Není nic k přidání. Všechny soubory jsou buď pod správou verzí, byly ignorovány nebo se jich týká nastavení globálního ignorování." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Thesaurus" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Tyto jsou uloženy později než právě otevřené dokumenty a obsahují změny, které byly udělány před zavřením aplikace." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Pole je povinné a nesmí být prázdné." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Toto není platná URL.\nProsím zadejte ji zde." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Toto není platná cesta!\nPlatná cesta nesmí obsahovat '<<>|\"?*:' nebo jeden z následujících názvů zařízení:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "Tuto operaci nelze spustit, dokud dialogové okno záznamů nenačte odevzdání." -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Tento program je propojen na chybějící export %s v souboru %s. Tento stroj může mít nekompatibilní verzi %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Tento program vyžaduje soubor %s, který v tomto systému nebyl nalezen." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Tato vlastnost je povolena pouze na složkách, ne souborech." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "Název této vzdálené je v konfliktu se získaným specifikátorem odkazů jiných vzdálených\nProsím použijte jiný název" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Tato operace vyžaduje čistý pracovní strom." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Toto smaže záznam příkazů, které jste v této aplikaci používali, a obnoví výchozí sadu zobrazených příkazů v nabídkách a panelech nástrojů. Nevrátí zpět žádné konkrétní přizpůsobení. Opravdu toto chcete udělat?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Trojité porovnání" @@ -10204,14 +10378,14 @@ msgstr "Uspořádat &Vodorovně" msgid "To" msgstr "Do" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "Abyste se vyhnuli přinášení špatných značek, pokud toto není oficiální vzdálená větev,\nje doporučeno zakázat přinášení značek pro tuto vzdálenou větev.\nZakázat přinášení značek?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10223,13 +10397,13 @@ msgstr "Pro vyčištění dočasných souborů byste se měli ujistit, že nebě msgid "To:" msgstr "Do:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Přepnout Jedno/Dvoj-panelové zobrazení\nPřepnout Jedno/Dvoj-panelové zobrazení" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Přepnout filtry" @@ -10241,11 +10415,11 @@ msgstr "Panel nástrojů" msgid "Toolbar Name" msgstr "Název panelu nástrojů" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Možnosti panelu nástrojů" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Vnitřní chyba panelu nástrojů. Prosím kontaktujte dodavatele vaší aplikace." @@ -10261,16 +10435,16 @@ msgstr "Nástroje" msgid "Tools:" msgstr "Nástroje:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Sestavení %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10280,20 +10454,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit zjistil. že \"%s\" neexistuje, ale je označen jako \"Přidán\".\nDialogové okno odevzdání toto nemůže zpracovat.\n\nChcete ho odstranit z rejstříku?" +"Do you want to restore or remove it from the index?" +msgstr "TortoiseGit zjistil. že \"%s\" neexistuje, ale je označen jako \"Přidán\" nebo \"Změněn\".\nDialogové okno odevzdání toto nemůže zpracovat.\n\nChcete ho obnovit nebo odstranit z rejstříku?" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit zjistil podobné názvy souborů. Chcete aby soubory: %s\nbyly také přejmenovány?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit nezobrazí následující překryvy: %s" @@ -10302,18 +10476,18 @@ msgstr "TortoiseGit nezobrazí následující překryvy: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame již byl pro úložiště \"%s\" zaveden. Nelze při běhu programu přejít na jiné úložiště (\"%s\")." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Verze %d.%d.%d.%d" @@ -10329,7 +10503,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Dokument\nTortoiseGitBlame.Dokument" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10337,7 +10511,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Nástroj pro porovnávání obrázků, součást TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10351,16 +10525,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGItMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10369,18 +10543,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge nemůže zpracovat tuto záplatu. Název souboru \"%s\" se zde vyskytuje více než jednou." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10419,11 +10593,11 @@ msgstr "Sledovat" msgid "Tracked Remote Branch:" msgstr "Sledovaná vzdálená větev:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Sledovaná větev" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Přenášení při %s" @@ -10432,39 +10606,35 @@ msgstr "Přenášení při %s" msgid "Transparent &color..." msgstr "&Průhledná barva ..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Oříznout vpravo" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Zkuste 'Vyčistit'. Pokud toto nebude fungovat, pak je třeba znovu provést nové získání." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Zkusit znovu" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turečtina" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Přizpůsobit TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Typ" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Typ:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL a adresář nesmí být prázdné" @@ -10488,24 +10658,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Nelze načíst systémovou podporu pošty" -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Nelze zpracovat příkaz, server je zaneprázdněn." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Nelze číst z %1, je otevřen někým jiným." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Nelze číst z vlastnosti pouze pro zápis." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10513,91 +10683,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Nelze znovu sestavit cestu pracovního stromu!\nTo se stává, když soubor byl přejmenován.\nProsím spusťte dialogové okno protokolu pro tento konkrétní soubor a pak vraťte změny\nv horním panelu dialogového okna." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Nelze zapisovat do vlastnosti pouze pro čtení." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Nelze zapisovat do %1, je pouze pro čtení nebo je otevřen někým jiným." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Odškrtnout" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Zpět" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Vrátit zpět %d činností" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Vrátit 1 činnost" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Vrátit přidání..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Vrátit poslední činnost zpět\nVrátit" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Vrátit poslední změny zpět\nZpět" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Nečekaný formát souboru." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "Změnit na \"přeskočit pracovní strom\" a \"považovat za nezměněné\"" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Rozevřít" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Neformátovaný text\ntext bez formátování" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Sjednocený &rozdíl čelních revizí" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Neznámé" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Neznámá hloubka" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Odznačit tento blok" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Nevyřešené konflikty!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "Zrušit sledování větve" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Bez názvu" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Bez verze" @@ -10605,7 +10779,7 @@ msgstr "Bez verze" msgid "Unversioned files mark parent folder as modified" msgstr "Soubory bez verze označují nadřazenou složku jako změněnou" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Odstraňování verze v %s" @@ -10618,23 +10792,23 @@ msgstr "Nahoru" msgid "Update" msgstr "Aktualizace" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Aktualizovat odkaz" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Aktualizovat podmoduly" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Aktualizováno" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Aktualizace objektů ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Aktualizace indexu" @@ -10646,30 +10820,26 @@ msgstr "&Použít výchozí obrázek:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Použít &jednopanelové zobrazení k porovnání 2 souborů" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Použít &druhý textový blok" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Použít textový blok 'můj'" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Použít textový blok 'můj' pak 'jejich'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Použít textový blok 'jejich'" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Použít textový blok 'jejich' pak 'můj'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Použít bloky" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Použít část cesty HTTP" @@ -10690,15 +10860,15 @@ msgstr "Použít &tenký balíček (Pro pomalá síťová připojení)" msgid "Use Unified Diff from &clipboard" msgstr "Použít sjednocený rozdíl ze &schránky" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Použijte jiný název nebo možnost \"Vynutit\" pro přepsání." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Použijte jiný název, nebo použijte volbu \"Přepsat větev\"" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10708,7 +10878,7 @@ msgstr "Použít všechen obsah z levého zobrazení\nPoužít levý soubor" msgid "Use block from left before right" msgstr "Použít levý blok a pak pravý" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10718,25 +10888,25 @@ msgstr "Použít blok z levého zobrazení před blokem z pravého\nPoužít blo msgid "Use block from right before left" msgstr "Použít blok zprava před levým" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Použít blok z pravého zobrazení před blokem z levého\nPoužít blok zprava před levým" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Použít oba textové bloky (tento první)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Použít oba textové bloky (tento poslední)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "Použít nastavený server" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Použít blok vlevo" @@ -10752,15 +10922,15 @@ msgstr "Použít barvu místní větve pro současnou větev" msgid "Use recycle bin when reverting" msgstr "Při vrácení použít Koš" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Použít regulární výraz" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Použít blok vpravo" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Použít mezery" @@ -10768,61 +10938,61 @@ msgstr "Použít mezery" msgid "Use system locale for date/time" msgstr "Použít místní nastavení pro datum/čas" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Použít textový blok z '&mého'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Použít textový blok z '&jejich'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Použít textový blok z 'mé&ho' před 'jejich'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Použít textový blok z 'mého' před 'jejich'\nPoužít 'můj' textový blok před 'jejich'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Použít textový blok z 'mého'\nPoužít 'můj' textový blok" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Použít textový blok z 'jejic&h' před 'mým'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Použít textový blok z 'jejich' před mým'\nPoužít 'jejich' textový blok před 'mým'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Použít textový blok z 'jejich'\nPoužít 'jejich' textový blok" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Použít textový blok z levého zobrazení\nPoužít levý blok" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "&Použít tento blok textu" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "Použít současný čas nastavením data vytvoření na datum odevzdání." -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10830,7 +11000,7 @@ msgid "" "%s" msgstr "Použít nalezenou cestu.\nPoužít záplatu na\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10842,19 +11012,19 @@ msgstr "Použít původní cestu.\nPoužít záplatu na\n%s" msgid "Use this" msgstr "Použít toto" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Použít tento &celý soubor" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Použít tento blok na levý" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Použít celý druhý &soubor" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Použito ke změně vrcholu současné větve." @@ -10870,11 +11040,11 @@ msgstr "Informace o uživateli" msgid "User Name:" msgstr "Už. jméno:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Zrušeno uživatelem" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10884,11 +11054,11 @@ msgstr "Uživatelské jméno a email musí být před odevzdáním nastaveno.\nC msgid "User&name:" msgstr "Uživatelské &jméno:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Uživatelské jméno:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10907,7 +11077,7 @@ msgid "" "/line:" msgstr "Platné volby příkazové řádky jsou:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:<číslo řádku k zobrazení>" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Hodnota" @@ -10915,24 +11085,24 @@ msgstr "Hodnota" msgid "Version" msgstr "Verze" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Verze %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Verze 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Verze 1 (Novější čas odevzdání)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Verze 2 (Základní)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Verze 2 (Základ) (Novější čas odevzdání)" @@ -10940,11 +11110,11 @@ msgstr "Verze 2 (Základ) (Novější čas odevzdání)" msgid "Version Information" msgstr "Informace o verzi" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Verze:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "S verzí" @@ -10956,23 +11126,27 @@ msgstr "Vietnamština" msgid "View" msgstr "Zobrazit" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Zobrazit .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "Lišty zobrazení" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Zobrazit záplatu" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Zobrazit záplatu>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Zobrazit revizi pro cestu v &internetovém průzkumníku" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Zobrazit revizi v alternativním editoru" @@ -10984,11 +11158,11 @@ msgstr "&Zobrazit globální gitconfig" msgid "Visit our website" msgstr "Navštívit naší stránku" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10999,7 +11173,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "VAROVÁNÍ:\nTyto nastavení měňte, pouze pokud opravdu víte, co děláte!\nAbyste hodnoty nastavili na výchozí, smažte hodnotu text." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Počkat" @@ -11007,7 +11181,7 @@ msgstr "Počkat" msgid "Wait for the script to finish" msgstr "Počkat na dokončení skriptu" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Čekání na vstup" @@ -11015,15 +11189,15 @@ msgstr "Čekání na vstup" msgid "Walk Be&haviour" msgstr "&Chování průchodu" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Varování" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Varování!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11031,7 +11205,7 @@ msgid "" "Do you really want to continue?" msgstr "Varování: \"%s\" bude natrvalo odstraněna. Toto NEMŮŽETE vrátit!\n\nOpravdu chcete pokračovat?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Internet" @@ -11039,56 +11213,56 @@ msgstr "Internet" msgid "Western European" msgstr "Západoevropské" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Při aktivaci podržte klávesu SHIFT a kliknutím pravého tlačítka myši zobrazíte další položky kontextové nabídky TortoiseGit" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Při používání záplaty si nevšímat změn v mezerách v řádcích kontextu, pokud je to nutné" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Při zavírání dialogového okna postupu s běžícím procesem git se před ukončením zeptat na potvrzení" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Při povolení budou dostupné položky kontextové nabídky TortoiseGit pro přesun při přetahování složek / souborů" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Při povolení jsou větší čísla revizí řazena jako první. To proto, že novější verze jsou zpravidla užitečnější." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Při povolení jsou položky s verzí, uvedené v dialogovém okně odevzdání, automaticky vybrány" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Když se záplatu nepodaří správně použít, použít místo toho sloučení s trojím porovnáváním, pokud záplata obsahuje identifikaci blobů, na které má být použita a tyto bloby jsou dostupné v umístění." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "Když zadáte URL, název vzdálené větve bude automaticky zadán jako \"origin\", pokud je prázdný, takže ho nemusíte zadávat." -#. Resource IDs: (96) +#. Resource IDs: (1533) 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" @@ -11098,15 +11272,15 @@ msgid "" "authentication and/or encryption." msgstr "Při spuštění daemona jsou všechna data v tomto úložišti vystavena bez ověřování a/nebo zašifrování." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Změny mezer (tabulátory, mezerníky)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Mezery" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Pozice okna" @@ -11114,15 +11288,15 @@ msgstr "Pozice okna" msgid "Windows" msgstr "Okna" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11166,11 +11340,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "V souboru:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Uvnitř souboru" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Pracovní strom" @@ -11178,29 +11352,25 @@ msgstr "Pracovní strom" msgid "Working Tree Path:" msgstr "Cesta pracovního stromu:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Změny pracovního adresáře" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Zalomit dlouhé řádky" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Zalomí dlouhé řádky v právem okraji zobrazení\nZalomit dlouhé řádky" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Ano" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Ano všem" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Již máte nainstalovánu nejnovější verzi." @@ -11210,51 +11380,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Zde můžete zakázat konkrétní obslužné rutiny překryvů\nZakázané rutiny nevyužívají pozici pro překryvy a dají ostatním rozšířením shell možnost zobrazit jejich překryvy." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Můžete vkládat bitmapu pouze o velikosti (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Nemůžete vytvořit více než %d uživatelem zadaných panelů nástrojů!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Tuto vlastnost nemůžete nastavovat ve složkách, pouze v souborech!\nPokud ji chcete nastavit na všechny soubory ve složce,\nmusíte zaškrtnout políčko 'rekurzivní'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Přejmenováním nelze změnit tento typ odkazu" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "Máte instalovánu starou verzi Git pro Windows (https://msysgit.github.io/), která má problémy se zabezpečením.\n\nMěli byste zvážit nainstalovat verzi 1.9.5 a vyšší." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Zaškrtli jste \"zahrnout nesledované\".\nTo zahrnuje volání \"git clean -fd\", takže ignorované soubory/adresáře budou odstraněny bez použití odpadkového koše." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "Máte označeny změněné bloky. Jak by tyto bloky měly být uloženy?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Změnili jste vlastnosti, aniž byste je uložili.\nChcete je uložit nyní?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11262,67 +11432,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Vybrali jste %d položek pro porovnání.\nPro každou z těchto položek bude spuštěna nová instance prohlížeče rozdílů.\nOpravdu chcete zobrazit rozdíly pro tolik položek najednou?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Nezadali jste číslo úlohy!\nOpravdu chcete odevzdat bez tohoto čísla?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Nezadali jste svůj řádek podpisu" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Některé soubory jste označili jako \"Obnovit po odevzdání\".\nChcete je nyní obnovit? Po označení můžete přijít o všechny změny v toto souboru." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Můžete určit až %d nástrojů." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Pro odevzdání musíte nejdříve zadat zprávu protokolu" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Aby se změny projevili, musíte svůj systém restartovat." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Pro soubor zip musíte zvolit název souboru!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Vybrali jste složku.\nExportování je pouze možné do souboru (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Vybrali jste soubor bez verze.\nSoubor bude při odevzdávání přidán do správy verzí." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Měli byste zadat text!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Měli byste vybrat obrázek!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Změnili jste sadu ikon z %s na %s.\nTato změna se neprojeví, dokud svůj počítač nerestartujete, nebo se můžete odhlásit a znovu přihlásit!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11332,7 +11502,7 @@ msgstr "Vaše předtím zadané zprávy protokolu byly uloženy.\nKlikněte sem, msgid "Your version is:" msgstr "Vaše verze je:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Vaše verze je: %d.%d.%d.%d" @@ -11342,10 +11512,10 @@ msgid "Zip File" msgstr "Soubor zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Oddálit" +msgid "Zoo&m out\t-" +msgstr "O&ddálit\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Přiblížení/Oddálení" @@ -11357,80 +11527,80 @@ msgstr "&Přiblížit" msgid "Zoom &Out" msgstr "&Oddálit" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Přiblížení 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Přiblížit\nPřiblížit" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Oddálit\nOddálit" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "&Přiblížit" +msgid "Zoom i&n\t+" +msgstr "Při&blížit\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Přiblížení" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Oddálení" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Přizpůsobit velikost" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Přizpůsobit výšku" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Přizpůsobit šířku" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Výchozí]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Nepřiděleno]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "\"%s\" obsahuje úložiště git. Toto úložiště nebude bez úprav fungovat jako podmodul.\nChcete smazat .git-entry a přidat všechny soubory do vrchního úložiště, nebo ho ponechat jako oddělené úložiště v podadresáři?" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" obsahuje podmodul git. Je pravděpodobné, že po kopírování toto již nebude fungovat.\nChcete smazat .git-entry a přidat všechny soubory do vrchního úložiště, nebo si nevšímat případných problémů a soubor nemazat?" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" je neplatné." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" není úložiště git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11444,7 +11614,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "přidat \"cherry picked from\" (vybrán nejlepší z)" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "přidáno" @@ -11452,7 +11622,7 @@ msgstr "přidáno" msgid "added files" msgstr "přidané soubory" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "nepojmenovaný soubor" @@ -11460,14 +11630,19 @@ msgstr "nepojmenovaný soubor" msgid "and support the developers" msgstr "a podpořte vývojáře" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "považovat za platné" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "autor (>= 0.5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "založeno na " @@ -11500,30 +11675,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "odevzdání" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "v konfliktu" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "kopírováno z\n%s - revize %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "den" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "smazáno" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "porovnání ze vstupu" @@ -11535,7 +11710,7 @@ msgstr "maketa" msgid "eMail settings" msgstr "Nastavení e-mailu" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11544,16 +11719,16 @@ msgid "" "%s" msgstr "%s\nexportováno do\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "externí" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git nebyl správně ukončen (kód ukončení %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorováno" @@ -11561,15 +11736,15 @@ msgstr "ignorováno" msgid "include &untracked" msgstr "zahrnout &nesledované" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "nedokončené" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "zdědit" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "položky místně uchovávány" @@ -11577,7 +11752,7 @@ msgstr "položky místně uchovávány" msgid "keep the file lists in English" msgstr "ponechat seznamy souborů v angličtině" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11586,7 +11761,7 @@ msgid "" "%s = %ld" msgstr "řádek: %d(+) %d(-) soubory: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11601,11 +11776,11 @@ msgstr "řádek: %d(+) %d(-) soubory: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "hlavní" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "sloučeno" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "chybí" @@ -11613,7 +11788,7 @@ msgstr "chybí" msgid "missing/deleted/replaced" msgstr "chybí/smazáno/nahrazeno" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "změněno" @@ -11621,7 +11796,7 @@ msgstr "změněno" msgid "modified/copied" msgstr "změněno/zkopírováno" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "měsíc" @@ -11629,40 +11804,44 @@ msgstr "měsíc" msgid "new branch" msgstr "nová větev" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "ne" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "pro tento příkaz není dostupný žádný popis" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "bez verze" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "žádné" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normální" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "nenalezeno" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "zablokovaný" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "ve %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "záplatováno" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixelů" @@ -11670,11 +11849,11 @@ msgstr "pixelů" msgid "possible or real conflict/obstructed" msgstr "možný nebo skutečný konflikt/zablokováno" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "čtvrtletí roku" @@ -11682,35 +11861,35 @@ msgstr "čtvrtletí roku" msgid "renamed" msgstr "přejmenováno" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "nahrazeno" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "prohledávám cestu:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "přeskočit pracovní strom" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "přechod na\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "postarat se o změny podmodulů" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "do %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "do %s" @@ -11719,35 +11898,35 @@ msgstr "do %s" msgid "u&nknown changes" msgstr "&neznámé změny" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "týden" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - všichni uživatelé Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - současný uživatel Windows" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - pouze toto úložiště" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - současný uživatel Windows" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - pouze toto úložiště" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "rok" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "ano" diff --git a/Languages/Tortoise_de.po b/Languages/Tortoise_de.po index 66ab6dfbb..174c5d17d 100644 --- a/Languages/Tortoise_de.po +++ b/Languages/Tortoise_de.po @@ -15,9 +15,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-08 13:41+0000\n" +"PO-Revision-Date: 2015-08-02 17:00+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: German (http://www.transifex.com/projects/p/tortoisegit/language/de/)\n" "MIME-Version: 1.0\n" @@ -26,7 +26,7 @@ msgstr "" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -48,138 +48,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "Autoren separat auflisten:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB übertragen" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 enthielt ein unerwartetes Objekt." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 enthält einen ungültigen Pfad." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 enthält ein ungültiges Schema." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 hat ein ungültiges Format." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 wurde nicht gefunden." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "vor %1!d! Tag" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "vor %1!d! Tagen" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "vor %1!d! Stunde" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "vor %1!d! Stunden" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "vor %1!d! Minute" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "vor %1!d! Monat" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "vor %1!d! Monaten" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "vor %1!d! Sekunde" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "vor %1!d! Sekunden" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "vor %1!d! Woche" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "vor %1!d! Wochen" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "vor %1!d! Jahr" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "vor %1!d! Jahren" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! Elemente ausgewählt" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "vor %1!d! Minuten" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nZeige %2!d! Dateien, %3!d! Submodule und %4!d! Verzeichnisse, %5!d! Einträge insgesamt" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nGröße %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nSoll das Skript weiter ausgeführt werden?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -187,52 +187,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nKonnte diese Datei nicht finden.\nBitte überprüfen Sie, ob der Pfad und der Dateiname korrekt sind." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig oder %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes übertragen" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d kiB übertragen" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d Eintragungen vor \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d Dateien geändert" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d Dateien gelöscht." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d Dateien zurückgesetzt zu %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d Dateien gewählt, %d Dateien insgesamt" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d aktivste Autoren mit je mindestens %d Eintragungen (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -240,78 +240,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% Alpha\\nKlicken Sie, um Alpha umzuschalten\\nDoppelklick, um Alpha automatisch umzuschalten" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld Minuten und %ld Sekunden" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld von %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - ist bei Revision: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [wieder hergestellt]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s, in %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s benötigt Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, mit %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Arbeitsbaum" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) von %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Export von %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nKönnte nicht gepatchet werden." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nWollen Sie sie trotzdem löschen?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -327,6 +327,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-Wege Zusammenführen" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "A&bbrechen" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "Ü&ber TortoiseGitBlame..." @@ -355,15 +359,15 @@ msgstr "Filter &hinzufügen" msgid "&Add New/Save" msgstr "&Hinzufügen/Speichern" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Einfügen!" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Schaltflächen hinzufügen oder entfernen" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Hinzufügen..." @@ -403,7 +407,7 @@ msgstr "&Zuweisen" msgid "&Associate double-click event with:" msgstr "&Verbinde Doppelklick-Ereignis mit:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Automatisch ausblenden" @@ -419,15 +423,15 @@ msgstr "Putty-Key &automatisch laden" msgid "&Backup original file" msgstr "&Erstelle Sicherheitskopie" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Annotieren" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "Änderungen &annotieren" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "Revision &annotieren" @@ -451,7 +455,7 @@ msgstr "&Zweig:" msgid "&Browse Dir" msgstr "&Suche Verzeichnis" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "Projektarchiv durchsuchen" @@ -487,7 +491,7 @@ msgstr "&Kategorie:" msgid "&Choose commands from:" msgstr "&Wähle Befehle von:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Aufräumen" @@ -511,7 +515,7 @@ msgstr "&Fenster schließen" msgid "&Command:" msgstr "&Befehl:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Eintragen" @@ -519,23 +523,27 @@ msgstr "&Eintragen" msgid "&Commit submodule..." msgstr "Submodule &eintragen..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&ohne eintragen" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Eintragen..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "Revisionen &vergleichen" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Komprimierter Graph" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Weiter" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopieren" @@ -555,11 +563,11 @@ msgstr "&Individuell" msgid "&Default" msgstr "&Standard" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Löschen" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Löschen (lokal erhalten)" @@ -567,7 +575,7 @@ msgstr "&Löschen (lokal erhalten)" msgid "&Delete Filter" msgstr "Filter lö&schen" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Lösche entfernt und lokal" @@ -579,11 +587,11 @@ msgstr "&Erkenne verschobene und kopierte Zeilen" msgid "&Detect moved or copied lines:" msgstr "&Erkenne verschobene und kopierte Zeilen:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Vergleich" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Vergleiche mit vorheriger Revision" @@ -595,7 +603,7 @@ msgstr "&Verzeichnis:" msgid "&Disabled" msgstr "&Deaktiviert" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Verwerfen" @@ -603,7 +611,7 @@ msgstr "&Verwerfen" msgid "&Do the same for the rest" msgstr "&Diese Entscheidung für alle weiteren Funde merken" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Andocken" @@ -611,11 +619,15 @@ msgstr "&Andocken" msgid "&Don't ask me again" msgstr "&Nicht erneut nachfragen" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "&Diese Meldung nicht wieder anzeigen" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Runter" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Download" @@ -623,11 +635,11 @@ msgstr "&Download" msgid "&Edit" msgstr "&Bearbeiten" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr ".git/config &bearbeiten" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "ALLE &bearbeiten" @@ -635,7 +647,7 @@ msgstr "ALLE &bearbeiten" msgid "&Edit Filter" msgstr "Filter &bearbeiten" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "Konflikt b&earbeiten" @@ -660,10 +672,10 @@ msgid "&Enable edit" msgstr "B&earbeiten aktivieren" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "&Beenden" +msgid "&Exit\tCtrl+W" +msgstr "&Beenden\tStrg+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportiere Auswahl in..." @@ -675,27 +687,27 @@ msgstr "&Extern" msgid "&File" msgstr "&Datei" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Suchen" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Suchen\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "Bilder in &Fenster einpassen" +msgid "&Fit images in window\tF" +msgstr "Bilder in &Fenster einpassen\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Lokale Laufwerke" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Fließend" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "Umbenennungen &folgen" @@ -707,7 +719,7 @@ msgstr "&Schrift für Logmeldungen:" msgid "&Font:" msgstr "&Schriftart:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "Er&zwingen" @@ -727,7 +739,7 @@ msgstr "&Git ähnliches Eintragen (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Gehe zu\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "&Graue nicht-relevante geänderte Pfade aus" @@ -739,7 +751,7 @@ msgstr "&Grün:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Hilfe" @@ -747,7 +759,7 @@ msgstr "&Hilfe" msgid "&Help Topics" msgstr "&Hilfe" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Verbergen" @@ -755,11 +767,11 @@ msgstr "&Verbergen" msgid "&Icon Set:" msgstr "&Symbole" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorieren" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignoriere %d Objekte nach Name" @@ -773,14 +785,14 @@ msgid "&Image" msgstr "&Bild" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Bild&information" +msgid "&Image info\tI" +msgstr "Bild&information\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Nur Bild" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Import..." @@ -792,7 +804,7 @@ msgstr "&Initiales Verzeichnis:" msgid "&Initialize submodules (--init)" msgstr "&Initialisiere Submodule (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Installieren" @@ -804,11 +816,11 @@ msgstr "&Springe beim Laden zum ersten Unterschied" msgid "&Keep CR" msgstr "&Behalte CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "Aktuellen Status &beibehalten" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Beschriftungen" @@ -836,7 +848,7 @@ msgstr "&Limit:" msgid "&Line number" msgstr "&Zeilennummer" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Zeilennummer (%d - %d)" @@ -853,7 +865,7 @@ msgstr "&Listenansicht" msgid "&Local Branch:" msgstr "&Lokaler Zweig" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Lokale Zweige" @@ -877,11 +889,11 @@ msgstr "&Menüanimationen:" msgid "&Menu contents:" msgstr "&Menüinhalte:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Zusammenführen" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Zusammenführen..." @@ -937,6 +949,10 @@ msgstr "&Nächste >" msgid "&Next Page" msgstr "&Nächste Seite" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Nein" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Kein Doppelklick-Ereignis" @@ -953,11 +969,11 @@ msgstr "&Keine" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Eine Seite" @@ -965,19 +981,15 @@ msgstr "&Eine Seite" msgid "&Onto" msgstr "&Auf" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "Ö&ffnen" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "Ö&ffne \"Git für Windows\" WebSite" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Öffnen..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "Ö&ffnen...\tCtrl+O" @@ -990,18 +1002,18 @@ msgid "&Overlay Icon:" msgstr "&Overlay Icon:" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "Bilder &überlagern" +msgid "&Overlay images\tO" +msgstr "Bilder &überlagern\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Passwort:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "E&infügen" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Nimm ALLE" @@ -1009,7 +1021,7 @@ msgstr "&Nimm ALLE" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Druckvorschau" @@ -1017,11 +1029,15 @@ msgstr "&Druckvorschau" msgid "&Print..." msgstr "&Drucken..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Drucken...\tStrg+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Fortfahren" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Anfordern" @@ -1029,10 +1045,14 @@ msgstr "&Anfordern" msgid "&Push all branches" msgstr "Alle Zweige &versenden" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "E&rneut eintragen" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "&Neu aufbauen" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Letzte-Meldungen" @@ -1045,7 +1065,7 @@ msgstr "&Rekursiv" msgid "&Red:" msgstr "&Rot:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Wiederholen" @@ -1061,7 +1081,7 @@ msgstr "&Aktualisieren" msgid "&Regular Expression" msgstr "&Regulärer Ausdruck" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Später erinnern" @@ -1069,7 +1089,7 @@ msgstr "&Später erinnern" msgid "&Remote Branch:" msgstr "&Entfernter Zweig:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "&Entfernte Zweige" @@ -1077,7 +1097,7 @@ msgstr "&Entfernte Zweige" msgid "&Remote:" msgstr "A&rchiv:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "Ent&fernen" @@ -1089,7 +1109,7 @@ msgstr "&Lösche diese Datei aus dem Index" msgid "&Replace" msgstr "E&rsetzen" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "P&rojektarchiv" @@ -1097,7 +1117,7 @@ msgstr "P&rojektarchiv" msgid "&Reset" msgstr "&Reset" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Werkzeugleiste rücksetzen" @@ -1113,23 +1133,27 @@ msgstr "&Meine Verwendungsdaten zurücksetzen" msgid "&Reset to Default" msgstr "&Auf Standardwerte setzen" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "Konflikt aufgelöst" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Wiederherstellen" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "Alten Status &wiederherstellen" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "Wieder&holen" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "Änderungen dieser Eintragung &Rückgängig machen" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "Änderungen dieser Eintragungen &Rückgängig machen" @@ -1141,7 +1165,7 @@ msgstr "&SSH Client:" msgid "&Saturation:" msgstr "&Sättigung:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Speichern" @@ -1149,15 +1173,19 @@ msgstr "&Speichern" msgid "&Save authentication" msgstr "Anmeldedaten &speichern" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Speichere Grafik unter..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Speichere Liste der gewählten Dateien in..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Speichern\tStrg+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Setze Git Pfad" @@ -1165,7 +1193,7 @@ msgstr "&Setze Git Pfad" msgid "&Set upstream/track remote branch" msgstr "&Setze Upstream/Entfernten Zweig verfolgen" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Einstellungen" @@ -1185,7 +1213,7 @@ msgstr "&Textmarken zeigen" msgid "&Signing key ID:" msgstr "GPG &Schlüssel-ID:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "Ü&berspringen" @@ -1193,7 +1221,7 @@ msgstr "Ü&berspringen" msgid "&Squash" msgstr "&Zusammenfassen" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "ALLE &Zusammenfassen" @@ -1205,7 +1233,7 @@ msgstr "&Start" msgid "&Start Group" msgstr "&Startgruppe" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Stash" @@ -1225,7 +1253,7 @@ msgstr "&Symbolansicht" msgid "&Tab size:" msgstr "&Tab Größe:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Dokument mit Karteireitern" @@ -1233,7 +1261,7 @@ msgstr "&Dokument mit Karteireitern" msgid "&Tag" msgstr "&Markierung" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Markierungen" @@ -1269,7 +1297,7 @@ msgstr "&Symbolleisten und dockende Fenster" msgid "&Toolbars:" msgstr "&Werkzeugleisten" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1281,7 +1309,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "Wie&derholen" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Zwei Seiten" @@ -1289,15 +1321,15 @@ msgstr "&Zwei Seiten" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Rückgängig" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Standard-Diff" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Standard-Diff" @@ -1309,7 +1341,7 @@ msgstr "&Unbekannte Laufwerke" msgid "&Up" msgstr "&Hoch" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Aktualisiere Objekt zu Revision" @@ -1321,11 +1353,11 @@ msgstr "&Upstream:" msgid "&Use auto-completion of file paths and keywords" msgstr "Dateinamen und Schlüsselwörter automatisch &vervollständigen" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Benutzername:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Ansicht" @@ -1333,7 +1365,7 @@ msgstr "&Ansicht" msgid "&View:" msgstr "&Ansicht:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "Warne bei fehlender Abzeichnung (Signed-Off-By) bei Eintragung" @@ -1349,6 +1381,10 @@ msgstr "Ganzes &Wort" msgid "&Within file" msgstr "&Innerhalb der Datei" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "&Ja" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Ignoriere Änderungen in der Anzahl von Leerzeichen" @@ -1357,46 +1393,46 @@ msgstr "&Ignoriere Änderungen in der Anzahl von Leerzeichen" msgid "&known changes" msgstr "&bekannte Änderungen" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit Standard)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(von %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(keine Änderungsliste)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(keine Zeilennummer)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(Kein Wert)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nicht gefunden)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(unbekannt)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- alle -" @@ -1404,13 +1440,14 @@ msgstr "- alle -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1418,7 +1455,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config im Projektwurzelverzeichnis" @@ -1434,7 +1471,7 @@ msgstr ".gitignore in den jeweiligen Verzeichnissen der Objekte" msgid ".gitignore in the repository root" msgstr ".gitignore im Projektarchiv Wurzelverzeichnis" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig im Projektwurzelverzeichnis" @@ -1450,31 +1487,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1483,66 +1520,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit ist eine Shell Erweiterung.\nDas bedeutet, dass es in den Windows Explorer integriert ist. Um\nTortoiseGit zu verwenden, öffnen Sie den Explorer und machen\nSie einen Rechts-Klick, damit das Kontextmenü angezeigt wird.\nDort finden Sie sämtliche TortoiseGit Befehle.\nUnd lesen Sie das Handbuch!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Warnung: Es wurde nicht überprüft, ob der Zweig bereits in den HEAD integriert wurde." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Warnung: Diese Aktion wird Zweige im entfernte Archiv löschen." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Warnung: Dieser Zweig wurde bisher nicht vollständig in HEAD integriert." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "Der aktuelle HEAD ist losgelöst, Sie arbeiten gerade auf keinem Zweig.\nMöchten Sie einen Zweig anlegen?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Möchten Sie wirklich den gesamten Stash löschen?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Stash anwenden fehlgeschlagen!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Stash POP fehlgeschlagen!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Stash fehlgeschlagen!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "Das rebase-apply Verzeichnis existiert noch (ein Umsetzen bzw. Patch anwenden ist noch aktiv).\n\nWie möchten Sie verfahren?" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Stash anwenden fehlgeschlagen, es gibt Konflikte." -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Stash POP fehlgeschlagen, es gibt Konflikte." -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Stash anwenden erfolgreich." -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Stash POP erfolgreich." -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Stash erfolgreich." @@ -1550,7 +1587,7 @@ msgstr "Stash erfolgreich." msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1562,71 +1599,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Es existiert bereits ein Zweig mit dem Namen, den Sie für die Markierung eingegeben haben (damit ist die Kurz-Referenz nicht eindeutig).\nDies kann Probleme hervorrufen, daher sollten Sie dies vermeiden." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Es existiert bereits ein Zweig mit diesem Namen." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Ein Zusammenführungsprozess ist gerade aktiv, somit wird dies eine Zusammenführungseintragung. Um eine Zusammenführung abzubrechen, müssen Sie einen Reset oder einen (erzwungenen) Zweigwechsel durchführen." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Eine neue Version ist verfügbar. Bitte laden Sie die aktuelle Version herunter!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Eine durch Zeilenumbrüche getrennte Liste von Pfaden, für die überlagerte Symbole angezeigt werden.\r\nWenn Sie ein '*' Zeichen an einen Pfad anhängen, werden alle Dateien und Ordner innerhalb des Pfades eingeschlossen." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Eine durch Zeilenumbrüche getrennte Liste von Pfaden, für die kein Kontextmenü angezeigt wird.\r\nWenn Sie ein '*' Zeichen an einen Pfad anhängen, werden alle Dateien und Ordner innerhalb des Pfades ausgeschlossen." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Eine durch Zeilenumbrüche getrennte Liste von Pfaden, für die keine überlagerten Symbole angezeigt werden.\r\nWenn Sie ein '*' Zeichen an einen Pfad anhängen, werden alle Dateien und Ordner innerhalb des Pfades ausgeschlossen." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Eine benötigte Ressource war nicht verfügbar." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Es existiert bereits eine Markierung mit dem Namen, den Sie für den Zweig eingegeben haben (damit ist die Kurz-Referenz nicht eindeutig).\nDies kann Probleme hervorrufen, daher sollten Sie dies vermeiden." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Es existiert bereits eine Markierung mit diesem Namen." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Ein Anzeigeprogramm für Standard-Diffdateien (Patchdateien).\nFalls Sie keines haben wählen Sie einen normalen Texteditor\n(z.B. Notepad.exe)." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "A&bbrechen" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "Ü&ber" @@ -1642,11 +1679,11 @@ msgstr "Kürze Umbenennungen ab" msgid "Abbreviated size" msgstr "Gekürzte Größe" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Abbrechen" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "&Zusammenführen abbrechen" @@ -1654,11 +1691,11 @@ msgstr "&Zusammenführen abbrechen" msgid "Abort Merge" msgstr "Zusammenführen abbrechen" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Bricht das Zusammenführen ab." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Über" @@ -1678,12 +1715,12 @@ msgstr "Über TortoiseGitMerge" msgid "Accept certificate" msgstr "Zertifikat akzeptieren" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Zugriff auf %1 wurde verweigert." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Aktion" @@ -1691,26 +1728,26 @@ msgstr "Aktion" msgid "Action log" msgstr "Aktionslog" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Aktionen" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Aktiviere die Task-Liste" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktive Dateien" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX Objekte können während Windows beendet wird nicht gespeichert werden!\nAlle Änderungen an %1 verwerfen?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Hinzufügen" @@ -1718,7 +1755,7 @@ msgstr "Hinzufügen" msgid "Add &Signed-off-by" msgstr "Ab&zeichnen" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Füge '%s' zu Wörterbuch hinzu" @@ -1731,15 +1768,15 @@ msgstr "Archiv hinzufügen" msgid "Add \"&Signed-off-by\"" msgstr "\"&Signed-off-by\" hinzufügen" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "Weitere Eintragung hinzufügen?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Vergleichsprogramm für bestimmte Dateitypen hinzufügen" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Konflikteditor für bestimmte Dateitypen hinzufügen" @@ -1747,15 +1784,15 @@ msgstr "Konflikteditor für bestimmte Dateitypen hinzufügen" msgid "Add new files automatically to Git" msgstr "Neue Dateien automatisch in Git hinzufügen" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "&Ignorieren" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Zur Schnellzugriffsleiste hinzufügen" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Hinzufügen..." @@ -1763,11 +1800,11 @@ msgstr "Hinzufügen..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Diff/Merge Programm für Dateityp bearbeiten/hinzufügen" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Hinzugefügt" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1775,25 +1812,25 @@ msgid "" "to the ignore list." msgstr "Die Einträge\n%s\nwurden zur 'Ignorieren' Liste hinzugefügt." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Füge hinzu" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Fügt Datei(en) zur Versionskontrolle hinzu" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Fügt die gewählten Dateien oder Dateimasken zur 'Ignorieren' Liste hinzu" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Einstellungen\nEinstellungen" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Erweitert" @@ -1801,43 +1838,43 @@ msgstr "Erweitert" msgid "Advanced Diff/Merge Settings" msgstr "Erweiterte Diff/Merge Einstellungen" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Alternative Vergleichsprogramme" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Alternative Konflikteditoren" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Alle" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Alle Befehle" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Alle Dateien (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Alle Dateien (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Alle Eltern" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Alle lokalen Zweige" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Alle Referenzen" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Alle Markierungen" @@ -1845,47 +1882,47 @@ msgstr "Alle Markierungen" msgid "All tags only" msgstr "Nur alle Markierungen" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Alle Ihre Änderungen werden verworfen! Wollen Sie wirklich alle Werkzeugleisten und Menüs zurücksetzen?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Alle Ihre Änderungen werden verworfen! Wollen Sie wirklich die Tastaturzuweisungen zurücksetzen?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Alle Ihre Änderungen werden verworfen! Wollen Sie wirklich das Menü %s zurücksetzen?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Alle Ihre Änderungen werden verworfen! Wollen Sie wirklich die Werkzeugleiste %s zurücksetzen?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Bearbeiten für diese Ansicht zulassen\nBearbeiten zulassen" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Benutze benutzerdefinierte Gravatar URL" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "Erlaubt das Erstellen einer leeren Eintragung, die nur aus eine Eintragungsmeldung und keinen Dateien besteht (siehe auch git commit --allow-empty)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Bereits auf dem neusten Stand." @@ -1901,11 +1938,11 @@ msgstr "Versende immer zum ausgewählten entfernten Zweig für diesen lokalen Zw msgid "Always show long format" msgstr "Benutze immer das Langformat" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Stets die Systemeinstellungen für Uhrzeit und Datum verwenden" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Anhängen" @@ -1913,12 +1950,12 @@ msgstr "Anhängen" msgid "Amend &Last Commit" msgstr "An letzte Eintragung anhängen" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Alternativer Editor, der möglichst auch *nix Zeilenenden unterstützen sollte." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1929,7 +1966,7 @@ msgid "" "%mine: the modified file" msgstr "Ein externes Programm zum Vergleichen\nverschiedener Revisionen von Dateien\n\nSie können folgende Parameter für das Programm angeben:\n%base : Die Ausgangsdatei\n%mine : Die modifizierte Datei" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1942,34 +1979,34 @@ msgid "" "%base: the original file without your changes" msgstr "Ein externes Programm zum Bearbeiten\nvon Konflikten zwischen Dateien\n\nSie können folgende Parameter für das Programm angeben:\n%base : Die Originaldatei ohne Ihre Änderungen\n%mine : Die Datei aus der Arbeitsbaum mit Ihren eigenen Änderungen\n%theirs : Die Datei mit den Änderungen aus dem Projektarchiv\n%merged : Die Ergebnisdatei mit den zusammengeführten Änderungen" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Ein ungültiges Datei-Handle wurde mit %1 verbunden." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Es ist ein unbekannter Fehler aufgetreten" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Ein unbekannter Fehler ist beim Zugriff auf %1 aufgetreten." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Ein unbekannter Zeilentyp wurde in Zeile %d gefunden!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Kommentierte Markierungen" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Rechten Block anfügen" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Diesen Block links anfügen" @@ -1981,11 +2018,11 @@ msgstr "Application Frame Menus: " msgid "Apply &Patch..." msgstr "&Patch anwenden..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Patch-Reihe anwenden..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "&Patch anwenden..." @@ -1993,7 +2030,7 @@ msgstr "&Patch anwenden..." msgid "Apply Patches" msgstr "&Patches anwenden..." -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Patch-Reihe aus einer Mail-Datei anwenden" @@ -2001,7 +2038,7 @@ msgstr "Patch-Reihe aus einer Mail-Datei anwenden" msgid "Apply unified diff" msgstr "Standard-Diff anwenden" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Aqua Stil" @@ -2009,39 +2046,39 @@ msgstr "Aqua Stil" msgid "Arabic" msgstr "Arabisch" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "Beliebige &URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Sind Sie sicher, dass Sie die Spalten zurücksetzen möchten?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Sind Sie sicher, dass Sie das neu Aufbauen abbrechen möchten?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Sind Sie sicher, dass Sie den Konflikt aufgelöst haben?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Sind Sie sicher dass Sie die Änderungen an %d Objekten rückgängig machen wollen?\nSie werden alle Änderungen seit der letzten Aktualisierung verlieren!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Sind Sie sicher, dass Sie nach \"%s\" speichern möchten?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "&Vertikal ausrichten" +msgid "Arrange &vertical\tV" +msgstr "&Vertikal ausrichten\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Der Änderungsliste '%s' zugewiesen" @@ -2050,11 +2087,11 @@ msgstr "Der Änderungsliste '%s' zugewiesen" msgid "Assigned to:" msgstr "Zugewiesen an:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Setze \"assume unchanged\"" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Assume valid/unchanged" @@ -2066,34 +2103,34 @@ msgstr "Assume valid/unchanged (\"Needs-lock\" in TortoiseSVN)" msgid "At file &creation" msgstr "Bei Datei&erstellung" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "Bei Dateierstellung" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "In Revision: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Im Moment können nur Zweige umbenannt werden." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Es wurde versucht, eine nicht unterstützte Operation durchzuführen." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Es wurde versucht, über das Ende von %1 hinaus zuzugreifen." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Es wurde versucht, vom schreibenden %1 zu lesen." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Es wurde versucht, auf den lesenden %1 zu schreiben." @@ -2110,11 +2147,11 @@ msgstr "Anmeldung" msgid "Authentication data" msgstr "Anmeldedaten" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Autor E-Mail" @@ -2122,7 +2159,7 @@ msgstr "Autor E-Mail" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Küng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autoren" @@ -2144,11 +2181,11 @@ msgstr "Auto CrLf Konvertierung" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Automatisch verbergen" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Alle automatisch verbergen" @@ -2156,23 +2193,23 @@ msgstr "Alle automatisch verbergen" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Falls keine Konflikte" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Falls keine Fehler" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Autom. schließen, wenn keine weiteren Optionen angeboten werden" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Falls kein Löschen, Hinzufügen oder Zusammenführen" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2186,7 +2223,7 @@ msgstr "Putty-&Key automatisch laden" msgid "Autoload Putty &Key" msgstr "Putty-&Key automatisch laden" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatisch" @@ -2206,7 +2243,7 @@ msgstr "Durchschnitt" msgid "B&rowse..." msgstr "S&uchen..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Zurück" @@ -2218,7 +2255,7 @@ msgstr "Hintergrund" msgid "Baltic" msgstr "Baltisch" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Balkendiagramm" @@ -2238,7 +2275,7 @@ msgstr "Basis Datei:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Basiert auf TortoiseIDiff von TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Allgemeine Informationen" @@ -2250,45 +2287,45 @@ msgstr "Zwischen den Dateien:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditionell)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bisect Schlecht" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bisect Gut" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Bisect Reset" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Bisect Start" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\nein Bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Schwarzer Stil" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Annotieren" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Annotation Fehler" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "&Vorherige Revision annotieren" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Zeigt, welcher Autor eine Zeile zuletzt geändert hat." @@ -2296,26 +2333,30 @@ msgstr "Zeigt, welcher Autor eine Zeile zuletzt geändert hat." msgid "Blend alpha" msgstr "Differenz/Überblenden" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "Blöcke" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Blauer Stil" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Hauptmeldung" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Die beiden Parameter /logmsg und /logmsgfile\ndürfen nicht gleichzeitig angegeben werden!" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Sowohl der Pfad zur Patchdatei als auch zum Ziel müssen absolute Pfade sein!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Untere Ansicht:" @@ -2327,30 +2368,30 @@ msgstr "Su&chen..." msgid "Branc&h:" msgstr "&Zweig:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Zweig" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Der Zweig %s ist hinter %s\n%s passt auf %s (fast-forward)" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Zweig (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Zweig Name" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Zweig/Markierungsname ist ungülig." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Zweig/Markierungsname darf nicht leer sein oder ist ungültig." @@ -2362,11 +2403,11 @@ msgstr "Zweig:" msgid "Bro&wse" msgstr "Suchen..." -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Referenzen durchsuchen" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Suche nach dem externen Vergleichsprogramm" @@ -2378,7 +2419,7 @@ msgstr "Referencen durchsuchen" msgid "Browse..." msgstr "Suchen..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" @@ -2390,7 +2431,7 @@ msgstr "Problem-ID &RegEx:" msgid "Bug-ID/Issue-Nr:" msgstr "Bug-ID/Problem-Nr:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-IDs" @@ -2406,7 +2447,7 @@ msgstr "Bugtraq Regex Tester - TortoiseGit" msgid "Button Appearance" msgstr "Aussehen der Schaltfläche" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2422,7 +2463,7 @@ msgstr "&Jetzt prüfen" msgid "C&ommands:" msgstr "B&efehle:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "E&rstelle Zweig/Marke von Revision" @@ -2430,11 +2471,11 @@ msgstr "E&rstelle Zweig/Marke von Revision" msgid "C&urrent Keys:" msgstr "Akt&uelle Tasten:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "A&usschneiden" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2450,11 +2491,11 @@ msgstr "Berechnen" msgid "Can double-click in log list to compare with previous revision" msgstr "Doppelklick in Logliste, um mit vorheriger Revision zu vergleichen" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Kann ein statisches ActiveX Objekt nicht aktivieren." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2463,80 +2504,80 @@ msgid "" "%s" msgstr "Kann \n%s\nnicht nach\n%s\n kopieren!" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Kann das Bild nicht in die Zwischenablage kopieren!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Kann kein neues Bild anlegen!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Kann die Menüs nicht anpassen" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Kann das Bild aus der Zwischenablage nicht einfügen!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Abbrechen" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Abbrechen\nTortoiseGitMerge nicht verlassen." -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Abbrechen\nDie Ansichten nicht wechseln." -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Abbrechen\nDie leere Datei behalten." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Abbrechen\nZuerst die Konflikte auflösen." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Abbrechen\nDie aktuellen Dateien beibehalten" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Abbrechen\nDie aktuellen Einstellungen beibehalten" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Kann Eintragungen nicht zusammenfassen.\nStellen Sie sicher, dass Sie im Log den aktuellen Zweig ohne Filter betrachten." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Der aktuelle Zweig kann nicht aktualisiert werden. Benutzen Sie stattdessen den \"reset\" -Befehl." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Annotation kann nicht angezeigt werden. \"%s\" ist nicht unter der Versionskontrolle von Git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Kann die Unterschiede aufgrund inkonsistenter Zeilenumbrüche in der Datei nicht anzeigen." @@ -2548,7 +2589,7 @@ msgstr "Überla&ppend" msgid "Cascaded context menu" msgstr "TortoiseGit Kontextmenü" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Groß- und Kleinschreibung beachten" @@ -2572,33 +2613,33 @@ msgstr "Zertifikat-Überprüfung fehlgeschlagen!" msgid "Change log" msgstr "Änderungen" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Nord Europäisch" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Ändert die Druck-Optionen\nSeite einrichten" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Aussehen der Anwendung ändern\nStil ändern" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Fensterposition ändern" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Fenstergröße ändern" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Änderungstyp" @@ -2606,38 +2647,38 @@ msgstr "Änderungstyp" msgid "Changed Files" msgstr "Geänderte Dateien" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Geänderte Dateien zwischen %s und %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Geänderte Dateien zwischen %s, %s und %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Geänderte Dateien: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Modifizierte Zeilen inklusive neue/gelöschte Dateien" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Modifizierte Zeilen inklusive neue/gelöschte Dateien nach Datum" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Modifizierte Zeilen exklusive neue/gelöschte Dateien" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Modifizierte Zeilen exklusive neue/gelöschte Dateien nach Datum" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Änderungsliste %s verschoben" @@ -2646,7 +2687,7 @@ msgstr "Änderungsliste %s verschoben" msgid "Changes made (double-click on file for diff):" msgstr "Änderungen (Doppelklick auf die Datei für Unterschiede):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Ändert das Aussehen der Anwendung" @@ -2654,7 +2695,7 @@ msgstr "Ändert das Aussehen der Anwendung" msgid "Char position where to show a border line in commit text boxes:" msgstr "Zeichenposition an der ein Rand in den Eingabedialogen angezeigt wird:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Wählen" @@ -2666,31 +2707,31 @@ msgstr "Auf Aktualisierungen prüfen - TortoiseGit" msgid "Check For Updates..." msgstr "Auf Aktualisierungen prüfen..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "&Prüfe auf Änderungen" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Überprüfen Sie den eingegebenen Pfad und/oder die URL." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Wählen Sie die Einträge, die im Windows Kontextmenü anstelle des TortoiseGit Untermenüs erscheinen sollen." -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Wählen Sie die Menüeinträge, die nur im erweiteren Kontextmenü (SHIFT+Linksklick) erscheinen sollen" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Mit dieser Option wird ein relatives Datum-/Zeitformat in den Logmeldungen angezeigt." -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Mit dieser Option wird ein kürzeres Datum-/Zeitformat in den Logmeldungen angezeigt." @@ -2698,31 +2739,31 @@ msgstr "Mit dieser Option wird ein kürzeres Datum-/Zeitformat in den Logmeldung msgid "Check:" msgstr "Wählen:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Auschecken" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "Auschecken mit Zusammenführen" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Pflücken" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Pflücken fehlgeschlagen" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Ausgewählte Eintragungen pflücken..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Ausgewählte Eintragung pflücken..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Pflücken fehlgeschlagen! Möchten Sie diese Eintragung auslassen?" @@ -2730,11 +2771,11 @@ msgstr "Pflücken fehlgeschlagen! Möchten Sie diese Eintragung auslassen?" msgid "Chinese" msgstr "Chinesisch" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Projektarchiv wählen" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Umgekehrt chronologisch (git Standard)" @@ -2746,78 +2787,78 @@ msgstr "Sauber" msgid "Clean Type" msgstr "Aufräummethode" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Säubere ohne Papierkorb" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Säubere mit Papierkorb" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Ungültige entfernte Zweige aufräumen" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Aufräumen" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Beim Aufräumen." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Die folgenden Pfade konnten nicht aufgeräumt werden:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Die folgenden Pfade wurden erfolgreich aufgeräumt:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Löschen" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Löschwerkzeug\nLöschen" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Löscht %ld gespeicherte URLs von %ld Arbeitsbäumen" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Löscht %ld gespeicherte Logmeldungen von %ld Arbeitsbäumen" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Löscht %ld Name/Passwort Paare, %ld SSL Zertifikate und %ld Benutzernamen" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Löscht gespeicherte Logmeldungen von %ld Projektarchiven" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Löscht die gespeicherte Anmeldeinformation für alle Projektarchive.\r\nSie müssen Ihre Name/Passwort Kombination jeweils neu eingeben." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Löscht die gespeicherten Größen und Positionen von %ld Dialogen" @@ -2826,7 +2867,7 @@ msgstr "Löscht die gespeicherten Größen und Positionen von %ld Dialogen" msgid "Click here to go to the website" msgstr "Klicken Sie hier, um zur Webseite zu gelangen" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Klicken Sie hier, um eine der zuletzt eingegebenen Logmeldungen zu wählen" @@ -2842,17 +2883,17 @@ msgid "" "extension" msgstr "Alternative Konflikteditoren für Dateitypen festlegen" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Klicken Sie, um Befehle zum Verschieben von Textblöcken zu sehen\nTextblöcke verwenden" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Zwischenablage" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Klonen" @@ -2860,7 +2901,7 @@ msgstr "Klonen" msgid "Clone Existing Repository" msgstr "Bestehendes Projektarchiv klonen" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Projektarchiv klonen" @@ -2868,49 +2909,49 @@ msgstr "Projektarchiv klonen" msgid "Clone into Bare Repo" msgstr "In Bare-Projektarchiv klonen" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Klonen..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Schließen" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Vollbild schließen" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Druckvorschau schließen\n&Schließen" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Manuell" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Schließt die Druckvorschau\nDruckvorschau schließen" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Schließt das aktive Dokument\nSchließen" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Schließt das aktive Fenster und fragt nach, ob die Daten gespeichert werden sollen" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Einklappen" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2936,7 +2977,7 @@ msgstr "Farben:" msgid "Combine One Mail" msgstr "In einer E-Mail zusammenfassen" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Zu einer Eintragung zusammenfassen" @@ -2944,11 +2985,11 @@ msgstr "Zu einer Eintragung zusammenfassen" msgid "Comman&ds:" msgstr "Be&fehle:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Befehl" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Befehlszeile" @@ -2956,7 +2997,7 @@ msgstr "Befehlszeile" msgid "Command Line To Execute:" msgstr "Befehlszeile:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Befehl konnte nicht ausgeführt werden." @@ -2964,41 +3005,41 @@ msgstr "Befehl konnte nicht ausgeführt werden." msgid "Commands" msgstr "Befehle" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Eintragen" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "Eintragung %s ist im Moment NICHT sichtbar," -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Eintragung %s in \"%s\" nicht gefunden. Submodul jetzt aktualisieren?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Eintragedatum" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Eintrager-E-Mail" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Fertig eintragen" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Eintragungsinformation" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Logmeldung" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Eintragername" @@ -3006,7 +3047,7 @@ msgstr "Eintragername" msgid "Commit Ordering:" msgstr "Revisionsreihenfolge:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Eintragung im übergeordneten Projekt vornehmen" @@ -3014,19 +3055,19 @@ msgstr "Eintragung im übergeordneten Projekt vornehmen" msgid "Commit to:" msgstr "Eintragen in:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Eintragen..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Eintragungen pro Autor" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Eintragungen nach Datum" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Trägt jedes %s ein" @@ -3035,15 +3076,15 @@ msgstr "Trägt jedes %s ein" msgid "Commits each week:" msgstr "Eintragungen pro Woche:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Trägt Ihre Änderungen in das Projektarchiv ein" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Eintrager E-Mail" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3055,52 +3096,52 @@ msgstr "Beim Eintragen eines unversionierten Ordners werden dessen Unterobjekte msgid "Common Name:" msgstr "Üblicher Name" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "&HEAD Revisionen vergleichen" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Ausgewählte Referenzen vergleichen" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Vergleiche zwei Dateien" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Vergleiche Leerzeichen" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Vergleiche mit &Arbeitsbaum" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Vergleiche mit B&asis" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Vergleiche mit vorheriger Revision" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Beachtet alle Änderungen an Leerzeichen\nVergleiche Leerzeichen" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Vergleicht die Datei mit der letzten übertragenen Revision, um Ihre Änderungen sichtbar zu machen" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Vergleiche %s mit %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Fertig" @@ -3116,7 +3157,7 @@ msgstr "Konfigurationsquelle" msgid "Config type:" msgstr "Konfiguration:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "RegEx-Filter einrichten" @@ -3150,11 +3191,11 @@ msgstr "Anzeigen von Standard-Diffdateien" msgid "Confirm to kill running git process" msgstr "Bestätigung vor Tötung eines laufenden Git-Prozesses einholen" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Konflikt" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Konfliktdateien" @@ -3162,15 +3203,15 @@ msgstr "Konfliktdateien" msgid "Conflict resolved" msgstr "Konflikt aufgelöst" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Konflikt" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Konflikte" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konflikte: %d" @@ -3183,98 +3224,98 @@ msgstr "Kontextmenüs:" msgid "Context lines for patches" msgstr "Kontext-Zeilen für Patches" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Fortsetzen" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Angedocktes Fenster kontrahieren" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Konvertiere Leerschritte zu Tabulatoren" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Konvertiere Tabulatoren zu Leerschritten" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Kopieren" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Kopiert" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopieren" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Kopiere %s nach %s, Revision %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Kopiere SHA-1 in die Zwischenablage" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Kopierwerkzeug\nKopieren" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Kopiere alle Informationen in die Zwischenablage" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopieren und umbenennen" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Meldungen in Zwischenablage kopieren" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Kopiere Meldung in Zwischenablage" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Kopiere Pfade in die Zwischenablage" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Kopiere Ref-Namen" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "In Zwischenablage &kopieren" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copy the selection and put it on the Clipboard\nCopy" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "In Zwischenablage kopieren" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopieren: Neuer Name für %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Kopiere %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopiere..." @@ -3282,25 +3323,25 @@ msgstr "Kopiere..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Korrekturen" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Konnte %s nicht zur 'Ignorieren' Liste hinzufügen!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Suche nach einer neuen Version fehlgeschlagen!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "Suche nach einer neuen Version fehlgeschlagen! %s (Fehlercode: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3308,76 +3349,76 @@ msgid "" "%s" msgstr "Konnte Dateien nicht kopieren!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Konnte %1 nicht erstellen, weil der Ordner voll ist." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Konnte die letzte eingetragene Revision nicht ermitteln!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Konnte übergeordnetes Projekt nicht finden" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Konnte den Status nicht ermitteln!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Konnte %1 nicht öffnen, weil zu viele Dateien geöffnet sind." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Konnte die Datei\n%s\nnicht öffnen." -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Konnte %1 konnte nicht entfernen, da es der aktuelle Ordner ist." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Konnte %s nicht aus der 'Ignorieren' Liste entfernen!" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Konnte nicht auf erste Eintragung zurücksetzen (erster Schritt). Abbruch..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Konnte nicht auf letzte Eintragung zurücksetzen (zweiter Schritt). Abbruch..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Konnte nicht zu original HEAD zurücksetzen." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Konnte die URL der Datei nicht finden!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Konnte die Revision %s der Datei %s nicht laden.\nPatchen ist nicht möglich!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Konnte TortoiseGitBlame nicht starten" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3385,7 +3426,7 @@ msgid "" "%s" msgstr "Konnte den GNU-Diff Betrachter nicht starten!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3393,7 +3434,7 @@ msgid "" "%s" msgstr "Konnte das externe Vergleichsprogramm nicht starten!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3401,11 +3442,11 @@ msgid "" "%s" msgstr "Konnte den externen Konflikteditor nicht starten!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Konnte Druckauftrag nicht starten." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3413,11 +3454,11 @@ msgid "" "%s" msgstr "Konnte den Text-Betrachter nicht starten!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Konnte den Putty Agent (pageant) nicht starten." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Thread konnte nicht gestartet werden!" @@ -3425,7 +3466,7 @@ msgstr "Thread konnte nicht gestartet werden!" msgid "Coun&t" msgstr "&Zählen" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Anzahl: %u Treffer." @@ -3438,15 +3479,15 @@ msgstr "&Bibliothek erstellen" msgid "Create .gitignore file" msgstr "Erstelle .gitignore-Datei" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Erzeuge Zweig" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Neuen Zweig dieser Revision erstellen" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Erzeuge Zweig..." @@ -3458,29 +3499,29 @@ msgstr "Erzeuge Änderungsliste" msgid "Create New Branch" msgstr "Erzeuge neuen Zweig" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Patch-Reihe erzeugen" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Erzeuge Markierung" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Markierung dieser Revision erstellen..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Markierung erstellen..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Erzeugt ein neues Dokument\nNeu" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3489,49 +3530,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Erstellt einen abgespeckten Klon mit beschränkter Historie (durch die angegebene Anzahl von Historie-Einträgen). Ein solcher Klon hat eine Reihe von Limitationen (Sie können nicht davon Klonen, Aktualisieren oder Versenden), aber es ist hinreichend falls das einzige Interesse an der neusten Historie besteht und man nur Patches einsenden möchte." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Patchdatei erstellen" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Erstelle Anforderungs-Anf&rage" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "&Projektarchiv hier erstellen..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Erstellt" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Erstellt einen Zweig oder eine Markierung" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Erstellt einen Bibliotheksordner mit speziellen Einstellungen für Git Arbeitsbäume" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Erzeugt eine Patchdatei aus den Unterschieden der beiden Dateien\nPatchdatei erzeugen" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Erstellt ein Projektarchiv im gewählten Ordner" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Erzeugt eine Standard-Diffdatei mit all Ihren Änderungen" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Erstelle Anforderungdsanfrage..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Der \"Credential helper\" darf nicht leer sein." @@ -3543,7 +3584,7 @@ msgstr "Credential helper:" msgid "Credentials" msgstr "Anmeldeinformationen" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "A&usschneiden" @@ -3551,7 +3592,7 @@ msgstr "A&usschneiden" msgid "Current" msgstr "Aktuell" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Aktueller Zweig" @@ -3559,7 +3600,7 @@ msgstr "Aktueller Zweig" msgid "Current Branch:" msgstr "Aktueller Zweig:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3571,7 +3612,7 @@ msgstr "Der aktuelle Zweig %s ist auf dem neusten Stand.\n\nWenn Sie dennoch neu msgid "Current version is:" msgstr "Aktuelle Version ist:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Aktuelle Version ist: %s" @@ -3584,7 +3625,7 @@ msgstr "An&passen..." msgid "Custom" msgstr "Angepasst" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Anpassen" @@ -3592,19 +3633,19 @@ msgstr "Anpassen" msgid "Customize Keyboard" msgstr "Tastatur anpassen" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Schnellzugriffsleiste anpassen" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Schnellzugriffsleiste anpassen..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Anpassen..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3618,88 +3659,92 @@ msgstr "Kryllisch" msgid "DCommit Type" msgstr "DCommit Typ" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Dämon" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Datum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Datum der letzten Eintragung" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Standard" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Standardmenü" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Standard Anwendungsmenü. Wird angezeigt, wenn keine Dokumente geöffnet sind." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "Standard Limit für Log-Meldungen:" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "UTF-8 Codierung als Vorgabe" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Löschen" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Lösche %d Zweige" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Lösche %d entfernte Zweige" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Lösche %d Markierungen" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Lösche &lokal" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Ref löschen..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Lösche alle Markierungen" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Lösche und &ignoriere %d Objekte nach Name" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Löschen und &ignorieren" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Lösche und ignoriere %d Objekte nach &Erweiterung" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Lösche Zweig" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Lösche Zweig/Markierung" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Lösche entfernten Zweig" @@ -3707,34 +3752,34 @@ msgstr "Lösche entfernten Zweig" msgid "Delete remote tag - TortoiseGit" msgstr "Entfernte Markierungen löschen - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Entfernte Markierungen auf \"%s\" löschen..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Entfernte Markierungen löschen..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Submodul entfernt" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Lösche Markierung" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Löschen Sie den existierenden Zweig oder benutzen Sie einen anderen Namen." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Löschen\nDie Datei wird entfernt." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Gelöscht" @@ -3742,36 +3787,36 @@ msgstr "Gelöscht" msgid "Deleted merge conflict" msgstr "Lösch-Konflikt" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Löscht die gewählten Dateien oder Dateimasken und fügt sie zur 'Ignorieren' Liste hinzu" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Löscht Dateien/Ordner aus der Versionskontrolle" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Entfernt Dateien/Ordner aus der Versionskontrolle ohne die Objekte zu löschen" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Löscht die Aktionslogdatei" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Lösche" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Lösche zwischengespeicherte Daten" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Lösche Datei" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Lösche entfernte Referenzen..." @@ -3791,7 +3836,7 @@ msgstr "Beschreiben" msgid "Describe Strategy" msgstr "Beschreibe Strategie" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Beschreibung" @@ -3799,7 +3844,7 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Änderungsliste abwählen" @@ -3807,33 +3852,33 @@ msgstr "Änderungsliste abwählen" msgid "Destination" msgstr "Ziel" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Ziel-Partition ist voll." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Verschobene Blöcke erkennen und hervorheben" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Erkenne verschobene und kopierte Zeilen aus existierenden Dateien einer beliebigen Eintragung" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Erkenne verschobene und kopierte Zeilen aus existierenden Dateien in der Eintragung in der, die Datei erstellt wurde" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Erkenne verschobene und kopierte Zeilen aus modifizierten Dateien der gleichen Eintragung" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Erkenne verschobene und kopierte Zeilen innerhalb einer Datei" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3847,11 +3892,15 @@ msgstr "Dialoggrößen und -positionen" msgid "Dialogs" msgstr "Dialoge" +#. Resource IDs: (156) +msgid "Diff" +msgstr "Vergleich" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Diff Optionen" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Zwei Eintragungen vergleichen" @@ -3883,7 +3932,7 @@ msgstr "Diffdatei:" msgid "Diff header" msgstr "Diff Kopfzeilen" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Später vergleichen" @@ -3895,12 +3944,12 @@ msgstr "Diff Position" msgid "Diff removed lines" msgstr "Diff entfernte Zeilen" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Vergleichen mit \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Vergleich mit Elternteil %d" @@ -3913,19 +3962,19 @@ msgstr "Unterschiede zwischen" msgid "Diffing" msgstr "Vergleiche" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Ermittle Unterschiede der Eintragungen" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Vergleicht die Datei des Arbeitsbaums mit der Version vor der letzter Eintragung" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Zwei EIntragungen vergleichen" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Verz..." @@ -3937,26 +3986,26 @@ msgstr "Verzeichnis:" msgid "Disable sounds" msgstr "Sounds deaktivieren" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Deaktivieren Sie diese Option, wenn Sie einen wirklich großen Arbeitsbaumn haben\r\nund die Festplatte beim Anzeigen von Arbeitsbaumn konstant beschäftigt ist." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Update-Überprüfungen ausschalten" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Deaktiviert" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disk voll beim Zugriff auf %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Verwerfe Ausnahme: %1" @@ -3965,44 +4014,52 @@ msgstr "Verwerfe Ausnahme: %1" msgid "Display &buttons in this order" msgstr "Zeige Schaltflächen in &dieser Reihenfolge" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Zeige ganze Seiten an\nDruckvorschau" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Zeigt Hilfe für Schaltflächen, Menüs und Fenster an\nHilfe" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Zeigt Hilfe für aktuelle Aufgabe oder Befehl an\nHilfe" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Zeigt Hilfe über die Hilfe an\nHilfe" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Zeigt Informationen übers Programm, Versionsnummer und Copyright an\nÜber" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "Zeige Titel und Körper der Eintragungsmeldungen" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "Zeige diese Warnung &nicht wieder (wenn Fortfahren gewählt wurde)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "Zeige diese Warnung &nicht wieder (wenn Ignorieren gewählt wurde)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "\"Fehlende\" Dateien nicht automatisch auswähnen (gelöscht, aber nicht im Index)" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Submodule nicht automatisch auswählen" @@ -4015,54 +4072,71 @@ msgstr "Für die folgenden Pfade kein Kontextmenü anzeigen:" msgid "Do not use recycle bin" msgstr "Benutze nicht den Papierkorb" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Sine Sie sicher, dass Sie %s löschen möchten?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Wollen Sie die Werkzeugleiste '%s' wirklich löschen?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "Sind Sie sicher, dass Sie die automatische Updateprüfung von TortoiseGit ausschalten möchten?\n\nAutomatische Updates können in den TortoiseGit Einstellungen unter Allgemein wieder aktiviert werden." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Möchten Sie wirklich bei der/den markierte(n) Datei(en) die assume-valid Markierung setzen?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Möchten Sie wirklich bei der/den markierte(n) Datei(en) die skip-worktree Markierung setzen?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Wollen Sie dieses Objekt wirklich verschieben?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Möchten Sie wirklich die %d ausgewählten Referencen permantent löschen? Dies kann NICHT rückgängig gemacht werden!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "Sind Sie sicher, dass Sie \"%s\" vom Index löschen möchten?" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Sind Sie sicher, dass Sie \"%s\" löschen möchten?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "Sind Sie sicher, dass Sie die %d markierten Dateien/Verzeichnnisse vom Index löschen möchten?" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "Sind Sie sicher, dass Sie die %d markierten Dateien/Verzeichnnisse löschen möchten?" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Möchten Sie die Kopie wirklich wiederherstellen? Sie werden alle Änderungen, die Sie nach dem Anlegen der Kopie vorgenommen haben, verlieren." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4070,7 +4144,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Wollen Sie wirklich alle Änderungen in\n%s\nrückgängig machen und zu dieser Revision zurückgehen? Die Vorgängerversionen werden rückwärts in Ihrem Arbeitsbaum zusammengeführt." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4078,21 +4152,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Wollen Sie wirklich alle Änderungen an\n%s,\ndie in dieser Revision durchgeführt wurden, rückgängig machen? Die Vorgängerversionen werden rückwärts in Ihrem Arbeitsbaum zusammengeführt." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "Möchten Sie die Markierung \"skip-worktree\" und \"assume-unchanged\" bei den markierten Dateien wirklich entfernen?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Möchten Sie die entfernten Zweige des gerade hinzugefügten Projektarchives aktualisieren?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Möchten Sie die geänderte Datei laden?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4100,21 +4174,21 @@ msgid "" "as resolved?" msgstr "Möchten Sie die Datei\n%s\nals aufgelöst markieren?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Wollen Sie die autmatisch gespeicherten Dokumente wieder herstellen?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Wollen Sie die Dokumente neu laden, damit die geänderten Einstellungen wirksam werden?\nHinweis: Sie werden alle Ihre Änderungen verlieren!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Möchten Sie die Änderungen betrachten?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Möchten Sie stash pop ausführen?" @@ -4122,28 +4196,28 @@ msgstr "Möchten Sie stash pop ausführen?" msgid "Document :" msgstr "Dokument: " -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Es ist unbekannt welche Eintragung versandt werden, da der Zweig \"%s\" unbekannt ist." -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Es ist unbekannt welche Eintragung versandt werden, da Sie eine URL eingegeben haben." -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Automatisch gespeicherte Dokumente nicht wieder herstellen.\nVerwende die letzte manuell gespeicherte Version der Dokumente." -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Nicht speichern\nDie Ansichten schließen, ohne die Änderungen zu speichern." -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4153,11 +4227,11 @@ msgstr "Nicht speichern\nDie Ansichten neu laden, ohne die Änderungen zu speich msgid "Don't show the selected items: (press shift key to show them)" msgstr "Zeige die gewählten Einträge nicht immer an (zum Anzeigen die Umschalttaste drücken)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Diese Meldung nicht wieder anzeigen" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Fertig" @@ -4169,7 +4243,7 @@ msgstr "Runter" msgid "Download" msgstr "Download" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Ziehen, um das Menü schweben zu lassen" @@ -4197,6 +4271,10 @@ msgstr "Dummy Button Form " msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "Nicht ausgewählte be&arbeiten" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "Pfade &ausschließen:" @@ -4205,7 +4283,7 @@ msgstr "Pfade &ausschließen:" msgid "E&xit" msgstr "&Beenden" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xport..." @@ -4225,11 +4303,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Ost Europäisch" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Bearbeiten" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Bearbeite &globale .gitconfig" @@ -4245,23 +4323,23 @@ msgstr ".tgitconfig bearbeiten" msgid "Edit Button Image" msgstr "Schaltfächenbild ändern" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Anmerkungen bearbeiten" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Autor bearbeiten" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Beschreibung bearbeiten" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Vergleichsprogramm für bestimmte Dateitypen einrichten" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Konflikteditor für bestimmte Dateitypen einrichten" @@ -4273,11 +4351,11 @@ msgstr "Gl&obale .gitconfig bearbeiten" msgid "Edit global &XDG git/config" msgstr "Bearbeite globale &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Lokale git Konfiguration bearbeiten" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Logmeldung bearbeiten" @@ -4297,25 +4375,25 @@ msgstr "Eintragung bearbeiten/aufspalten" msgid "Effective" msgstr "Effektiv" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Entweder der Name oder die IP Adresse des Proxy Servers" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Ellipsenwerkzeug\nEllipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "E-Mail" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "E-Mail-Adresse des Empfängers und Kopie-Empfänger dürfen nicht gleichzeitig leer sein." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "E-Mails" @@ -4323,7 +4401,7 @@ msgstr "E-Mails" msgid "Empty" msgstr "Leer" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Bearbeiten aktivieren" @@ -4339,7 +4417,7 @@ msgstr "Gravatar-Avatare anzeigen" msgid "Enable drag context menu" msgstr "Drag'n'Drop Kontextmenu aktivieren" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Aktiviert das Laden/Speichern des Meldungszwischenspeichers (tortoisegit.data, tortoisegit.index)" @@ -4348,10 +4426,14 @@ msgstr "Aktiviert das Laden/Speichern des Meldungszwischenspeichers (tortoisegit msgid "Enable log cache" msgstr "Meldungszwischenspeicher aktivieren" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Zeige Gravatar-Icons im Log Dialog" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "Aktiviere Syntax-Hervorhebungen" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Aktivierte überlagerte Symbole" @@ -4360,35 +4442,35 @@ msgstr "Aktivierte überlagerte Symbole" msgid "Encode" msgstr "Kodierung" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Kodierung" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Beim Zugriff auf %1 trat ein Hardware I/O Fehler auf." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Beim Zugriff auf %1 trat eine Sperrverletzung auf." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Beim gemeinsamen Zugriff auf %1 trat eine Schutzverletzung auf." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Ungültiger Parameter gefunden." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Beim Lesen von %1 trat ein unerwarteter Fehler auf." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Beim Schreiben von %1 trat ein unerwarteter Fehler auf." @@ -4401,11 +4483,11 @@ msgstr "Verschlüsselung" msgid "End" msgstr "Ende" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Zeilenendestil" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Vergrößert das Fenster auf Bildschirmgröße" @@ -4413,23 +4495,23 @@ msgstr "Vergrößert das Fenster auf Bildschirmgröße" msgid "Enter Log Message" msgstr "Logmeldung eingeben" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "URL eingeben" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Bitte geben Sie eine GUID ein." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Bitte geben Sie eine Währung ein." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Bitte geben Sie ein Datum und/oder eine Zeit ein." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Bitte geben Sie ein Datum ein." @@ -4437,33 +4519,33 @@ msgstr "Bitte geben Sie ein Datum ein." msgid "Enter a name for the changelist:" msgstr "Geben Sie einen Namen für die Änderungsliste ein:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Bitte geben Sie eine Zahl zwischen %1 und %2 ein." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Bitte geben Sie eine Zahl ein." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Bitte geben Sie eine positive Ganzzahl ein." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Bitte geben Sie eine Zeit ein." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Bitte geben Sie eine Ganzzahl zwischen %1 und %2 ein." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Bitte geben Sie eine Ganzzahl zwischen 0 und 255 ein." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Bitte geben Sie eine Ganzzahl ein." @@ -4475,7 +4557,7 @@ msgstr "Tragen Sie die zu testenden Texte hier ein:" msgid "Enter log &message:" msgstr "Log-&Meldung eingeben" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Bitte nicht mehr als %1 Zeichen eingeben." @@ -4484,43 +4566,43 @@ msgstr "Bitte nicht mehr als %1 Zeichen eingeben." msgid "Enter the regex string below:" msgstr "Geben Sie den RegEx Text hier ein:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Alles löschen\nAlles löschen" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Auswahl löschen\nLöschen" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Fehler" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Fehler beim Reparieren des Symbolpuffers der Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "Fehler beim Überprüfen des Server-Zertifikats von \"%s\":" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Fehler beim Lesen/Schreiben des Registryschlüssels %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Alles aktualisiert." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4530,28 +4612,28 @@ msgstr "Ausführbar (*.exe)|*.exe|Command (*.com)|*.com|Information (*.pdf)|*.pd msgid "Executable (+x)" msgstr "Ausführbar (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Vorhanden" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Beenden" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Expandiere (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Angedocktes Fenster expandieren" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Explorer öffnen" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Export" @@ -4559,36 +4641,36 @@ msgstr "Export" msgid "Export Zip File" msgstr "Zu ZIP-Datei exportieren" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportverzeichnis:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exportiere Auswahl nach..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Diese Version exportieren..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportiere alle Dateien (auch nicht versionierte)" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportiere %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportiere..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exportiert eine Revsion in eine .zip-Datei" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Erweiterung" @@ -4604,7 +4686,7 @@ msgstr "Erweiterung:" msgid "Extern DLL Path:" msgstr "Externer DLL Pfad:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Extern" @@ -4612,101 +4694,101 @@ msgstr "Extern" msgid "External Program:" msgstr "Anwendung:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Ausblenden" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Fehlgeschlagen" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Rückgängig machen fehlgeschlagen" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Holen der Datei \"%s\" fehlgeschlagen" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Die Datei \"%s\" der Resivion \"%s\" konnte nicht nach \"%s\" gespeichert werden." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Fehler beim Verbinden\nVerweis könnte defekt sein." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Fehler beim Konvertieren des ActiveX Objekts." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Konnte leeres Dokument nicht erstellen" -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Fehler beim Anlegen des Objekts. Stellen Sie sicher, dass die Anwendung in der Systemregistrierung eingetragen ist." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Konnde Anforderungdsanfrage nicht erstellen." -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Konnte Basis-Datei nicht finden." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Konnte Zusammenführdatei nicht finden." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Konnte Hilfe nicht starten." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Fehler beim Start der Server Applikation." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Konnte Dokument nicht öffnen." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Fehler beim Durchführen der Serveroperation." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Konnte Dokument nicht speichern." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Konnte Änderungsliste '%s' nicht setzen/entfernen" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Konnte den COM-Anbieter für das Fehlerverfolgungssystem nicht starten '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Wartezeit für das Warten auf das Laden des privaten Schlüssels durch den Putty Agent überschritten." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Fehlgeschlagen!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Fast Forward" @@ -4714,62 +4796,62 @@ msgstr "Fast Forward" msgid "Fast Forward o&nly" msgstr "&nur Fast-Forward" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Fast forward zu %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "&Aktualisieren" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Aktualisieren" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Aktualisieren && neu Auf&bauen" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Aus SVN Projektarchiv holen" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Aktualisieren von \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Aktualisieren&&neu Auf&bauen" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Aktualisieren..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Ermittle Status..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Hole geänderte Dateien..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Hole Datei..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Hole Revision %s der Datei:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Datei" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Dateikodierung" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Dateiänderungen pro %s:" @@ -4778,27 +4860,27 @@ msgstr "Dateiänderungen pro %s:" msgid "File changes each week:" msgstr "Dateiänderungen pro Woche:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Dateiunterschiede" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Datei hat keine Konflikte" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "De Datei ist leer." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Leere Dateiliste" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Datei Patches" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4810,7 +4892,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dateigröße:\t\t%s (%s)\nBreite:\t\t\t%ld pixel\nHöhe:\t\t\t%ld pixel\nHorizontale Auflösung:\t%.1f dpi\nVertikale Auflösung:\t%.1f dpi\nFarbtiefe:\t\t%d bit\nSkalierung:\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4830,7 +4912,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dateigröße:\t\t%s (%s)\nBreite:\t\t\t%ld pixel\nHöhe:\t\t\t%ld pixel\nHorizontale Auflösung:\t%.1f dpi\nVertikale Auflösung:\t%.1f dpi\nFarbtiefe:\t\t%d bit\nSkalierung:\t\t%d%%\n\nDateigröße:\t\t%s (%s)\nBreite:\t\t\t%ld pixel\nHöhe:\t\t\t%ld pixel\nHorizontale Auflösung:\t%.1f dpi\nVertikale Auflösung:\t%.1f dpi\nFarbtiefe:\t\t%d bit\nSkalierung:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4842,7 +4924,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dateigröße:\t\t%s (%s)\nBreite:\t\t\t%ld pixel\nHöhe:\t\t\t%ld pixel\nHorizontale Auflösung:\t%.1f dpi\nVertikale Auflösung:\t%.1f dpi\nFarbtiefe:\t\t%d bit\nSkalierung:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4862,7 +4944,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dateigröße:\t\t%s (%s)\nBreite:\t\t\t%ld pixel\nHöhe:\t\t\t%ld pixel\nHorizontale Auflösung:\t%.1f dpi\nVertikale Auflösung:\t%.1f dpi\nFarbtiefe:\t\t%d bit\nSkalierung:\t\t%d%%\n\nDateigröße:\t\t%s (%s)\nBreite:\t\t\t%ld pixel\nHöhe:\t\t\t%ld pixel\nHorizontale Auflösung:\t%.1f dpi\nVertikale Auflösung:\t%.1f dpi\nFarbtiefe:\t\t%d bit\nSkalierung:\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Dateiname" @@ -4870,17 +4952,17 @@ msgstr "Dateiname" msgid "Files" msgstr "Dateien" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Füllwerkzeug\nFüllen" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtern nach" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Pfade filtern" @@ -4892,11 +4974,11 @@ msgstr "Filter:" msgid "Filter: " msgstr "Filter: " -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Suchen" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4906,17 +4988,17 @@ msgstr "Angegebenen Text suchen\nSuchen" msgid "Find:" msgstr "Suchen:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Suche: Der Text \"%s\" konnte nicht gefunden werden." -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Suchen: Erster Treffer von oben gefunden. Ende des Dokuments erreicht." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Suchen: Erster Treffer von oben gefunden. Ende des Dokuments erreicht." @@ -4924,23 +5006,23 @@ msgstr "Suchen: Erster Treffer von oben gefunden. Ende des Dokuments erreicht." msgid "Fingerprints" msgstr "Fingerabdrücke" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Fertig" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Umsetzen beendet." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Fertig!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Erster Elternteil" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Nur erster Elternteil" @@ -4949,18 +5031,18 @@ msgid "First known &bad:" msgstr "Erste bekannte &schlechte Version:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Bild&höhen anpassen" +msgid "Fit image &heights\tH" +msgstr "Bild&höhen anpassen\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Bild&breiten anpassen" +msgid "Fit image &widths\tW" +msgstr "Bild&breiten anpassen\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Diskettenlaufwerke (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Ordner" @@ -4972,38 +5054,34 @@ msgstr "Umbenennungen folgen" msgid "Font" msgstr "Schriftart" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Drücken Sie F1 für Hilfe. Mit Strg+Mausrad horizontal verschieben." -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Deaktivieren Sie 'Bei Kopien/Umbenennen anhalten', um eine vollständige Historie zu erhalten." -#. Resource IDs: (1521) -msgid "Force" -msgstr "Erzwingen" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Erzwinge die Erstellung des Zweiges/der Markierung - selbst dann, wenn einer mit gleichem Namen existiert." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "Erzwinge das Versenden sofern die entfernte Referenz auf die gleiche Eintragung wie der entfernte Zweig zeigt.\nDies kann dazu führen, dass im entfernten Repository Eintragungen verloren gehen; benutzen Sie diese Option mit vorsicht.\nDiese Option entspricht der --force-with-lease Git Option." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "Erzwinge das Versenden zur entfernten Referenz und überschreibe diese ohne weitere Überprüfungen.\nDies kann dazu führen, dass im entfernten Repository ungesehene Eintragungen verloren gehen; benutzen Sie diese Option mit vorsicht.\nDiese Option entspricht der --force Git Option." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5021,20 +5099,20 @@ msgstr "Vordergrund" msgid "Format Patch" msgstr "Patch erstellen" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Erzeuge &Patch..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Forward" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Forward %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5064,11 +5142,11 @@ msgstr "Von &veränderten Dateien" msgid "From SVN Repository" msgstr "Aus SVN Projektarchiv" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Von existierenden Dateien" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Von veränderten Dateien" @@ -5076,7 +5154,7 @@ msgstr "Von veränderten Dateien" msgid "From:" msgstr "Von:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Vollbild" @@ -5084,7 +5162,7 @@ msgstr "Vollbild" msgid "Full text search" msgstr "Volltextsuche" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Vollständig rekursiv" @@ -5092,7 +5170,7 @@ msgstr "Vollständig rekursiv" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Für weitere Optionen für den Eintragungsdialog siehe \"Dialoge 3\" Seite." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5100,24 +5178,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Vereinfacht)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ konnte nicht initialisiert werden!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ konnte kein Bitmapobjekt erzeugen. Vermutlich reicht der Speicher nicht aus." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "Markierung GPG-signieren, beachten Sie die Hilfe für Details" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Sammle Informationen. Bitte warten..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Berechne Statistiken" @@ -5161,29 +5239,29 @@ msgstr "Allgemein::Dialoge 3" msgid "General::Set Extend Menu Item" msgstr "Allgemein::Erweitertes Kontextmenü" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Logs vom Zusammenführen holen" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Hole Datei: %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Hole Datei %s, Revision %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Hole Information..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Hole benötigte Informationen..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Hole Standard-Diff" @@ -5195,23 +5273,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git Befehls-Fortschritt" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Kopieren und zu dieser Arbeitsbaum hinzufügen" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Objekte hierher kopieren und umbenennen" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Objekte hierher kopieren" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git alle Objekte hierher exportieren" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git versionierte Objekte hierher exportieren" @@ -5219,35 +5297,35 @@ msgstr "Git versionierte Objekte hierher exportieren" msgid "Git Init" msgstr "Git Initialisieren" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Git Installationspfad" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Log" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Objekte hierher verschieben und umbenennen" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Objekte hierher verschieben" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git Archiv Einstellungen" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Git Revision Liste" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN neu aufbauen" @@ -5259,7 +5337,7 @@ msgstr "Git Synchronisation" msgid "Git clone - TortoiseGit" msgstr "Git Klon - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Sys Verzeichnis ist nicht gesetzt (siehe \"Allgemeines\" Einstellungsseite)." @@ -5267,23 +5345,23 @@ msgstr "Sys Verzeichnis ist nicht gesetzt (siehe \"Allgemeines\" Einstellungssei msgid "Git for Windows" msgstr "Git für Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git für Windows (https://msysgit.github.io/) nicht gefunden." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git hat einen Fehler beim Erstellen der Arbeitsbaum gemeldet!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Git Revisionsliste zeigt vollständige Dateihistorie" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Git Revisionsliste folgt Dateiumbenennungen" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5304,7 +5382,7 @@ msgstr "Git::Credential" msgid "Git::Remote" msgstr "Git::Archive" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5316,47 +5394,47 @@ msgstr "Gehe zu Zeile" msgid "Go to line" msgstr "Gehe zu Zeile" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Gehe zum nächsten Konflikt\nNächster Konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Gehe zum nächsten Unterschied\nNächster Unterschied" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Gehe zum nächsten Unterschied in der Zeile\nNächster Zeilenunterschied" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Gehe zum vorherigen Konflikt\nVorheriger Konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Gehe zum vorherigen Unterschied\nVorheriger Unterschied" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Gehe zum vorherigen Unterschied in der Zeile\nVorheriger Zeilenunterschied" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Gehe zu Zeile" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Graph" @@ -5372,11 +5450,11 @@ msgstr "Grau" msgid "Greek" msgstr "Griechisch" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Änderungslisten gruppieren" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "Verstecke n&icht-relevante geänderte Pfade" @@ -5392,7 +5470,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Hart" @@ -5404,7 +5482,7 @@ msgstr "Hart: Ändert Arbeitsbaum und Index (verwirft alle Änderungen)" msgid "Hebrew" msgstr "Häbräisch" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Hilfe" @@ -5428,11 +5506,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Kontextmenü für nicht versionierte Objekte verbergen" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Patch verstecken<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Angedocktes Fenster verbergen" @@ -5440,25 +5518,25 @@ msgstr "Angedocktes Fenster verbergen" msgid "Hide the script while running" msgstr "Skript beim Ablauf verbergen" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Unveränderte ausblenden" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Blendet alle unveränderten Refs in Der Ref Vergleichsansicht aus" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Ein/Ausblenden der Patchdatei-Liste" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Verberge/Zeige die Patchliste\nVerbirgt oder zeigt die Patchdateiliste" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Hinweis" @@ -5468,7 +5546,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Hinweis: Wählen Sie das Kontextmenü, wechseln Sie auf die Seite 'Befehle' und ziehen Sie die Schaltflächen der Werkzeugleiste in das Menüfenster." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Pos1" @@ -5484,7 +5562,7 @@ msgstr "Aktionsskripte::Integration des Fehlerverfolgungssystems" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Aktionsskripte::Integration des Fehlerverfolgungssystems" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Aktionstyp" @@ -5500,7 +5578,7 @@ msgstr "Pfade &einschließen:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5508,55 +5586,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +B" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +L" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +O" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5564,15 +5643,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5596,7 +5675,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5604,7 +5683,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5612,7 +5691,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5620,16 +5699,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5640,17 +5719,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5662,7 +5741,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5726,7 +5805,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Überlagerte Symbole" @@ -5738,7 +5817,7 @@ msgstr "Überlagerte Symbole::Auswahl" msgid "Icon Overlays::Overlay Handlers" msgstr "Überlagerte Symbole::Aktivieren" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5748,52 +5827,52 @@ msgstr "Icons (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Icons/Design/Code: Lübbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Identisch" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Aktivieren Sie diese Option, damit die überlagerten Symbole und Kontextmenüs\nin 'Speichern unter...' und 'Öffnen' Dialogen nicht angezeigt werden." -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Ist dieses Feld markiert wird --track an git übergeben. Ist es nicht markiert, wird --no-track übergeben und sonst weder --track noch --no-track (siehe Hilfe)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Aktivieren Sie diese Option, damit bei einem Doppelklick in der Logliste ein Vergleich mit der vorherigen Revision durchgeführt wird." -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Aktivieren Sie diese Option, damit der Übertragen-Dialog nach einem Fehler\r\nautomatisch wieder geöffnet wird. Ihre letzte Auswahl sowie die Logmeldung\r\nwerden beibehalten." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Aktivieren Sie diese Option, damit TortoiseGit einmal wöchentlich überprüft, ob eine neue Version der Software zur Verfügung steht." -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Für Ordner innerhalb des Arbeitsbaumes, die aufgrund eines Ausschlußpfades\nkeine überlagerten Symbole erhalten, wird das Statussymbol 'Normal' angezeigt." -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Aktivieren Sie diese Option, damit auch nicht versionierte Verzeichnisse\r\nim Statusfenster - zum Beispiel des Übertragen-Dialogs - angezeigt werden." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5806,16 +5885,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Wenn Sie in diesem Ordner arbeiten möchten, wählen Sie diese Option nicht aus. Typischerweise können in ein bare-Projektarchiv nur Eintragungen versandt werden. (Nach Konvention, sollte der Projektarchiv-Ordnername mit \".git\" enden)" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorieren" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignoriere %d Objekte nach &Erweiterung" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Kommentare ignorieren" @@ -5827,15 +5906,15 @@ msgstr "Ignorieren-Datei" msgid "Ignore Type" msgstr "Ignorieren-Typ" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignoriere alle Leerzeichen" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignoriere alle Änderungen an Leerzeichen" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignoriere Leerzeilen" @@ -5843,7 +5922,7 @@ msgstr "Ignoriere Leerzeilen" msgid "Ignore case cha&nges" msgstr "Ignoriere &Groß-/Kleinschreibung" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5861,11 +5940,11 @@ msgstr "Ignoriere Objekt(e) rekursiv" msgid "Ignore line &endings (recommended)" msgstr "Ignoriere &Zeilenenden (empfohlen)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignoriere Leerzeichen am Ende der Zeile" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignoriere Änderungen in der Anzahl von Leerzeichen" @@ -5873,29 +5952,29 @@ msgstr "Ignoriere Änderungen in der Anzahl von Leerzeichen" msgid "Ignore whitespace" msgstr "Ignoriere Änderungen an Leerzeichen" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignoriere Änderungen in der Anzahl von Leerzeichen" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Ignoriert Änderungen an Leerzeichen beim Vergleichen der Eltern- und Kindversionen" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignoriert" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Ignorierte Dateien" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignoriert alle Änderungen an Leerzeichen beim Vergleich\nIgnoriere alle Änderungen an Leerzeichen" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5913,24 +5992,24 @@ msgstr "Bild &und Text" msgid "Images" msgstr "Bilder" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Direkte Unterobjekte, einschließlich Ordnern" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importieren" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importiere %s in %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importiere SVN 'Ignorieren' Liste" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importiere SVN 'Ignorieren' Liste..." @@ -5939,16 +6018,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importiert die SVN 'Ignorieren'-Liste in die Datei .git/info/exclude (diese Datei wird überschrieben)." -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importiere Datei %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Eingehende Änderungsliste" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Eingehende Eintragungen" @@ -5972,24 +6051,24 @@ msgstr "FETCH_HEAD in Zweig-Auswahlboxen anzeigen" msgid "Include only the following revision range:" msgstr "Nur den folgenden Revisionsbereich einschließen:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Ungültiger Dateiname." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Erster Import" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Leere Git Repository wurde in %s initialisiert." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Unterschiede in der Zeile" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Zeilenunterschiede wortweise" @@ -6001,25 +6080,25 @@ msgstr "Unterschiede innerhalb von Zeilen" msgid "Input" msgstr "Eingabe" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Inhalt der Zwischenablage einfügen\nEinfügen" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Zuwenig Speicher um Operation durchzuführen." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Interner Programmfehler." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Ungültige Währung" -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Ungültige Revisionsangabe." @@ -6027,7 +6106,7 @@ msgstr "Ungültige Revisionsangabe." msgid "Issuer:" msgstr "Aussteller:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6050,7 +6129,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Behalten" @@ -6058,11 +6137,11 @@ msgstr "Behalten" msgid "Keep changelists" msgstr "Änderungsliste beibehalten" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Datei lokal behalten?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6076,7 +6155,7 @@ msgstr "Tastatur" msgid "Keyboard shortcuts:" msgstr "Tastaturkürzel" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Tasten" @@ -6120,19 +6199,39 @@ msgstr "Linie 8" msgid "Language:" msgstr "Sprache:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "Letzte %s Eintragung(en)" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "Letzte(r) %s Monat(e)" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "Letzte %s Woche(n)" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "Letzte(s) %s Jahr(e)" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Letzter Autor" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Letzte Eintragung" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Zuletzt verändert" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Zuletzt geändert:" @@ -6140,7 +6239,11 @@ msgstr "Zuletzt geändert:" msgid "Last known &good:" msgstr "Letzte bekannte &gute Version:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "Letztes ausgewähltes Datum" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Startet den externen Konflikteditor, um den Konflikt zu bearbeiten." @@ -6148,17 +6251,17 @@ msgstr "Startet den externen Konflikteditor, um den Konflikt zu bearbeiten." msgid "Least active author:" msgstr "Die wenigsten Übertragungen:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Als Konflikt lassen\nDer Status 'Konflikt' der Datei wird beibehalten" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "Behalte nur die makierten Blöcke" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Linke Ansicht:" @@ -6166,11 +6269,11 @@ msgstr "Linke Ansicht:" msgid "Left image" msgstr "Linkes Bild" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Liniendiagramm" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6184,12 +6287,12 @@ msgstr "Differenzzeile" msgid "Line differences" msgstr "Unterschiede zwischen Zeilen" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Zeile verschoben von Zeile %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Zeile verschoben nach Zeile %ld" @@ -6202,26 +6305,26 @@ msgstr "Liniendicke" msgid "Line:" msgstr "Zeile:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Zeile: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Zeilen hinzugefügt" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Zeilen gelöscht" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Listet Inhaltsverzeichnis der Hilfe auf\nHilfe" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6239,23 +6342,23 @@ msgstr "Lade Bilder" msgid "Load Putty &Key" msgstr "Putty-&Key laden" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Änderungen laden\nIn TortoiseGitMerge vorgenommene Änderungen werden verworfen und durch den neuen Inhalt ersetzt." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Änderungen laden\nDie Ansichten werden mit dem neuen Inhalt ersetzt." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Lade..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Lokal" @@ -6263,13 +6366,13 @@ msgstr "Lokal" msgid "Local Branch" msgstr "Lokaler Zweig" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "Lokale Änderungen ignorieren (\"skip-worktree\" und \"assume-unchanged\" markiete Dateien)" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Lokaler Status" @@ -6277,7 +6380,7 @@ msgstr "Lokaler Status" msgid "Local:" msgstr "Lokal:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6287,7 +6390,7 @@ msgstr "Zielordner, in dem die Dateien aus der gewählten\nEintragung gespeicher msgid "Locator Bar" msgstr "Navigationsleiste" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Log" @@ -6327,12 +6430,12 @@ msgstr "Logmeldungen (Zeige Log)" msgid "Login:" msgstr "Login:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Kleinste angezeigte Revision: %ld - Größte angezeigte Revision: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6343,7 +6446,7 @@ msgstr "Ältestes gezeige Revision: %ld - Neuste gezeigt Revision: %ld - HEAD Re msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6355,14 +6458,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Mail System DLL ist ungültig." -#. Resource IDs: (156) -msgid "Main" -msgstr "Hauptseite" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Erstelle von bare-Repository (keine Arbeitsbaum)" @@ -6375,47 +6474,47 @@ msgstr "Ver&walten" msgid "Manage" msgstr "Verwalten" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Verwalte Archive" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Als aufgelöst markieren" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Als aufgelöst markieren\nDer Status der Datei wird auf 'verändert' gesetzt" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "Für Vergleich auswählen" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Block markieren" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Makierte Blöcke" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Markiert einen Dateikonflikt in Git als aufgelöst\nAls aufgelöst markieren" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Markiert Revision als schlecht" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Markiert Revision als gut" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Groß-/Kleinschreibung &beachten" @@ -6439,7 +6538,7 @@ msgstr "Me&nüs zeigen zuletzt verwendete Befehle zuerst" msgid "Menu" msgstr "Menü" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Menüleiste" @@ -6447,7 +6546,7 @@ msgstr "Menüleiste" msgid "Menu s&hadows" msgstr "Menü Sc&hatten" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Zusammenführen" @@ -6455,34 +6554,34 @@ msgstr "Zusammenführen" msgid "Merge &Message" msgstr "Zusammenführ-&Meldung" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Zusammenführungspunkt" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Wieder Eingliedern" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Zusammenführen der Änderungen des original Zweigs, Arbeitsbaums und dem Zweig zu dem gewechselt werden soll" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Mit \"%s\" zusammenführen..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Zusammengeführt" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Zusammengefügte Dateien" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Führt Eintragungen mit einem anderen Zweig zusammen" @@ -6490,22 +6589,22 @@ msgstr "Führt Eintragungen mit einem anderen Zweig zusammen" msgid "Merging" msgstr "Zusammenführen" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Zusammenführen von %s, Revision %s bis %s, Revision %s in %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Zusammenführen erfordert unterschiedliche Revisionen oder URLs in 'Von:' und 'Bis:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Zusammenführen %s von %s in %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Meldung" @@ -6517,7 +6616,7 @@ msgstr "Nur \"Meldun&g\"" msgid "Message part &expression:" msgstr "Nachrichtenteil &RegEx:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Meldungen" @@ -6525,11 +6624,11 @@ msgstr "Meldungen" msgid "Min" msgstr "Minimum" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Meine" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Band minimieren" @@ -6541,7 +6640,11 @@ msgstr "Minimale Anzahl von Zeichen für eine Logmeldung:" msgid "Misc" msgstr "Allgemein" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Fehlt" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Gemischt" @@ -6549,35 +6652,35 @@ msgstr "Gemischt" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Gemischt: Lässt die Arbeitsbaum unverändert, versetzt nur den Index." -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Änderungsdatum" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Verändert" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Veränderte Dateien" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Mehr" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Weitere Schaltflächen" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Weitere Befehle..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Weitere Farben..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Mehr..." @@ -6597,41 +6700,41 @@ msgstr "Nach &Unten" msgid "Move &Up" msgstr "Nach &Oben" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Objekt nach unten verschieben" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Objekt nach oben verschieben" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Verschieben und umbenennen" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Zur Änderungsliste hinzufügen" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Verschieben/Umbenennen" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Verschieben: Neuer Name für %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Verschiebt die veränderten Dateien vor dem Rückgängigmachen in den Papierkorb" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Verschiebe %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Verschieben..." @@ -6639,11 +6742,11 @@ msgstr "Verschieben..." msgid "My file:" msgstr "Meine Datei:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Name" @@ -6655,7 +6758,7 @@ msgstr "Name:" msgid "Navigate" msgstr "Navigieren" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6665,11 +6768,11 @@ msgstr "Gehe zu einer bestimmten Zeile in der Ansicht\nGehe zu Zeile" msgid "Navigation Pane Options" msgstr "Optionen der Navigationsfläche" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Optionen der Navigationsfläche..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Verschachtelt" @@ -6681,7 +6784,7 @@ msgstr "Netzwerk" msgid "Network::Email" msgstr "Netzwerk::E-Mail" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Neu" @@ -6690,43 +6793,43 @@ msgid "New &name:" msgstr "Neuer &Name:" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "Neuer Zweig/Markierung" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Neues Menü" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Neuer SHA-1" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Neue Meldung" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Neuer Name für %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Der neue Name darf nicht leer oder gleich dem ursprünglichen Namen sein!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Neuer Name:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Neues Submodul" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Neueres Eintragedatum" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Zeilenumbrüche" @@ -6734,33 +6837,29 @@ msgstr "Zeilenumbrüche" msgid "Next" msgstr "Nächster" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Nächste Seite\nNächste Seite" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Nächster Konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Nächster Unterschied" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Nächster Unterschied in der Zeile" -#. Resource IDs: (73) -msgid "No" -msgstr "Nein" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Kein &Fast-Forward" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Ohne &Zusammenführungen" @@ -6772,102 +6871,107 @@ msgstr "Nicht auschecken" msgid "No Co&mmit" msgstr "Nicht Eintragen" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "Kein HEAD gefunden" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Kein Befehl angegeben!\n\nTortoiseGitProc.exe wird vom Shell-Teil benutzt und sollte nicht direkt gestartet werden." -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Kein Kommandowert übergeben!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Keine Unterschiede gefunden!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Keine Unterschiede gefunden! Submodul könnte nicht mehr aktuell sein. Soll das Submodul aktualisiert werden?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Keine Fehlermeldung vorhanden." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Kein Fehler aufgetreten." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "Keine weiteren Änderungen nach dem Zusammenführen" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Es wurden keine Dateien/Ordner modifiziert.\nEs sind keine Änderungen vorhanden, die rückgängig gemacht werden könnten." -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Mit der aktuellen Einstellung werden keine Dateien angezeigt.\nWählen Sie eine oder mehrere der untenstehenden Optionen, um\nunversionierte, ignorierte oder unmodifizierte Dateien zu sehen\nÄnderungen im Projektarchiv werden erst nach 'Projektarchiv prüfen' angezeigt." +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "Mit der aktuellen Einstellung werden keine Dateien angezeigt.\nWählen Sie eine oder mehrere der untenstehenden Optionen, um\nunversionierte, ignorierte oder unmodifizierte Dateien zu sehen." -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Seit der letzten Eintragung wurden keine\\nDateien/Ordner verändert oder hinzugefügt.\nEs gibt nichts zu tun für TortoiseSVN..." +"the last commit." +msgstr "Seit der letzten Eintragung wurden keine\nDateien/Ordner verändert oder hinzugefügt." -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Seit der letzten Eintragung wurden keine Dateien geändert oder hinzugefügt.\nEs gibt hier für TortoiseGit nichts zu tun.\nMöchten Sie die unversionierten Objekte anzeigen lassen?" +msgstr "Seit der letzten Eintragung wurden keine\nDateien/Ordner verändert oder hinzugefügt.\nMöchten Sie die unversionierten Objekte anzeigen lassen?" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Keine Grafik vorhanden" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Kein Bildkodierer für %s gefunden." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "Keine Limitierung" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Keine weiteren Revisionen gefunden." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Keine vorherige Eintragung." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Keine Referenz gefunden" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Keine Korrekturvorschläge" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Kein Statuspuffer. Nur versionierte Ordner erhalten ein überlagertes Symbol, Dateien nicht." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Keine Thesaurusvorschläge" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Keine Arbeitsbaum gefunden." @@ -6875,11 +6979,11 @@ msgstr "Keine Arbeitsbaum gefunden." msgid "Node size" msgstr "Knotengröße" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Ohne" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6891,30 +6995,30 @@ msgstr "Normale &SVN Eintragung" msgid "North European" msgstr "Nord Europäisch" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Nicht versionierte Dateien" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Nicht alle Dateien konnten heruntergeladen und verifiziert werden." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nicht alle Einträge der System-Registry (oder INI Datei) wurden gelöscht." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Nicht genug Speicher, um die Operation zu beenden." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Nicht genügend Speicher\nVersuchen Sie, die Größe des Revisionsgraphen zu reduzieren,\nindem Sie Knoten einklappen oder die Ansicht verkleinern." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Keine Patches erzeugt." @@ -6922,7 +7026,7 @@ msgstr "Keine Patches erzeugt." msgid "Note node" msgstr "Kommentarknoten" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6941,26 +7045,26 @@ msgstr "Hinweis: Der Ordner enthält nicht versionierte Objekte" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Hinweise: Diese Einstellung beeinflusst alle Tortoise Clients, nicht nur TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Anmerkungen" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Keine Neuaufbau notwendig\n%s entspricht %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Nichts zum neu aufbauen" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Nichts zum Eintragen" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Hinweis" @@ -6968,7 +7072,7 @@ msgstr "Hinweis" msgid "Number Commits" msgstr "Anzahl Eintragungen" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Anzahl %s:" @@ -6981,7 +7085,7 @@ msgstr "Anzahl Autoren:" msgid "Number of characters required for moved or copied line detection:" msgstr "Anzahl erforderlicher Zeichen für Erkennung verschobener oder kopierter Zeilen:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Anzahl der Zeichen die im abgekürzten Hash-Teil angezeigt werden" @@ -7053,41 +7157,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Die OLE Initialisierung ist fehltgeschlagen. Stellen Sie sicher, dass die OLE Bibliotheken in der richtigen Version vorliegen." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007 Farben" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Alter SHA-1" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Alte Meldung" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Älteres Eintragedatum" @@ -7095,15 +7199,15 @@ msgstr "Älteres Eintragedatum" msgid "Older lines" msgstr "Ältere Zeilen" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "bei Bedarf" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Eines oder mehrere automatisch gespeicherte Dokumente wurden gefunden." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Eine oder mehrere Dateien befinden sich in einem Konfliktzustand." @@ -7115,29 +7219,29 @@ msgstr "Nur aktueller Zweig" msgid "Only Local Branches" msgstr "Nur lokale Zweige" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "nur zusammengeführte Dateien" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Nur Dateiobjekte" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Nur Zahlen (ggf. durch Kommata separiert)\nsind zugelassen!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Nur dieses Objekt" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Öffnen" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7147,51 +7251,52 @@ msgstr "Öffnet ein bestehendes Dokument\nÖffnen" msgid "Open certificate" msgstr "Zertifikat öffnen" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Dateien zum Vergleichen oder Patchen öffnen\nDateien öffnen" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Aus Zwischenablage öffnen" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Öffne Bilddatei..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Elternordner öffnen" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "Patch-Datei öffnen" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Dieses Dokument öffnen" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Öffnen mit..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Zeigt die Hilfe an\nHilfe" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Öffnet den Referenzen durchsuchen Dialog." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Öffnet das Projektarchiv" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Einstellungen" @@ -7200,30 +7305,30 @@ msgid "Options" msgstr "Einstellungen" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Ori&ginalgröße" +msgid "Ori&ginal size\tS" +msgstr "Ori&ginalgröße\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Origin Name" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Andere Werkzeugflächen" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Andere" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Ausgehende Änderungsliste" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Ausgehende Eintragungen" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Zu wenig Speicher." @@ -7231,7 +7336,7 @@ msgstr "Zu wenig Speicher." msgid "Output Directory" msgstr "Ausgabe Verzeichnis:" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Ausgabe.prn" @@ -7239,20 +7344,24 @@ msgstr "Ausgabe.prn" msgid "Override branch if exists" msgstr "Überschreibe Zweig, falls er existiert" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Überschreiben" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "Überschreibe Arbetisbaum-Änderungen (force)" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "Seite &einrichten..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Seite %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7263,15 +7372,15 @@ msgstr "Seite %u\nSeiten %u--%u\n" msgid "Page :" msgstr "Seite:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Leiste 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Leiste 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parameter" @@ -7279,25 +7388,25 @@ msgstr "Parameter" msgid "Parameters:" msgstr "Parameter:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Elternteil %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Elternteil %d existiert nicht" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Elter 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Elter 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Elternteil(e)" @@ -7309,39 +7418,39 @@ msgstr "Teile des Quellcodes stammen von TortoiseSVN Blame" msgid "Password" msgstr "Passwort" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Passwort:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Einfügen" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Letzte Log-Meldungen..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "Dateinamensliste ein&fügen" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "&Letzte Log-Meldung einfügen" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "&Letzte Log-Meldung einfügen..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Einfügewerkzeug\nEinfügen" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Dateinamensliste einfügen" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Letzte Log-Meldung einfügen" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Fügt den SVN Pfad aus der Zwischenablage ein. Die Objekte werden verschoben (ausschneiden) oder kopiert" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Patch" @@ -7357,32 +7466,32 @@ msgstr "&Gewähltes Objekt patchen" msgid "Patch As Attachment" msgstr "Patch als Anhang" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Alle Dateien patchen" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Gewählte Datei patchen" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Patchdateien (*.diff, *.patch)|*.diff;*.patch|Alle Dateien (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Patchen" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Patche Datei '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Pfad" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Pfad gefunden, der besser zum Patch passt." @@ -7390,21 +7499,21 @@ msgstr "Pfad gefunden, der besser zum Patch passt." msgid "Path:" msgstr "Pfad:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Pfade" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Stiftwerkzeug\nStift" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Anteil an der Erstellung" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Prozent" @@ -7412,24 +7521,24 @@ msgstr "Prozent" msgid "Personalized Menus and Toolbars" msgstr "Personalisiere Menüs und Werkzeugleisten" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Nehmen" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Wähle Eintragungs-SHA1" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "Wähle Eintragungs-S&HA1" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Wähle Log-Meldung" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "Wähle Log-&Meldung" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Nahme %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7439,56 +7548,56 @@ msgstr "Bild (Metafile)\nEin Bild" msgid "Picture:" msgstr "Bild:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Bilder (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.svg;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphen (*.gv)|*.gv|Alle Dateien (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Bilder (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Alle Dateien (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Tortendiagramm" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Bitte wählen Sie das auszuführende Skript aus." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Bitte geben Sie einen Pfad an auf den das Skript angewendet wird." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Bitte wählen Sie einen Aktionstyp" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Bitte Zweig auswählen" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Bitte Upstream auswählen" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Bitte überprüfen Sie die ausgelassenen Eintragungen" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Bitte warten Sie auf den Abbruch..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Bitte warten Sie während die Unterschiede ermittelt werden..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Bitte warten..." @@ -7504,11 +7613,11 @@ msgstr "Port:" msgid "Port:" msgstr "Port:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Nach Eintragung" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Nach Versenden" @@ -7516,23 +7625,23 @@ msgstr "Nach Versenden" msgid "Pre&v Page" msgstr "&Vorherige Seite" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Vor Eintragung" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Vor Versenden" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Bereite Eintragung vor..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Rechten Block voranstellen" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Diesen Block links voranstellen" @@ -7544,11 +7653,11 @@ msgstr "&Neues Tastenkürzel drücken:" msgid "Press &new shortcut key:" msgstr "&Neues Tastenkürzel drücken:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Vorschau" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Vorschau der Ergebnisdatei" @@ -7560,51 +7669,51 @@ msgstr "Vorschau: " msgid "Previous" msgstr "Vorherige" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Vorherige Seite\nVorherige Seite" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Vorherige Version" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Vorheriger Konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Vorheriger Unterschied" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Vorheriger Unterschied in der Zeile" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Drucken" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Dokument drucken\n&Drucken" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Druckt das aktive Dokument mit den aktuellen Einstellungen\nSchnell-Drucken" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Drucken das aktive Dokument\nDrucken" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "In Datei drucken" @@ -7612,7 +7721,7 @@ msgstr "In Datei drucken" msgid "Printer :" msgstr "Drucker:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Druckerdateien (*.prn)|*.prn|Alle Dateien (*.*)|*.*||" @@ -7620,11 +7729,11 @@ msgstr "Druckerdateien (*.prn)|*.prn|Alle Dateien (*.*)|*.*||" msgid "Printing" msgstr "Drucken" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programm" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programme (*.exe)|*.exe|Alle Dateien (*.*)|*.*||" @@ -7632,11 +7741,11 @@ msgstr "Programme (*.exe)|*.exe|Alle Dateien (*.*)|*.*||" msgid "Progress" msgstr "Fortschritt" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Projekt" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Eigenschaft" @@ -7644,7 +7753,7 @@ msgstr "Eigenschaft" msgid "Property Page" msgstr "Eigenschaften" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Anbieter" @@ -7676,15 +7785,15 @@ msgstr "Zweige aufräumen" msgid "Prune (All remotes)" msgstr "Zweige aufräumen (alle entfernten Repositories)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Anfordern" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Eine Anforderung erfordert, dass der ausgewählte lokale Zweig der aktuelle Zeig ist." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Anfordern..." @@ -7692,19 +7801,19 @@ msgstr "Anfordern..." msgid "Pull/Fetch" msgstr "Anfordern/Aktualisieren" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Anforderungsänderungen" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Anforderungslog" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "&Versenden" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Versenden" @@ -7720,11 +7829,11 @@ msgstr "Versand URL:" msgid "Push notes" msgstr "Anmerkungen versenden" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Versende &Markierungen" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Versenden..." @@ -7732,22 +7841,22 @@ msgstr "Versenden..." msgid "Putty Key:" msgstr "Putty Key:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty privater Schlüssel (*.ppk)|*.ppk|All Files(*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Beendet das Programm\nBeenden" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7765,11 +7874,15 @@ msgstr "&RAM disks" msgid "R&eset" msgstr "Zurücks&etzen" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "Diese Datei aus dem Index &wiederherstellen" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "Rü&ckgängig zu dieser Revision" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "NEUAUFBAU" @@ -7777,7 +7890,7 @@ msgstr "NEUAUFBAU" msgid "Randomize Sync Dialog startup position" msgstr "Sync-Dialog Startposition randomisieren" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7799,7 +7912,7 @@ msgstr "A&rchiv:" msgid "Re&movable drives" msgstr "&Wechseldatenträger" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "&Umbenennen..." @@ -7815,15 +7928,15 @@ msgstr "Alle Rück&setzen" msgid "Re&store defaults" msgstr "Auf &Standardwerte setzen" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Rückgängig..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Erreichbare" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Die schnelle Hilfe bei vielen täglichen Problemen." @@ -7831,21 +7944,21 @@ msgstr "Die schnelle Hilfe bei vielen täglichen Problemen." msgid "Rebase" msgstr "Neuaufbau" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "\"%s\" auf gewählte Revision neu aufbauen" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Neu aufbauen..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Umsetzen... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Letzte" @@ -7857,21 +7970,21 @@ msgstr "Letzte Datei" msgid "Recently modified lines" msgstr "Kürzlich geänderte Zeilen" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Nur aufzeichnen" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Stellt die automatisch gespeicherten Dokumente wieder her\nÖffnet die automatisch gespeicherten Dokumente anstelle der manuell gespeicherten" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Stelle Status vor dem Neuaufbau wieder her" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7885,17 +7998,21 @@ msgstr "Submodules rekursiv folgen" msgid "Recursive" msgstr "Rekursiv" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "Wiederholen" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Letzte Aktion wiederholen\nWiederholen" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Verkleinert das Fenster zu einem Symbol" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref" @@ -7903,31 +8020,31 @@ msgstr "Ref" msgid "Ref (Click it then go to)" msgstr "Ref (Klicken Sie hier)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Ref Liste" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Referenzen durchsuchen" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "RefLog" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Refname" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Aktualisieren" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Aktualisieren..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "RegEx Filter" @@ -7939,7 +8056,7 @@ msgstr "RegEx Filter" msgid "Regex:" msgstr "RegEx:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7958,7 +8075,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtern mit regulären Ausdrücken:\r\n. : Ein beliebiges Zeichen\r\nc+ : Ein oder mehrere Vorkommen von 'c'\r\nc* : Kein oder mehrere Vorkommen von 'c'\r\n^ : Zeilenanfang\r\n$ : Zeilenende\r\n(string){n} : N-maliges Vorkommen von 'string'\r\n(abcd) : Unterausdruck 'abcd'\r\n[aei0-9] : Findet a,e,i und 0..9\r\n[^aei0-9] : Findet alles außer a,e,i und 0..9\r\n\r\n\\w : Alphanumerische Zeichen a-z,A-Z,0-9 und _\r\n\\W : Alle nicht-alphanumerischen Zeichen\r\n\\d : Ziffern 0-9\r\n\\s : Leerzeichen" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Abgelehte Patchesegmente für '%s'" @@ -7971,7 +8088,7 @@ msgstr "Relative Zeiten in Log" msgid "Reload" msgstr "Neu laden" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8005,19 +8122,19 @@ msgstr "Entfernter beobachteter Zweig" msgid "Remote Branch" msgstr "Entfernter Zweig" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "Archiv URL darf nicht leer sein." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Archiv aktualisieren" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Archivname darf nicht leer sein." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Status Projektarchiv" @@ -8029,12 +8146,12 @@ msgstr "Archiv:" msgid "Remove" msgstr "Entfernen" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Lösche %ld Objekte" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Löschen %s" @@ -8043,7 +8160,7 @@ msgstr "Löschen %s" msgid "Remove &all untracked files (-fx)" msgstr "Entferne &alle nicht-versionierten Dateien (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "&Zweig löschen" @@ -8051,21 +8168,21 @@ msgstr "&Zweig löschen" msgid "Remove &non-ignored untracked files (-f)" msgstr "Entferne &nicht-ignorierte nicht-versionierte Dateien (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Vor dem Vergleich alle Kommentare entfernen, so dass Unterschiede in Kommentaren nicht angezeigt werden" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Aus &Ignorieren Liste entfernen" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Aus der Schnellzugriffsleiste entfernen" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Lösche aus Änderungsliste" @@ -8077,7 +8194,7 @@ msgstr "Entferne ignorierte Dateien (-fX)" msgid "Remove untracked directories (-d)" msgstr "Entferne nicht-versionierte Verzeichnisse (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Lösche nicht-versionierte Dateien aus der Arbeitsbaum..." @@ -8085,11 +8202,11 @@ msgstr "Lösche nicht-versionierte Dateien aus der Arbeitsbaum..." msgid "Removed" msgstr "Entfernt" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Aus Änderungsliste gelöscht" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8097,7 +8214,7 @@ msgid "" "from the ignore list." msgstr "Die Einträge\n%s\nwurden aus der 'Ignorieren' Liste entfernt." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Entfernt die gewählten Dateien oder Dateimasken aus der 'Ignorieren' Liste" @@ -8105,11 +8222,11 @@ msgstr "Entfernt die gewählten Dateien oder Dateimasken aus der 'Ignorieren' Li msgid "Rena&me..." msgstr "&Umbenennen..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Umbenennen" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "%s umbenennen" @@ -8118,20 +8235,20 @@ msgstr "%s umbenennen" msgid "Rename - TortoiseGit" msgstr "Umbenennen - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Umenennen von \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Umbenennen/Verschieben" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Benennt Dateien/Ordner unter Versionskontrolle um" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8141,7 +8258,7 @@ msgstr "Letzte Aktion wiederholen\nWiederholen" msgid "Replace &All" msgstr "&Alle ersetzen" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8155,12 +8272,12 @@ msgstr "Ersetzen durch:" msgid "Replace:" msgstr "Ersetzen:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "%d Übereinstimmungen ersetzt" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Ersetze" @@ -8184,11 +8301,11 @@ msgstr "Anforderungsanfrage" msgid "Requests a username and a password" msgstr "Erfragt Anwendername und Passwort" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Konflikt &lösen..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Zurücksetzen" @@ -8200,25 +8317,25 @@ msgstr "Alle &Rücksetzen" msgid "Reset Type" msgstr "Rücksetzmodus" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Setzte \"%s\" auf diese Revision zurück..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Aktiven Zweig zurücksetzen" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Spalten rücksetzen" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Setze aktuellen Zweig \"%s\" auf" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Konflikt gelöst" @@ -8226,126 +8343,122 @@ msgstr "Konflikt gelöst" msgid "Resolve Submodule Conflict" msgstr "Behebe Submodul Konflikt" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Löse Konflikt mit 'Meiner' Datei" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Löse Konflikt mit 'Deren' Datei" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Konflikt aufgelöst" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Konflikt aufgelöst:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Löscht die Konfliktdateien und ermöglicht so das Übertragen der Änderungen" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Neuaufbau neu starten" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Wiederherstellen" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Standard wiederherstellen" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Nach eintragen wiederherstellen" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Stelle die Normalgröße des Fensters wieder her" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Zurückgesetzt" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Wiederholen" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Wiederhole in 2 Sekunden..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Änderungen rückgängig machen" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Eintragung Rückgängig machen" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Eintragung %s Rückgängig machen" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Auf Eltern-Revision zurücksetzen" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Zurücksetzen zu Revision %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Rückgängig gemacht" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Macht alle Änderungen seit der letzten Aktualisierung rückgängig" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Nimmt gerade hinzugefügte Objekte wieder aus der Versionskontrolle" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Patch mit TortoiseGitMerge betrachten" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Standard-Diff mit TortoiseGitMerge öffnen" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Patch anwenden/begutachten..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revision" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revision %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revision %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Revisions&graph" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Dateien der Revision" @@ -8361,31 +8474,31 @@ msgstr "Revisionsgraph filtern" msgid "Revision graph" msgstr "Revisionsgraph" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Änderungen der Revision(en) rückgängig gemacht. Alle Änderungen wurden in Ihren Arbeitsbaum integriert." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revision:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Rewind" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Rewind %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\nText mit Zeichen- und Absatzformatierung" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Rechte Ansicht:" @@ -8393,21 +8506,21 @@ msgstr "Rechte Ansicht:" msgid "Right image" msgstr "Rechtes Bild" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Zeile %d von %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Zeile %d-%d von %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Zeile runter" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Zeile hoch" @@ -8415,11 +8528,11 @@ msgstr "Zeile hoch" msgid "S&elect..." msgstr "&Wählen..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Zeige Schaltflächen in &einer Zeile" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Zeige Schaltflächen in &zwei Zeilen" @@ -8427,15 +8540,23 @@ msgstr "Zeige Schaltflächen in &zwei Zeilen" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Zeige Schnellzugriffsleiste &unterhalb des Bandes" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "Nicht ausgewählte i&gnorieren" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "Nicht ausgewählte z&usammenfassen" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatistik" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "&Wechseln zu..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8455,7 +8576,7 @@ msgstr "Der SMTP-Server erfordert Authentifizierung" msgid "SMTP Server:" msgstr "SMTP Server:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, direkt beim Zielserver einliefern" @@ -8463,11 +8584,11 @@ msgstr "SMTP, direkt beim Zielserver einliefern" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8475,19 +8596,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN Eintrage-Methode" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Aktualisieren" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN neu aufbauen" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN Rev" @@ -8499,15 +8620,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Identisch" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Gleiches Eintragedatum" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8525,35 +8646,39 @@ msgstr "Sample log message to test the bugtraq: regex strings.\n\nTesting mentio msgid "Sample text:" msgstr "Beispieltext:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Speichern" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Speichern &unter..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Speichern &unter...\tStrg+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Speichern unter" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Untere Datei speichern unter\nSie werden gefragt, wo Sie die untere Datei speichern wollen" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Datei speichern" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Linke Datei speichern unter\nSie werden gefragt, wo sie die linke Datei speichern wollen" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8561,13 +8686,13 @@ msgid "" "%s" msgstr "Linke Datei speichern\nDie Änderungen werden in\n%s gespeichert" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Rechte Datei speichern unter\nSie werden gefragt, wo sie die rechte Datei speichern wollen" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8575,74 +8700,74 @@ msgid "" "%s" msgstr "Rechte Datei speichern\nDie Änderungen werden in\n%s gespeichert" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Beide speichern\nAlle beiden Dateien werden gespeichert" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "Speichern und Ausschließen\nIhre Änderungen sind gespeichert und der uUrsprüngliche Inhalt wird verwendet" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "Speichere und ignoriere die makierten Blöcke\nEs werden nur ihre manuellen Bearbeitungen gepeichert, makierte Blöcke verweilen wie sie sind" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "Speichern und einschließen\nIhre Änderungen sind gespeichert und die makierten Blöcke eingeschlossen" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Speichern unter …" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Speichern unter..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Speichern unter\nSie werden gefragt, wo sie die Datei speichern wollen" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Änderungen in %1 speichern?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Änderungen speichern." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "Patch-Datei &speichern" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Speichere Revision &unter..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Speichert das aktive Dokument mit einem neuen Namen\nSpeichern unter" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Speichert das aktive Dokument\nSpeichern" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8664,13 +8789,13 @@ msgstr "Speiche Standard-Diff" msgid "Save unified diff since HEAD" msgstr "Änderungen seit HEAD als Std.-Patch speichern" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Speichern\nDie Datei mit den Konfliktmarkern speichern." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8682,12 +8807,12 @@ msgstr "Speichern\nDie Änderungen werden in\n%s gespeichert" msgid "Saved Data" msgstr "Gespeicherte Daten" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Speichern der Konfiguration fehlgeschlagen (Schlüssel: \"%s\", Wert: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Speichern der Anmerkungen fehlgeschlagen." @@ -8699,11 +8824,11 @@ msgstr "Durchsuchen" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Nach links rollen" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Nach rechts rollen" @@ -8711,7 +8836,7 @@ msgstr "Nach rechts rollen" msgid "Se&ttings..." msgstr "Eins&tellungen" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Durchsuche &Logmeldungen..." @@ -8723,20 +8848,20 @@ msgstr "Suche &aufwärts" msgid "Search for:" msgstr "Suche nach:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Suche nach einem besseren Pfad, um den Patch anzuwenden..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Seek fehlgeschlagen: %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Auswählen" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "A&lle wählen" @@ -8752,59 +8877,59 @@ msgstr "&Kontextmenü wählen:" msgid "Select &window:" msgstr "&Fenster wählen." -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Farbauswahlwerkzeug\nWähle Farbe" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Datei wählen..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Wähle einen SSH Client" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Bitte wählen Sie eine Schaltfläche." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Wählen Sie ein Objekt, für welches Sie Hilfe möchten" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Änderungsliste wählen" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Vergleichsprogramm auswählen" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Datei wählen" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Wählen Sie den Ordner, der mit dem Fehlerverfolgungssystem verbunden werden soll" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Wähle Zielordner für Export.\nVielleicht müssen Sie einen neuen Ordner erstellen." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Wählen Sie den Ordner, in dem das Skript ausgeführt wird" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Wählen Sie den Ordner, in dem die gewählten Dateien gespeichert werden sollen" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Skriptdatei auswählen" @@ -8812,20 +8937,20 @@ msgstr "Skriptdatei auswählen" msgid "Select items automatically" msgstr "Zu übertragende Objekte automatisch markieren" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Konflikteditor auswählen" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Ziel auswählen" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8837,15 +8962,19 @@ msgid "" "checker used for commit messages." msgstr "Legt die verwendete Sprache fest. Diese Einstellung beeinflusst die Rechtschreibprüfung der Logmeldungen." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "Beobachteten entfernten Zweig festlegen" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Betrachter für Standard-Diffdateien auswählen" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Wählen Sie, welche Datei Sie speichern wollen" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8855,7 +8984,7 @@ msgstr "Wählen Sie, welche Datei Sie speichern wollen\nHinweis: Es gibt noch au msgid "Select/deselect &all" msgstr "&Alle wählen/abwählen" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "Auswahl-Verlauf" @@ -8863,7 +8992,7 @@ msgstr "Auswahl-Verlauf" msgid "Send" msgstr "Senden" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "E-Mail senden" @@ -8871,11 +9000,11 @@ msgstr "E-Mail senden" msgid "Send Mail after create" msgstr "Per E-Mail versenden" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Senden von E-Mail(s) fehlgeschlagen." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "E-Mail senden..." @@ -8883,19 +9012,19 @@ msgstr "E-Mail senden..." msgid "Send Patch" msgstr "Patches versenden" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Patch per E-Mail versenden" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Patch(es) per E-Mail versenden" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Sende Inhalt" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Senden..." @@ -8915,28 +9044,28 @@ msgstr "Setze Autor" msgid "Set author &date" msgstr "Setze Eintrage&datum" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Speichert das Projektarchiv als \"pushremote\" für den ausgewählten lokalen Zweig." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Speichert den entfernten Zweig als \"pushbranch\" für den ausgewählten lokalen Zweig." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Setze Eigenschaften..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Einstellungen" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Einstellungen - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8944,7 +9073,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Shell Erweitert" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Pufferspeicher für Symbole wurde wieder hergestellt!" @@ -8956,7 +9085,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "&Kurzes Datum-/Zeitformat" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Eigenschaftsliste kürzen" @@ -8968,7 +9097,7 @@ msgstr "Anzeigen" msgid "Show &Accelerator for:" msgstr "&Zeige Tastenkürzel für:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Zeige &Reflog" @@ -8976,15 +9105,15 @@ msgstr "Zeige &Reflog" msgid "Show &Unversioned Files" msgstr "Zeige &nicht versionierte Dateien" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Zeige &gesamtes Projekt" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Änderungen &zeigen" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Zeige &Log" @@ -8992,15 +9121,19 @@ msgstr "Zeige &Log" msgid "Show &log..." msgstr "Zeige &Log..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "Zeige &verschachtelte Refs" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "&Überlagerte Symbole und Kontextmenü nur im Explorer anzeigen" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Zeige oberhalb des Bandes" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Zeige unterhalb des Bandes" @@ -9008,35 +9141,35 @@ msgstr "Zeige unterhalb des Bandes" msgid "Show Environment Variables" msgstr "Zeige Umgebungsvariablen" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Zeige weniger Schaltflächen" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Zeige Knoten der HEAD Revisionen" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Unterschiede in der Zeile Wort für Wort anzeigen\nInline Diff wortweise" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Inline Diff zeigen\nInline Diff" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Zeige mehr Schaltflächen" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Zeige Schnellzugriffsleiste oberhalb des Bandes" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Zeige Schnellzugriffsleiste unterhalb des Bandes" @@ -9044,11 +9177,11 @@ msgstr "Zeige Schnellzugriffsleiste unterhalb des Bandes" msgid "Show Screen&Tips on toolbars" msgstr "Zeige &Hinweise auf Werkzeugleisten" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Leerzeichen anzeigen" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Gesamtübersicht anzeigen" @@ -9056,7 +9189,7 @@ msgstr "Gesamtübersicht anzeigen" msgid "Show asterisk log prefix" msgstr "Zeige Sternchen Log Vorzeichen" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "Zeige Sternchen Log Vorzeichen in Log Dialog" @@ -9064,11 +9197,11 @@ msgstr "Zeige Sternchen Log Vorzeichen in Log Dialog" msgid "Show author" msgstr "Zeige Author" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Zeige Zweige auf denen diese Revision liegt" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Zeige Änderungen als &Standard-Diff" @@ -9088,15 +9221,15 @@ msgstr "Zeige Datum" msgid "Show describe in log" msgstr "Zeige Eintragungsbeschreibung im Log" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "Zeige Eintragungsbeschreibung im Log Dialog" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Zeige Zielordner" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Zeige Unterschiede" @@ -9108,11 +9241,15 @@ msgstr "Vergleiche mit vorheriger Eintragung" msgid "Show excluded folders as normal" msgstr "Ausgeschlossene Ordner 'normal' anzeigen" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "Zeige weitere Änderungen nach dem Zusammenführen" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Zeige &vollständige Menüs nach einer kurzen Pause" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Zeige Dateiname" @@ -9128,7 +9265,7 @@ msgstr "Zeige i&gnorierte Dateien" msgid "Show ignore local changes flagged files" msgstr "Zeige Dateien, bei denen lokale Änderungen ignoriert werden" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Zeige nur Eintragungen mit Zweigen/Markierungen" @@ -9136,90 +9273,90 @@ msgstr "Zeige nur Eintragungen mit Zweigen/Markierungen" msgid "Show linenumber&s" msgstr "Zeige Zeilen&nummern" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Zeige Log" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Zeige Log &vor Umbenennung/Kopieren" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Zeige Log von %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Zeige Log des Submoduls" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Zeige Log dieses Ordners" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Zeige Log..." -#. Resource IDs: (96) +#. Resource IDs: (1535) 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: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Zeige geänderte Dateien im Arbeitsbaum" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Zeigt die nächste Änderung der gewählten Eintragung\nZeige nächste" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Den ältesten Knoten oben anzeigen" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Verberge/Zeige die Zeilenunterschiede\nVerbirgt oder zeigt die Zeilenunterschiede" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Verberge/Zeige die Navigationsleiste\nVerbirgt oder zeigt die Navigationsleiste" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Verberge/Zeige die Statusleiste\nVerbirgt oder zeigt die Statusleiste" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Verberge/Zeige die Statusleiste\nVerbirgt oder zeigt die Statusleiste" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Verberge/Zeige die Werkzeugleiste\nVerbirgt oder zeigt die Werkzeugleiste" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Zeige original Zeilennummer" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Zeigt die vorherige Änderung der gewählten Eintragung\nZeige vorherige" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Revisionseigenschaften zeigen" @@ -9227,7 +9364,7 @@ msgstr "Revisionseigenschaften zeigen" msgid "Show shortcut &keys in ScreenTips" msgstr "Zeige &Tastenkürzel in Hinweisen" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9237,7 +9374,7 @@ msgstr "Leerzeichen und Zeilenumbrüche hervorheben\nNichtdruckbare Zeichen anze msgid "Show status of subrepositories in parent folders" msgstr "Zeige Status von Subrepositories in Eltern-Verzeichnissen" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Ersetzt Teile des Refnamens durch Symbole" @@ -9249,45 +9386,43 @@ msgstr "Zeige un&modifizierte Dateien" msgid "Show un&versioned files" msgstr "Zeige un&versionierte Dateien" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Anzeigen/Verbergen" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Zeige %1!d! ref(s), %2!d! ref(s) markiert" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Zeige %ld Revision(en), von Revision %s bis Revision %s - %ld Revision(en) ausgewählt, %ld Datei(en) ausgewählt\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Zeigt eine graphische Darstellung der Zweige/Marken" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Zeigt alle Dateien, die sich seit der letzten Aktualisierung lokal oder im Projektarchiv geändert haben." +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "Zeigt alle Dateien, die sich seit der letzten Eintragung geändert haben." -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Zeigt Informationen über TortoiseGit an" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Zeigt die Referenz-Log" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Zeigt das Aktionslog im Standard Texteditor an" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Zeigt das Log der gewählten Datei/Ordner" @@ -9299,7 +9434,7 @@ msgstr "Si&gnieren" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "Signifikante Beiträge von: (betrachten Sie das Git Repository für eine vollständige Liste)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Silberner Stil" @@ -9307,20 +9442,20 @@ msgstr "Silberner Stil" msgid "Since" msgstr "Seit" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Größe" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Überspringen" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Überspringe Patch: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Skip worktree" @@ -9328,23 +9463,23 @@ msgstr "Skip worktree" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Skip worktree (\"Locked\" in TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Übersprungen" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Fehlendes Ziel übersprungen" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Gleiten" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Intelligenter Tabulator" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Soft" @@ -9352,13 +9487,13 @@ msgstr "Soft" msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lasse Arbeitsbaum und Index unbehelligt" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Einige Dateien wurden außerhalb von TortoiseGitMerge geändert.\nWollen Sie die Änderungen laden?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9372,7 +9507,7 @@ msgstr "Nach Anzahl der Eintragungen sortieren" msgid "Sort tag list in reversed order" msgstr "Sortiere Markierungsliste in umgekehrter Reihenfolge" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9382,49 +9517,53 @@ msgstr "Legt fest, wie viele Einträge in der Liste der letzten Logmeldungen ges msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Zeilen splitten" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Teile aktives Fenster auf\nAufteilen" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Zusammenfügen" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "Zusammenfassen (mit Eintragung darunter)" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Gestapelte Balken" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Gestapelte Linien" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Start (FastFwd)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Starte pflücken" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Start Eintragung" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Neuaufbau starten" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Starte bisect Modus..." @@ -9432,7 +9571,7 @@ msgstr "Starte bisect Modus..." msgid "Start registry editor" msgstr "Registrierungseditor starten" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Started einen Git-Server mit dem git-Protokoll" @@ -9444,39 +9583,47 @@ msgstr "Stash" msgid "Stash &Message" msgstr "Stash Log-&Meldung" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Stash anwenden" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Stash anzeigen" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Stash Pop" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Stash speichern" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Stash-Operation läuft..." +#. Resource IDs: (2705) +msgid "State" +msgstr "Status" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statisch" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistik" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Status" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "Statusleiste" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Statuszeilenkonfiguration" @@ -9488,32 +9635,32 @@ msgstr "Status- und Aktionsfarben" msgid "Status cache" msgstr "Pufferspeicher" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Statuspuffer nur für einen Ordner mit rekursiv überlagerten Symbolen." -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Statuspuffer in einem externen Prozess. Überlagertes Symbole können rekursiv angezeigt werden." -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Statuspuffer nur für einen Ordner. Keine rekursiv überlagerten Symbole." -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Stoppt den bisect Modus" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "Speichert den Pfad der Datei für einen späteren Vergleich per Rechtsklick. Halten Sie die Strg Taste gedrückt, um den letzten gespeicherten Pfad zu entfernen." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Strategie" @@ -9521,15 +9668,15 @@ msgstr "Strategie" msgid "Strip lines starting with \"#\" in commit message" msgstr "Entferne Zeilen in Eintragenachricht, die mit \"#\" starten" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Stil" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Betreff" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Betreff:" @@ -9537,7 +9684,7 @@ msgstr "Betreff:" msgid "Submodule" msgstr "Submodul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "Submodul(e) &aktualisieren..." @@ -9545,7 +9692,7 @@ msgstr "Submodul(e) &aktualisieren..." msgid "Submodule Add" msgstr "Submodul hinzufügen" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Submodul hinzufügen..." @@ -9553,15 +9700,15 @@ msgstr "Submodul hinzufügen..." msgid "Submodule Diff" msgstr "Submodul vergleichen" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Submodul(e) einrichten" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Submodul(e) Synchronisieren" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Submodul(e) aktualisieren" @@ -9569,7 +9716,7 @@ msgstr "Submodul(e) aktualisieren" msgid "Submodule Update Options" msgstr "Submodul Aktualisierungs-Optionen" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9584,15 +9731,15 @@ msgstr "Submodul des Projekts:" msgid "Submodules" msgstr "Submodule" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Erfolgreich" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Wechseln" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Wechsle %s zu %s, Revision %s" @@ -9601,43 +9748,43 @@ msgstr "Wechsle %s zu %s, Revision %s" msgid "Switch To" msgstr "Wechseln zu" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Wechsle zum vorherigen Fenster\nvorheriges Fenster" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Wechseln zwischen Einzel- und Doppelfenster Ansicht" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Zwischen Einfenster- und Zweifenstersicht umschalten\nZwischen Einfenster- und Zweifenstersicht umschalten" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Linke und Rechte Ansicht tauschen" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Vertauscht die Inhalte des rechten und des linken Fensters\nTauscht die Fenster" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Wechsle zum nächsten Dokument" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Wechsle zum nächsten Fenster\nnächstes Fenster" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Wechsle zum vorherigen Dokument" @@ -9645,19 +9792,19 @@ msgstr "Wechsle zum vorherigen Dokument" msgid "Switch/Checkout" msgstr "Wechseln" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Wechseln zu" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Wechseln zu ausgewählter Revision..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Den Arbeitsbaum zu anderem Zweig/anderer Marke wechseln" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Tausche Links <-> Rechts" @@ -9669,23 +9816,23 @@ msgstr "Ref-Namen durch Symbole abkürzen" msgid "Symlink" msgstr "Symlink" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Synchronisiert Projektarchive, inklusive Versenden, Aktualisieren, Patches mailen usw." -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sync..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "System" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "System im Offline-Modus. Prüfen Sie dies im Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9695,11 +9842,11 @@ msgstr "System Registry Einträge wurden gelöscht und die INI Datei (falls vorh msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" @@ -9715,7 +9862,7 @@ msgstr "Tab Platzhalter" msgid "Tab size:" msgstr "Tab Größe:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Markierung" @@ -9723,16 +9870,16 @@ msgstr "Markierung" msgid "Tag (FF)" msgstr "Markierung (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Markierungsinformationen" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Arbeitsbaum als %s markiert" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Markierungen" @@ -9740,11 +9887,11 @@ msgstr "Markierungen" msgid "Tags:" msgstr "Markierungen:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Aufgaben" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Werkzeugfläche" @@ -9756,11 +9903,11 @@ msgstr "Temporäre Dateien (inklusive Gravatar-Bilder)" msgid "Test" msgstr "Test" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Nur testen" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Text Dateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*||" @@ -9768,13 +9915,19 @@ msgstr "Text Dateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*||" msgid "Thai" msgstr "Thai" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "Die Archivkonfiguration wurde geändert.\nMöchten Sie die Änderungen speichern?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "Der Anzahl Wert für die \"Letzte N\"-Optionen.\nMuss > 0 sein" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9782,64 +9935,78 @@ msgid "" "Do you really want to delete it?" msgstr "Der Zweig \"%s\" ist ein entfernter Zweig.\n\nMöchten Sie diesen wirklich löschen?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Die Stück-Größe stimmt nicht mit der Anzahl hinzugefügter/gelöschter Linien überein!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "The Log-Meldung darf nicht leer sein." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Der \"Credential helper\" \"%s\" existiert bereits.\nMöchten Sie es überschreiben?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "Der \"Credential helper\" wurde geändert.\nMöchten Sie die Änderungen speichern?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "Der aktuelle Arbeitsbaum ist nicht sauber.\nMöchten Sie git stash ausführen?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "Die Standard-Limitation der Log-Eintragungen, wenn Sie den Log-Meldungen Dialog öffnen.\nBeachten Sie: Um alle Log-Meldungen anzuzeigen,\nöffnen Sie auf dem \"Von\"-Datum-Element das Kontextmenü und wähnen \"Keine Limitierung\"." + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Die Vergleichsoperation wurde auf Grund eines Fehlers beendet:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "Die eingegebene Quell-Referenz ist nicht eindeutig.\nSie müssen die Quell-Referenz eindeutig angeben (z.B. durch anfügen von \"refs/heads/\" als Prefix für Zweige oder \"refs/tags/\" für Markierungen)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "Der geholte Zweig kann direkt auf den aktuellen Zweig angewendet werden (fast-forward).\n\nZusammenführen oder den \"Neu aufbauen\" Dialog trotzdem öffnen?" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Die Datei %s existiert nicht!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Die Datei %s wurde in der Patch-Datei nicht gefunden!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Die Datei \"%s\" existiert im Arbeitsbaum nicht.\nMöchten Sie eine andere Datei zum Vergleichen wählen?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9848,15 +10015,15 @@ msgid "" "Do you want to remove the file?" msgstr "Die Datei\n%s\nist leer.\nMöchten Sie die Datei löschen?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Die Datei ist zu groß" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Die Datei ist zu groß, um sie zu öffnen." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9864,7 +10031,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Die Datei\n%s\nexistiert bereits! Möchten Sie sie wirklich überschreiben?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9872,14 +10039,14 @@ msgid "" "is not a valid text file!" msgstr "Die Datei\n%s\nist keine gültige Textdatei!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Der Ordner %s\nenthält nicht versionierte und/oder veränderte Dateien. Wollen Sie ihn trotzdem löschen?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9888,78 +10055,78 @@ msgid "" "Would you like to create it first?" msgstr "Der Ordner\n%s\nexistiert nicht.\nMöchten Sie ihn erstellen?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Das Aktionsskript gab eine Fehlermeldung zurück:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Das Bild kann nicht angezeigt werden." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Der COM-Anbieter für das Fehlerverfolgungssystem konnte nicht angelegt werden. Bitte prüfen Sie ob er korrekt installiert ist." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Der COM-Anbieter für das Fehlerverfolgungssystem konnte die Parameter nicht validierenn" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Die Angabe der neuen Datei wurde in Zeile %d erwartet!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Die Zeilennummer muss zwischen %d und %d liegen." -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "Der lokale Zweig \"%s\" kann nicht \"fast-forward\" zum entfernten Zweig \"%s\" fortgeschrieben werden." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "Die Namen für den lokalen und entfernten Zweig sind leer.\nFortfahren?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "Der Name des lokalen Zweiges/der lokalen Markierung ist leer. Dies führt zu einer Löschung im entfernten Projektarchiv.\nFortfahren?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Die maximale Anzahl im Aktionslog aufzubewahrender Zeilen.\nDarüber hinausgehende Zeilen löschen die ältesten Einträge aus der Datei." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Die Operation ist fehlgeschlagen." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Die Parameter '/path' und '/pathfile' schließen sich gegenseitig aus.\nSie dürfen nur einen von beiden angeben." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "Der Patch kann nicht sauber auf %s angewendet werden und keine Versionsinformation ist verfügbar.\nDas Patchen der Datei ist nicht möglich." -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9969,7 +10136,7 @@ msgid "" "do not match!" msgstr "Die Patchdatei scheint veraltet zu sein! Die Zeile\n%s\nund die Zeile\n%s\nstimmen nicht überein!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9980,7 +10147,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Der Pfad/die URL, die Sie eingegeben haben, ist unter Windows nicht zulässig!\nSie können es versuchen, müssen aber mit Folgefehlern rechnen.\n\nEine gültige Pfadangabe unter Windows darf keine '<<>|\"*:' oder einen der folgenden Gerätenamen enthalten:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nWollen Sie trotzdem weitermachen?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9991,36 +10158,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Der Pfad\n%s\nstimmt nicht mit den Pfaden in der Patchdatei überein.\nTortoiseGitMerge hat herausgefunden, dass der Pfad\n%s\nbesser übereinstimmt. Soll der gefundene Pfad verwendet werden?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Der Prozess befindet sich noch in der Ausführung.\nSind Sie sicher, dass Sie abbrechen möchten?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "Der reguläre Ausdruck ist ungültig.\nBitte geben Sie einen gültigen regulären Ausdruck ein." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Das Archiv \"%s\" existiert bereits.\nMöchten Sie es überschreiben?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "Der entfernte Zweig wurde nicht geändert.\n\nMöchten Sie den \"Neu aufbauen\" Dialog trotzdem öffnen?" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Das Projektarchiv wurde erfolgreich erstellt." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Die gewählte Datei enthält noch einen oder mehrere Konfliktmarken.\nSind Sie sicher, dass Sie diesen Konflikt als 'aufgelöst' markieren wollen?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10028,7 +10202,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "Das Submodul \"%s\" enthält nicht eingetragene Änderungen.\nDurch das Eintragen des Superprojektes können diese Änderungen nicht versioniert bzw. in das Submodul eingetragen werden.\nMöchten Sie die Änderungen in das Submodul eintragen oder die nicht eingetragenen Änderungen ignorieren?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10037,7 +10211,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Das Zielverzeichnis\n%s\nist ein besonderer Ordner und sollte nicht als Arbeitsbaum-Wurzel verwendet werden!\nSind Sie sicher, dass Sie ein Git Repository in diesem Verzeichnis erstellen möchten?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10046,26 +10220,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Das Zielverzeichnis\n%s\nist nicht leer!\nSind Sie sicher, dass Sie einen Git Arbeitsbaum dort erstellen möchten?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "Der Text ist identisch, aber die Dateien stimmen nicht überein!\nFolgende Unterschiede wurden gefunden:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Die Zeit in Sekunden, nach der die Analyse der ausgewählten Dateien\r\nangehalten wird. Ein kleiner Wert stellt die Liste zum automatischen\r\nVervollständigen schneller zur Verfügung, wird aber manchmal nicht\r\nalle Dateien analysieren." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Die zwei gewählten URLs haben nicht die gleiche Basis.\nEs ist nicht möglich, die Logmeldungen dazwischen anzuzeigen." -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10075,34 +10249,34 @@ msgstr "Das Arbeitsverzeichnis ist nicht sauber und enthält Änderungen welche msgid "Their file:" msgstr "Deren Datei:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Deren" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Es gibt Änderungen oder nicht-versionierte Objekte in einem oder mehreren Submodulen.\nDiese Dateien werden für eine Eintragung nicht aufgelistet. Sie müssen diese Dateien in den Submodulen eintragen." -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Derzeit sind %d überlagerte Symbole neben den von Tortoise verwendeten installiert." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Es gibt weitere bearbeitbare Ansichten.\nWelche Ansicht möchten Sie speichern?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Es stehen keine COM-Anbieter für das Fehlerverfolgungssystem zur Verfügung." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10111,85 +10285,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Es gibt immer noch nicht aufgelöste Konflikte in Zeile %d!\nSie sollten diese Konflikte vor dem Speichern auflösen.\nWollen Sie die Datei mitsamt den Konflikten speichern?\nWenn Sie JA wählen, müssen Sie die Konflikte von Hand in einem anderen Editor auflösen!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Die Änderungen sind noch nicht gespeichert!\nWollen Sie Ihre Änderungen speichern?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Es gibt nichts hinzuzufügen. Alle Dateien und Ordner befinden sich entweder bereits unter Versionskontrolle oder werden bzw. der globalen Ausschlussmuster ignoriert." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Thesaurus" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Diese wurden nach den derzeit geöffneten Dokumenten gespeichert und enthalten Änderungen, die vorgenommen wurden, bevor die Anwendung geschlossen wurde." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Dieses Feld wird benötigt und darf nicht leer sein." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Dies ist keine gültige URL.\nBitte geben Sie hier eine URL ein." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Dies ist kein gültiger Pfad!\nEine gültige Pfadangabe unter Windows darf keine '<<>|\"*:' oder einen der folgenden Gerätenamen enthalten:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "Diese Operation kann nicht gestartet werden solange der Aktionslog noch Eintragungen lädt." -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Dieses Programm wurde mit dem fehlenden Export %s in der Datei %s gelinkt. Dieser Computer hat eventuell eine nicht kompatible Version von %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Dieses Programm benötigt die Datei %s, welche nicht auf diesem System gefunden wurde." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Diese Eigenschaft ist nur für Dateien und nicht für Ordner zugelassen." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "Der Name des entfernten Repositories kollidiert mit dem refspec eines anderen entfernten Repositories.\nBitte benutzen Sie einen anderen Namen" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Diese Aufgabe erfordert einen sauberen Arbeitsbaum." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Die Aufzeichnung der Befehle, die Sie in dieser Anwendung verwendet haben wird gelöscht und die Standardeinstellungen für sichtbare Befehle auf Menüs und Werkzeugleisten werden wieder hergestellt. Individuelle Anpassungen werden nicht überschrieben. Sind Sie sicher, dass Sie das wollen?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Drei-Wege Vergleich" @@ -10205,14 +10379,14 @@ msgstr "&Horizontal anordnen" msgid "To" msgstr "Bis" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "Um die Aktualisierung falscher Markierungen zu verhindern, sofern dies kein offizielles entferntes Repository ist, wird empfohlen die Aktualisierung von Markierungen für dieses Repository zu deaktivieren.\nMöchten Sie die Aktualisierung von Markierungen deaktivieren?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10224,13 +10398,13 @@ msgstr "Um temporäre Dateien zu löschen, sollten Sie sicherstellen, dass keine msgid "To:" msgstr "Bis:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Schalte einseitige/zweiseitige Anzeige\nSchalte einseitige/zweiseitige Anzeige" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Filter an/abschalten" @@ -10242,11 +10416,11 @@ msgstr "Werkzeugleiste" msgid "Toolbar Name" msgstr "Werkzeugleistenname" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Werkzeugleistenoptionen" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Interner Fehler der Werkzeugleiste. Bitte wenden Sie sich an den Anbieter der Anwendung." @@ -10262,16 +10436,16 @@ msgstr "Werkzeuge" msgid "Tools:" msgstr "Werkzeuge:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10281,20 +10455,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit hat entdeckt, dass die Datei \"%s\" nicht existiert, aber im Index als \"Hinzugefügt\" vorgemerkt ist.\nDer Eintragen-Dialog unterstützt dies nicht.\n\nMöchten Sie die Datei vom Index entfernen?" +"Do you want to restore or remove it from the index?" +msgstr "TortoiseGit hat entdeckt, dass die Datei \"%s\" nicht existiert, aber im Index als \"Hinzugefügt\" oder \"Verändert\" vorgemerkt ist.\nDer Eintragen-Dialog unterstützt dies nicht.\n\nMöchten Sie die Datei vom Index wiederherstellen oder entfernen?" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit hat ähnliche Dateinamen gefunden. Wollen Sie, dass die Dateien: %s\nebenfalls umbenannt werden?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit wird die folgenden überlagerten Symbole nicht anzeigen: %s" @@ -10303,18 +10477,18 @@ msgstr "TortoiseGit wird die folgenden überlagerten Symbole nicht anzeigen: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame wurde bereits für das Projektarchiv \"%s\" initialisiert. Es kann nicht zur Laufzeit auf ein anderes Archiv (\"%s\") gewechselt werden." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10330,7 +10504,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10338,7 +10512,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Ein Bildvergleicher, Teil von TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10352,16 +10526,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10370,18 +10544,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge kann diesen Patch nicht verarbeiten. Der Dateiname \"%s\" ist im Patch mehrfach enthalten." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10420,11 +10594,11 @@ msgstr "Verfolgen" msgid "Tracked Remote Branch:" msgstr "Verfolgter entfernter Zweig:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Verfolgter entfernter Zweig" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Übertragung bei %s" @@ -10433,39 +10607,35 @@ msgstr "Übertragung bei %s" msgid "Transparent &color..." msgstr "&Transparente Farbe..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "rechts abschneiden/bereinigen" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Versuchen Sie ein 'Aufräumen'. Falls dies nicht hilft, müssen Sie von neuem Auschecken." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Nochmals" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Türkisch" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Einstellungen für TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Typ" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Typ:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL und Verzeichnis dürfen nicht leer sein." @@ -10489,24 +10659,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Konnte Mail Unterstützung nicht laden." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Kann Befehl nicht verarbeiten, weil der Server beschäftigt ist." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Konnte von %1 nicht lesen, es ist von jemand anderem geöffnet." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Konnte 'nur Schreiben' Eigenschaft nicht lesen." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10514,91 +10684,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Kann den Pfad des Arbeitsbaumes nicht wieder herstellen!\nDas kann passieren, wenn die Datei umbenannt wurde.\nBitte rufen Sie den Log-Dialog für diese Datei alleine auf\nund machen Sie die Änderungen rückgängig." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Konnte 'nur Lesen' Eigenschaft nicht beschreiben." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Konnte auf %1 nicht schreiben, es ist entweder schreibgeschützt oder von jemand anderem geöffnet." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Abwählen" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Rückgängig" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "%d Aktionen rückgängig" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Eine Aktion rückgängig" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Hinzufügen rückgängig..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Letzte Aktion rückgängig machen\nRückgängig" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Letzte Änderungen rückgängig machen\nRückgängig" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Unerwartetes Dateiformat." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "Markierung \"skip-worktree\" und \"assume-unchanged\" entfernen" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Ausklappen" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Unformatierter Text\nText ohne Formatierung" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Standard-&Diff der HEAD Revisionen" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Unbekannt" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Unbekannte Tiefe" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Markierung des Blocks aufheben" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Nicht aufgelöste Konflikte!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "Beobachteten entfernten Zweig nicht mehr beobachten" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Unbenannt" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "unversioniert" @@ -10606,7 +10780,7 @@ msgstr "unversioniert" msgid "Unversioned files mark parent folder as modified" msgstr "Nicht versionierte Dateien markieren Elternordner als modifiziert" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Hebe Versionierung von %s auf" @@ -10619,23 +10793,23 @@ msgstr "Hoch" msgid "Update" msgstr "Aktualisieren" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Ref aktualisieren" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Submodule aktualisieren" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Aktualisiert" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Aktualisiere ActiveX Objekte" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Aktualisiere Index" @@ -10647,30 +10821,26 @@ msgstr "Verwende &Standardbild" msgid "Use &one-pane view as default for 2-file diff" msgstr "Verwende &Einfenstersicht als Standard für Zweiwegevergleich" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Verwende &anderen Textblock" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Verwende 'meinen' Textblock" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Verwende 'meinen' Textblock vor 'deren'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Verwende 'deren' Textblock" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Verwende 'deren' Textblock vor 'meinem'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Verwende Blöcke" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Beachte HTTP Pfadkomponente" @@ -10691,15 +10861,15 @@ msgstr "Benutze Thin-&Pack (für langsame Netzwerkverbindungen)" msgid "Use Unified Diff from &clipboard" msgstr "Standard Diff aus der &Zwischenablage nehmen" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Benutzen Sie einen anderen Namen oder die \"Erzwingen\"-Option zum Überschreiben." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Benutzen Sie einen anderen Namen oder die \"Überschreibe Zweig\"-Option." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10709,7 +10879,7 @@ msgstr "Verwende gesamten Inhalt der linken Seite\nVerwende linke Datei" msgid "Use block from left before right" msgstr "Verwende linken Block vor rechtem" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10719,25 +10889,25 @@ msgstr "Verwende Block von der linken Seite vor Block aus der rechten Seite\nVer msgid "Use block from right before left" msgstr "Verwende rechten Block vor linkem" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Verwende Block von der rechten Seite vor Block aus der linken Seite\nVerwende rechten Block vor linkem" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Verwende beide Blöcke (Diesen zuerst)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Verwende beide Blöcke (Diesen zuletzt)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "Benutze konfigurierten Server" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Verwende linken Block" @@ -10753,15 +10923,15 @@ msgstr "Benutze die \"Lokale Zweig\"-Farbe für den aktiven Zweig" msgid "Use recycle bin when reverting" msgstr "Verwende Papierkorb bei Rückgängig" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Verwende reguläre Ausdrücke" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Verwende den rechten Block" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Leerzeichen verwenden" @@ -10769,61 +10939,61 @@ msgstr "Leerzeichen verwenden" msgid "Use system locale for date/time" msgstr "Systemvorgabe für Datum/Zeit verwenden" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Verwende '&Meinen' Textblock" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Verwende '&Deren' Textblock" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Verwende 'M&einen' Textblock vor 'Deren'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Verwende Textblock aus 'Meine' vor 'Deren'\nErst 'Mein' Textblock, danach 'Deren'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Verwende Textblock aus 'Meine'\nVerwende 'Meinen' Textblock" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Verwende 'De&ren' Textblock vor 'Meinem'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Verwende Textblock aus 'Deren' vor 'Meine'\nErst 'Deren' Textblock, danach 'Meiner'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Verwende Textblock aus 'Deren'\nVerwende 'Deren' Textblock" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Verwende Block aus der linken Seite\nVerwende linken Block" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Verwende &diesen Textblock" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "Benutzt die aktuelle Zeit für die Eintrage- und den Autorenzeitstempel der Eintragung." -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10831,7 +11001,7 @@ msgid "" "%s" msgstr "Den gefundenen Pfad verwenden.\nDen Patch anwenden auf\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10843,19 +11013,19 @@ msgstr "Den ursprünglichen Pfad verwenden.\nDen Patch anwenden auf\n%s" msgid "Use this" msgstr "Verwende dies" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Verwende die &ganze Datei" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Verwende diesen Block links" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Verwende &gesamte andere Datei" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Kann benutzt werden, um Änderungen mit der letzten Eintragung zu verbinden." @@ -10871,11 +11041,11 @@ msgstr "Benutzer-Info" msgid "User Name:" msgstr "Benutzername:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Abbruch durch Anwender" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10885,11 +11055,11 @@ msgstr "Benutzername und E-Mail müssen vor einer Eintragung gesetzt sein.\nMöc msgid "User&name:" msgstr "User&name:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Benutzername:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10908,7 +11078,7 @@ msgid "" "/line:" msgstr "Gültige Kommandozeilenparameter sind:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Wert" @@ -10916,24 +11086,24 @@ msgstr "Wert" msgid "Version" msgstr "Version" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Version 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Version 1 (Neuere Eintragezeit)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Version 2 (Basis)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Version 2 (Basis) (Neuere Eintragezeit)" @@ -10941,11 +11111,11 @@ msgstr "Version 2 (Basis) (Neuere Eintragezeit)" msgid "Version Information" msgstr "Versionsinformation" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Version:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versioniert" @@ -10957,23 +11127,27 @@ msgstr "Viatnamnesisch" msgid "View" msgstr "Ansicht" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr ".tgitconfig ansehen" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "Leisten" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Patch anzeigen" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Patch zeigen>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Betrachte Revision eines Pfades im &Web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Betrachte mit alternativem Editor" @@ -10985,11 +11159,11 @@ msgstr "Systemweite gitconfig ansehen" msgid "Visit our website" msgstr "Besuchen Sie unsere Webseite" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11000,7 +11174,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ACHTUNG:\nÄndern Sie diese Einstellungen nur, wenn Sie sich absolut sicher sind, was Sie tun!\nZum Rücksetzen auf den Standard, löschen Sie einfach den Wert." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Warten" @@ -11008,7 +11182,7 @@ msgstr "Warten" msgid "Wait for the script to finish" msgstr "Warte auf Beendigung des Skripts" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Warte auf Eingabe" @@ -11016,15 +11190,15 @@ msgstr "Warte auf Eingabe" msgid "Walk Be&haviour" msgstr "&Traversierungsart" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Warnung" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Warnung!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11032,7 +11206,7 @@ msgid "" "Do you really want to continue?" msgstr "Warnung: \"%s\" wird permanent gelöscht. Dies kann NICHT rückgängig gemacht werden!\n\nMöchten Sie wirklich fortfahren?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11040,56 +11214,56 @@ msgstr "Web" msgid "Western European" msgstr "West Europa" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Falls aktiv, halten Sie die Umschalttaste gedrückt, damit die TortoiseGit Kontextmenüs für nicht versionierte Pfade angezeigt werden." -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Beim Anwenden des Patches, Leerzeichen-Änderungen in Kontext-Zeilen ignorieren (falls nötig)" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Wenn der Prozessdialog während ein Git-Prozess läuft geschlossen wird, hole eine Bestätigung vor dem Töten ein" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Falls aktiviert, fügt TortoiseGit Einträge zum Kontextmenü bei Drag'n'Drop Aktionen hinzu" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Wenn diese Option aktiviert wird, dann werden größere Versionssnummers zuerest angezeigt. Dies kann nützlich sein, wenn neuere Versionen häufiger genutzt werden." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Aktivieren Sie diese Option, damit die versionierten Objekte im Übertragen-Dialog automatisch markiert werden." -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Wenn sich der Patch nicht anwenden lässt, falle auf das 3-Wege-Zusammenführen zurück sofern der Patch die Identitäten der Referenzierten Objekte enthält und diese lokal vorliegen." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "Wenn Sie einen URL eingeben wird der Name des entfernten Repositories automatisch mit \"origin\" gefüllt sofern dieser noch leer ist." -#. Resource IDs: (96) +#. Resource IDs: (1533) 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" @@ -11099,15 +11273,15 @@ msgid "" "authentication and/or encryption." msgstr "Solange der Dämon läuft, wird das gesamte Repository ohne Authentifizierung/Verschlüsselung im Netzwerk freigegeben." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Whitespace-Änderungen (Tabs, Leerzeichen)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Leerzeichen" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Fensterposition" @@ -11115,15 +11289,15 @@ msgstr "Fensterposition" msgid "Windows" msgstr "Fenster" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11167,11 +11341,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "Innerhalb einer Datei:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Innerhalb der Datei" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Arbeitsbaum" @@ -11179,29 +11353,25 @@ msgstr "Arbeitsbaum" msgid "Working Tree Path:" msgstr "Pfad des Arbeitsbaumes:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Arbeitsbaum-Änderungen" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Lange Zeilen umbrechen" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Lange Zeilen am rechten Rand der Ansicht umbrechen\nLange Zeilen umbrechen" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Ja" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Alle Ja" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Sie haben bereits die neueste Version installiert." @@ -11211,51 +11381,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Sie können in diesem Dialog bestimmte überlagerte Symbole deaktivieren.\nDeaktivierte Symbole belegen keinen der dafür reservierten Plätze und lassen anderen Shell-Erweiterungen die Chance, ihre eigenen überlagerten Symbole anzuzeigen." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Sie können nur Bitmaps der Größe (%d x %d) einfügen!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Sie können nicht mehr als %d Werkzeugleisten definieren!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Sie können diese Eigenschaft nicht auf Ordner setzen, nur auf Dateien!\nWenn Sie die Eigenschaft auf alle Dateien dieses Ordners setzen wollen,\nmarkieren Sie die 'Rekursiv' Option." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Sie können nicht den Ref-Typ mit einer Umbenennung verändern." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "Sie haben eine alte Version von Git für Windows (https://msysgit.github.io/) installiert, die Sicherheitslücken aufweist.\n\nSie sollten ein Upgrade auf 1.9.5+ in Erwägung ziehen." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Sie haben \"nicht-&versionierte Objekte einbeziehen\" angewählt.\nDies beinhaltet den \"git clean -fd\" Aufruf, der ignorierte Dateien/Verzeichnisse löscht ohne den Papierkorb zu benutzen," -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "Sie haben geändert Blöcke makiert. Wie sollen die Blöcke gespeichert werden?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Sie haben Eigenschaften verändert, ohne sie zu speichern.\nWollen Sie das jetzt tun?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11263,67 +11433,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Sie haben %d Einträge für den Vergleich gewählt. Für jeden dieser Einträge wird eine neue Instanz des Vergleichsprogramms gestartet. Wollen Sie wirklich die Unterschiede von so vielen Objekten gleichzeitig anzeigen?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Sie haben keine Fehlerverfolgungs-ID angegeben\nSind Sie sicher, dass Sie ohne ID übertragen wollen?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Sie haben keine Signed-Off-By eignegeben!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Sie haben einige Dateien als \"Wiederherstellen nach Eintragen\" markiert.\nMöchten Sie diese jetzt wiederherstellen? Sie können dabei alle Änderungen in den Dateien, die Sie nach der Markierung erstellt haben, verlieren." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Sie können bis zu %d Werkzeuge definieren" -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Sie müssen eine Log-Meldung eingeben" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Sie müssen Ihren Rechner neu starten, damit die Änderungen wirksam werden." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Sie müssen einen Dateien für die .zip-Datei eingeben!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Sie haben ein Verzeichnis gewählt.\nExportieren ist nur in eine .zip-Datei möglich." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Sie haben eine nicht versionierte Datei gewählt.\nDie Datei wird vor dem Übertragen zur Versionskontrolle hinzugefügt." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Sie sollten einen Text eingeben!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Sie sollten ein Bild wählen!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Sie haben den Symbolsatz von %s in %s geändert.\nDie Änderungen werden erst wirksam, nachdem Sie den Rechner neu gestartet oder sich ab- und wieder angemeldet haben!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11333,7 +11503,7 @@ msgstr "Ihre zuletzt eingegebenen Logmeldungen wurden gespeichert.\nKlicken Sie msgid "Your version is:" msgstr "Ihre Version ist:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Ihre Version ist: %d.%d.%d.%d" @@ -11343,10 +11513,10 @@ msgid "Zip File" msgstr "Zip-Datei" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Ver&kleinern" +msgid "Zoo&m out\t-" +msgstr "Ver&kleinern\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Skalieren" @@ -11358,80 +11528,80 @@ msgstr "Ver&größern" msgid "Zoom &Out" msgstr "Ver&kleinern" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Skalierung 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Vergrößern\nVergrößern" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Verkleinern\nVerkleinern" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Ver&größern" +msgid "Zoom i&n\t+" +msgstr "Ver&größern\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Vergrößern" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Verkleinern" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Auf Fenstergröße skalieren" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Auf Fensterhöhe skalieren" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Auf Fensterbreite skalieren" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Standard]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[nicht zugewiesen]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "\"%s\" enthält ein Git Repository. Es wird nicht ohne weitere Schritte als Submodul funktionieren.\nMöchten Sie den .git-Verzeichniseintrag löschen und alle Dateien dem übergeordneten Repository hinzufügen oder das Repository als separates Repository in einem Unterverzeichnis behalten?" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" enthält ein Git Submodul. Es ist unwahrscheinlich, dass dieses im Zielverzeichnis noch funktionieren wird.\nMöchten Sie den .git-Verzeichniseintrag löschen und alle Dateien dem übergeordneten Repository hinzufügen oder dieses mögliche Probleme ignorieren und den .git Verzeichniseintrag behalten?" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" ist ungültig." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" ist keine git Arbeitsbaum" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11445,7 +11615,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "füge \"cherry picked from\" hinzu" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "Hinzugefügt" @@ -11453,7 +11623,7 @@ msgstr "Hinzugefügt" msgid "added files" msgstr "Hinzugefügte Dateien" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "eine unbenannte Datei" @@ -11461,14 +11631,19 @@ msgstr "eine unbenannte Datei" msgid "and support the developers" msgstr "und unterstützen Sie die Entwickler" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "assume-valid" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "Autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "Autor (>= 0,5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "basiert auf TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11501,30 +11676,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "Eintragungen" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "Konflikt" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "Kopiert von\r\n%s - revision %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "Tag" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "Gelöscht" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "Vergleichen über Standard-Input-Pipe" @@ -11536,7 +11711,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "E-Mail Einstellungen" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11545,16 +11720,16 @@ msgid "" "%s" msgstr "%s\nnach %s\nexportiert" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "extern" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git wurde nicht sauber beendet (Exit-Code: %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "Ignoriert" @@ -11562,15 +11737,15 @@ msgstr "Ignoriert" msgid "include &untracked" msgstr "nicht-&versionierte Objekte einbeziehen" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "Unvollständig" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "erben" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "Objekt lokal erhalten" @@ -11578,7 +11753,7 @@ msgstr "Objekt lokal erhalten" msgid "keep the file lists in English" msgstr "halte die Dateilisten in Englisch" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11587,7 +11762,7 @@ msgid "" "%s = %ld" msgstr "Zeilen: %d(+) %d(-) Dateien: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11602,11 +11777,11 @@ msgstr "Zeilen: %d(+) %d(-) Dateien: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "Zusammengeführt" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "Fehlt" @@ -11614,7 +11789,7 @@ msgstr "Fehlt" msgid "missing/deleted/replaced" msgstr "fehlt/gelöscht/ersetzt" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "Verändert" @@ -11622,7 +11797,7 @@ msgstr "Verändert" msgid "modified/copied" msgstr "geändert/kopiert" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "Monat" @@ -11630,40 +11805,44 @@ msgstr "Monat" msgid "new branch" msgstr "neuer Zweig" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nein" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "Für diesen Befehl ist keine Bechreibung verfügbar" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "Nicht versioniert" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "ohne" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "Normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "nicht gefunden" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "Behindert" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "auf %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "gepatcht" + +#. Resource IDs: (61888) msgid "pixels" msgstr "Pixel" @@ -11671,11 +11850,11 @@ msgstr "Pixel" msgid "possible or real conflict/obstructed" msgstr "möglicher oder echten Konflikt" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "Quartal" @@ -11683,35 +11862,35 @@ msgstr "Quartal" msgid "renamed" msgstr "umbenannt" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "Ersetzt" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "Durchsuche Pfad:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "skip-worktree" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "gewechselt zu\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "achten Sie auf Änderungen bei Submodulen" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "nach %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "nach %s" @@ -11720,35 +11899,35 @@ msgstr "nach %s" msgid "u&nknown changes" msgstr "&unbekannte Änderungen" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "Woche" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - für alle Windows-Benutzer" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - nur für aktuellen Benutzer" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - nur für diesen Arbeitsbaum" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - nur für aktuellen Benutzer" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - nur für diesen Arbeitsbaum" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "Jahr" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "ja" diff --git a/Languages/Tortoise_es_ES.po b/Languages/Tortoise_es_ES.po index dfa2dec78..96e991fb4 100644 --- a/Languages/Tortoise_es_ES.po +++ b/Languages/Tortoise_es_ES.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 22:23+0000\n" +"PO-Revision-Date: 2015-08-02 19:14+0000\n" "Last-Translator: strel\n" "Language-Team: Spanish (Spain) (http://www.transifex.com/projects/p/tortoisegit/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" "Language: es_ES\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -46,138 +46,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autores mostrados individualmente:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB transferidos" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 contenía un objeto no esperado." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 contiene una ruta incorrecta." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 contiene un esquema incorrecto." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 tiene un formato incorrecto." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "no se encontró %1." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "Hace %1!d! día" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "Hace %1!d! días" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "Hace %1!d! hora" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "Hace %1!d! horas" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "Hace %1!d! minuto" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "Hace %1!d! mes" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "Hace %1!d! meses" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "Hace %1!d! segundo" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "Hace %1!d! segundos" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "Hace %1!d! semana" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "Hace %1!d! semanas" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "Hace %1!d! año" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "Hace %1!d! años" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! objetos seleccionados" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "Hace %1!d! minutos" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\r\nMostrando %2!d! archivos, %3!d! submodulos y %4!d! carpetas, %5!d! objetos en total" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\r\nTamaño %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\n¿Continuar ejecutando secuencia?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -185,52 +185,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nNo se encontró el archivo.\nCompruebe que tanto archivo y ruta sean correctos" -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig o %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes transferidos" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB transferidos" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" -msgstr "%d consignas por delante \"%s\"" +msgstr "%d consignacions (commits) por delante \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d archivos cambiados" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d archivos eliminados." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d archivos restituidos a %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d archivos seleccionados, de %d archivos" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" -msgstr "%d autor(es) más activo(s) con al menos %d consignas cada uno (%d %%)" +msgstr "%d autor(es) más activo(s) con al menos %d consignaciones (commits) cada uno (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -238,78 +238,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alfa\nclic para alternar a alfa\ndoble clic para alternar de forma automática a alfa" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minuto(s) y %ld segundo(s)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld de %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - en la revisión: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Recuperada]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s en %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s necesita Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, de %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Árbol de trabajo (working tree)" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Exportados (%d) de %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Exportados de %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nNo puede parchearse limpiamente." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\n¿Quieres eliminarlo de todos modos?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -325,6 +325,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&Combinar a 3 bandas" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Abortar" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Sobre TortoiseGitBlame..." @@ -353,15 +357,15 @@ msgstr "&Añadir filtro" msgid "&Add New/Save" msgstr "&Añadir/Guardar" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Añádelo" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Añadir o quitar botones" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Añadir..." @@ -401,7 +405,7 @@ msgstr "&Asignar" msgid "&Associate double-click event with:" msgstr "&Asociar la acción doble-click con:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Auto ocultar" @@ -417,15 +421,15 @@ msgstr "&Autocargar clave Putty" msgid "&Backup original file" msgstr "&Respaldar archivo original" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Acuse" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Cambios de acuses" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Revisiones de acuses" @@ -449,7 +453,7 @@ msgstr "&Ramal:" msgid "&Browse Dir" msgstr "&Explorar Directorio" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Explorar repositorio" @@ -485,7 +489,7 @@ msgstr "&Categoría:" msgid "&Choose commands from:" msgstr "&Elegir comandos desde:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Limpiar..." @@ -509,31 +513,35 @@ msgstr "&Cerrar ventana(s)" msgid "&Command:" msgstr "&Comando:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" -msgstr "&Consigna" +msgstr "&Consignar (commit)" #. Resource IDs: (355) msgid "&Commit submodule..." -msgstr "&Consignar submódulo..." +msgstr "&Consignar (commit) submódulo..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" -msgstr "&Consigna ciega" +msgstr "&Consignar (commit) sin" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." -msgstr "&Consignar..." +msgstr "&Consignar (commit)..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Comparar revisiones" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Gráfico comprimido" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Continuar" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copiar" @@ -553,11 +561,11 @@ msgstr "&Personalizar" msgid "&Default" msgstr "&Predeterminado" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Eliminar" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Eliminar (mantener local)" @@ -565,7 +573,7 @@ msgstr "&Eliminar (mantener local)" msgid "&Delete Filter" msgstr "&Borrar filtro" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Eliminar en remoto y local" @@ -577,11 +585,11 @@ msgstr "&Detectar líneas movidas o copiadas" msgid "&Detect moved or copied lines:" msgstr "&Detectar líneas movidas o copiadas:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Dif." -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Dif. con versión anterior" @@ -593,7 +601,7 @@ msgstr "&Directorio" msgid "&Disabled" msgstr "&Deshabilitado" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Descartar" @@ -601,7 +609,7 @@ msgstr "&Descartar" msgid "&Do the same for the rest" msgstr "&Lo mismo para el resto" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Acoplado" @@ -609,11 +617,15 @@ msgstr "&Acoplado" msgid "&Don't ask me again" msgstr "&No me pregunte de nuevo" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "&No mostrar este mensaje de nuevo" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Abajo" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Descarga" @@ -621,11 +633,11 @@ msgstr "&Descarga" msgid "&Edit" msgstr "&Edita" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Editar .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Editar TODO" @@ -633,7 +645,7 @@ msgstr "&Editar TODO" msgid "&Edit Filter" msgstr "&Editar filtro" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Editar conflictos" @@ -658,10 +670,10 @@ msgid "&Enable edit" msgstr "&Habilitar edición" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "&Salir" +msgid "&Exit\tCtrl+W" +msgstr "&Salir\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportar selección a..." @@ -673,27 +685,27 @@ msgstr "&Externo" msgid "&File" msgstr "&Archivo" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Buscar" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Buscar\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Ajustar imágenes a ventana" +msgid "&Fit images in window\tF" +msgstr "&Ajustar imágenes a la ventana\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Unidades fijas" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flotante" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Seguir renombrando" @@ -705,13 +717,13 @@ msgstr "&Fuente mensajes de Reg.:" msgid "&Font:" msgstr "&Fuente:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Forzar" #. Resource IDs: (1607) msgid "&Force Rebase" -msgstr "&Forzar Reorganizar" +msgstr "&Forzar reasentado" #. Resource IDs: (1608) msgid "&From:" @@ -719,13 +731,13 @@ msgstr "&Desde:" #. Resource IDs: (2153) msgid "&Git Style Commit (--rmdir)" -msgstr "&Estilo de consigna Git (--rmdir)" +msgstr "&Estilo Git de consignación (--rmdir)" #. Resource IDs: (220) msgid "&Go to\tCtrl+G" msgstr "&Ir a\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "&Rutas cambiadas sin relación Grises" @@ -737,7 +749,7 @@ msgstr "&Verde:" msgid "&HEAD" msgstr "&CABEZA" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Ayuda" @@ -745,7 +757,7 @@ msgstr "&Ayuda" msgid "&Help Topics" msgstr "&Temas de ayuda" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Oculta" @@ -753,11 +765,11 @@ msgstr "&Oculta" msgid "&Icon Set:" msgstr "&Juego de iconos:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorar" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorar %d objetos por nombre" @@ -771,14 +783,14 @@ msgid "&Image" msgstr "&Imagen" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Información de imagen" +msgid "&Image info\tI" +msgstr "&Información de la imagen\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Sólo imagen" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importar..." @@ -790,7 +802,7 @@ msgstr "&Directorio inicial:" msgid "&Initialize submodules (--init)" msgstr "&Inicializar submódulos (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Instala" @@ -802,11 +814,11 @@ msgstr "&Saltar a la primera diferencia cuando cargue" msgid "&Keep CR" msgstr "&Mantener CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Mantener estado actual" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Etiquetas" @@ -820,7 +832,7 @@ msgstr "&Iconos grandes" #. Resource IDs: (1602) msgid "&Launch Rebase After Fetch" -msgstr "&Lanzar reorganizar después de recuperar" +msgstr "&Lanzar reasentar (rebase) después de descargar (fetch)" #. Resource IDs: (1065) msgid "&Limit search to modified lines" @@ -834,7 +846,7 @@ msgstr "&Límite:" msgid "&Line number" msgstr "&Número de línea" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Número de línea (%d - %d)" @@ -851,7 +863,7 @@ msgstr "&Ver lista" msgid "&Local Branch:" msgstr "&Ramal local:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Ramales locales" @@ -875,11 +887,11 @@ msgstr "&Animaciones del menú:" msgid "&Menu contents:" msgstr "&Contenido del menú:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Merge" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Combinar..." @@ -935,13 +947,17 @@ msgstr "&Siguiente>" msgid "&Next Page" msgstr "&Página siguiente" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&No" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Sin acciones de doble-click" #. Resource IDs: (1734) msgid "&No fetch" -msgstr "&No recuperar" +msgstr "&No descargar (fetch)" #. Resource IDs: (1702) msgid "&None" @@ -951,11 +967,11 @@ msgstr "&Nada" msgid "&Notepad2" msgstr "&Bloc de notas2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Página única" @@ -963,19 +979,15 @@ msgstr "&Página única" msgid "&Onto" msgstr "&Sobre" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Abrir" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Abrir Git para Sitio Web de Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Abrir..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -988,18 +1000,18 @@ msgid "&Overlay Icon:" msgstr "&Icono sobrepuestos:" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Imágenes superpuestas" +msgid "&Overlay images\tO" +msgstr "Superp&oner imágenes\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Contraseña:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Pega" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Escojer TODOS" @@ -1007,7 +1019,7 @@ msgstr "&Escojer TODOS" msgid "&Port:" msgstr "&Puerto:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Vista previa de impresión" @@ -1015,21 +1027,29 @@ msgstr "&Vista previa de impresión" msgid "&Print..." msgstr "&Imprimir..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "Im&primir...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Proceder" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" -msgstr "&Pull (tomar)" +msgstr "&Incorporar (pull)" #. Resource IDs: (1481) msgid "&Push all branches" msgstr "&Impulsar (push) todos las ramales" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" -msgstr "&ReConsignar" +msgstr "&ReConsignar (commit)" + +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "&Reasentar (rebase)" #. Resource IDs: (1246) msgid "&Recent messages" @@ -1043,7 +1063,7 @@ msgstr "&Recursivo" msgid "&Red:" msgstr "&Rojo:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Repetir" @@ -1059,7 +1079,7 @@ msgstr "&Refresca" msgid "&Regular Expression" msgstr "&Expresión regular" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Recordármelo más tarde" @@ -1067,7 +1087,7 @@ msgstr "&Recordármelo más tarde" msgid "&Remote Branch:" msgstr "&Ramal remoto:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "&Ramales remotos" @@ -1075,7 +1095,7 @@ msgstr "&Ramales remotos" msgid "&Remote:" msgstr "&Remota:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Quitar" @@ -1087,7 +1107,7 @@ msgstr "&Eliminar archivo del índice" msgid "&Replace" msgstr "&Reemplazar" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Explorador-Repos" @@ -1095,7 +1115,7 @@ msgstr "&Explorador-Repos" msgid "&Reset" msgstr "&Reinicializar" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Reinicializar barra de tareas" @@ -1111,25 +1131,29 @@ msgstr "&Reiniciar mis datos" msgid "&Reset to Default" msgstr "&Restablecer predeterminados" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Resuelto" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Restaura" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Restaurar el estado anterior" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "&Reintentar" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" -msgstr "&Restituir cambios de esta consigna" +msgstr "&Revertir cambios de esta consignación (commit)" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" -msgstr "&Restituir cambios de estas consignas" +msgstr "&Revertir cambios de estas consignaciones (commits)" #. Resource IDs: (65535) msgid "&SSH client:" @@ -1139,7 +1163,7 @@ msgstr "&Cliente SSH:" msgid "&Saturation:" msgstr "&Saturaciónn:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Guarda" @@ -1147,15 +1171,19 @@ msgstr "&Guarda" msgid "&Save authentication" msgstr "&Guarda autentificación" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Guardar gráfico como..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Guardar lista de archivos seleccionados a..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Guardar\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Ajustar ruta de Git" @@ -1163,7 +1191,7 @@ msgstr "&Ajustar ruta de Git" msgid "&Set upstream/track remote branch" msgstr "&Establecer ascendencia (upstream)/rastreo de ramal remoto" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Configuraciones" @@ -1183,17 +1211,17 @@ msgstr "&Motras etiquetas de texto" msgid "&Signing key ID:" msgstr "&ID de la clave de firma:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Saltar" #. Resource IDs: (1524) msgid "&Squash" -msgstr "&Machacar" +msgstr "&Compactar (squash)" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" -msgstr "&Aplastar TODO" +msgstr "&Compactar (squash) TODO" #. Resource IDs: (1616) msgid "&Start" @@ -1203,7 +1231,7 @@ msgstr "&Iniciar" msgid "&Start Group" msgstr "&Iniciar Grupo" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Guardar" @@ -1223,7 +1251,7 @@ msgstr "&Ver símbolos" msgid "&Tab size:" msgstr "&Tamaño de ficha:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Documento marcado" @@ -1231,7 +1259,7 @@ msgstr "&Documento marcado" msgid "&Tag" msgstr "&Etiqueta" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Etiquetas" @@ -1267,7 +1295,7 @@ msgstr "&Ventanas acopladas y barras de tareas" msgid "&Toolbars:" msgstr "&Barras de tareas:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1279,7 +1307,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Troncal:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "&Intentar de nuevo" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dos páginas" @@ -1287,15 +1319,15 @@ msgstr "&Dos páginas" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Deshacer" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Dif. Unificado" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Unificar Dif. con" @@ -1307,7 +1339,7 @@ msgstr "&Unidades desconocidas" msgid "&Up" msgstr "&Arriba" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Actualizar objeto a la revisión" @@ -1319,11 +1351,11 @@ msgstr "&Ascendencia (upstream):" msgid "&Use auto-completion of file paths and keywords" msgstr "&Usar autocompletar en rutas de archivos y palabras clave" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Nombre de Usuario:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Ver" @@ -1331,9 +1363,9 @@ msgstr "&Ver" msgid "&View:" msgstr "&Ver:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" -msgstr "&Avisar cuando falte Firmado Por en las consignas" +msgstr "&Advertir cuando falte el Firmado-por en la consignación (commit)" #. Resource IDs: (1203) msgid "&Whole Project" @@ -1347,6 +1379,10 @@ msgstr "&Palabra completa" msgid "&Within file" msgstr "&Dentro del fichero" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "&Sí" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Ignorar cámbios de espacios" @@ -1355,46 +1391,46 @@ msgstr "&Ignorar cámbios de espacios" msgid "&known changes" msgstr "&cambios conocidos" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit predeterminado)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(desde %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(sin lista de cambios)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(sin números de línea)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(sin valor)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(no encontrado)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(desconocido)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- todo -" @@ -1402,13 +1438,14 @@ msgstr "- todo -" msgid "--&all" msgstr "--&todo" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1416,7 +1453,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config en la raíz del repositorio" @@ -1432,7 +1469,7 @@ msgstr ".gitignore en los directorios que contengan los objetos" msgid ".gitignore in the repository root" msgstr ".gitignore en la raiz de repositorio" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig en la raíz del repositorio" @@ -1448,31 +1485,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1481,150 +1518,150 @@ msgid "" "And read the manual!" msgstr "TortoiseGit es una extensión del shell.\nEsto significa que se integra en el explorador de Windows.\nPara usar TortoiseGitpor favor, abra el explorador y haga clic derecho en cualquier carpeta que desee\npara que aparezca el menú contextual, donde encontrará todos los comandos de TortoiseGit.\nY ¡lea el manual!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Advertencia: No se ha comprobado si estos ramales se han combinado complemente en HEAD (cabeza)." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Advertencia: Esta acción eliminará los ramales en el remoto." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Advertencia: Este ramal no está completamente combinado en HEAD (cabeza)." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" -msgstr "HEAD desacoplado actual, sobre el que usted está trabajando (sin ramal).\n¿Quiere crear un ramal (branch) ahora?" +msgstr "HEAD (cabecera) actual desacoplada, sobre la que usted está trabajando (no hay ramal).\n¿Quiere crear un ramal (branch) ahora?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" -msgstr "¿Estás seguro que quieres eliminar TODOS los resguardados?" +msgstr "¿Estás seguro de que quieres eliminar TODOS los resguardados?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "¡Fallo al aplicar el resguardo!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "¡METER resguardo fallido!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "¡Resguardo fallido!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" -msgstr "el anterior directorio que aplicó reorganizar aún existe para la mbox dada\n\nQué quieres" +msgstr "el anterior directorio de reasentamiento que aplicó reasentado (rebase) aún existe pero se proporcionó mbox\n\n¿Desea" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Fallo al aplicar resguardo, hay conflictos" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "METER resguardo fallido, hay conflictos" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Resguardo aplicado correctamente" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "METER resguardo exitoso" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Resguardo exitoso" #. Resource IDs: (16603) msgid "" -msgstr "" +msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" #. Resource IDs: (59392) msgid "" -msgstr "" +msgstr "" #. Resource IDs: (32814) msgid "?" msgstr "¿?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Ya existe un ramal con el mismo nombre de la etiqueta que ha introducido (así que la referencia corta es ambigua).\nEsto puede causar problemas, así que debe evitarlos." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Ya existe un ramal con el mismo nombre." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Un proceso de \"merge\" está activo, por lo que esta consigna será una consign de \"merge\". Para cancelar un \"merge\", tienes que hacer un reinicio o comprobación forzada." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Hay una nueva versión dispònible. ¡Por favor, descargue la versión actual!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "En líeas separadas, Lista las rutas que mostrarán iconos superpuestos\r\nSi añades un caracter '*' al final de la ruta, tambien se incluirán todos los archivos y subdirectorios dentro de esa ruta." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." -msgstr "En líeas separadas, Lista las rutas que no mostrarán menú contextual.\r\nSi añades un caracter '*' al final de la ruta, tambien se incluirán todos los archivos y subdirectorios dentro de esa ruta.\r\nUna lista vacia permitirá el menú contaxtual en todas las rutas." +msgstr "Una lista separada por líneas en blanco de rutas para las que no se muestra menú contextual.\nSi añade un caracter '*' al final de la ruta, todos los ficheros y subdirectorios dentro de esa ruta también carecerán de este.\nUna lista vacía permitirá el menú contextual en todas las rutas." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." -msgstr "En líeas separadas, Lista las rutas que no mostrarán iconos superpuestos.\r\nSi añades un caracter '*' al final de la ruta, tambien se incluirán todos los archivos y subdirectorios dentro de esa ruta.\r\nUna lista vacia permitirá superpuestos en todas las rutas." +msgstr "Una lista separada por líneas en blanco de rutas para las que no se mostrarán iconos sobreimpresos.\nSi añade un caracter '*' al final de la ruta, todos los archivos y subdirectorios dentro de esa ruta también carecerán de estos.\nUna lista vacía permitirá sobreimpresiones en todas las rutas." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." -msgstr "El recurso requerido no estaba disponible." +msgstr "Un recurso requerido no estaba disponible." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Ya existe una etiqueta con el mismo nombre que el de ramal que ha indroducido (así que la referencia corta es ambigua).\nEsto puede causar problemas, así que debe evitarlos." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." -msgstr "Existe ya una etiqueta con el mismo nombre." +msgstr "Ya existe una etiqueta con el mismo nombre." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." -msgstr "Un programa visor de archivos dif. GNU (archivos de parche).\r\nSi no dispones de un NotePad." +msgstr "Un programa visor de archivos GNU diff (archivos de parche).\nSi no dispone de uno utilice NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "A&bortar" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "A&cerca de" @@ -1640,11 +1677,11 @@ msgstr "Renombrados abreviados" msgid "Abbreviated size" msgstr "Tamaño abreviado" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Abortar" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Abortar &\"Merge\"" @@ -1652,11 +1689,11 @@ msgstr "Abortar &\"Merge\"" msgid "Abort Merge" msgstr "Abortar \"Merge\"" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Aborta un \"Merge\" en marcha." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Acerca de" @@ -1676,12 +1713,12 @@ msgstr "Acerca de TortoiseGitMerge" msgid "Accept certificate" msgstr "Aceptar certificado" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "El acceso a %1 fue denegado." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Acción" @@ -1689,26 +1726,26 @@ msgstr "Acción" msgid "Action log" msgstr "Reg. de acción" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Acciones" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Activar lista de tareas" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Archivos activos" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "¡Los objetos ActiveX no puden guardarse mientras sales de Windows!\n¿Descartar todos los cambios de 1%?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Añadir" @@ -1716,7 +1753,7 @@ msgstr "Añadir" msgid "Add &Signed-off-by" msgstr "Añadir &Firmado por" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Añadir '%s' al diccionario" @@ -1729,15 +1766,15 @@ msgstr "Añadir Remoto" msgid "Add \"&Signed-off-by\"" msgstr "Añadir \"&Firmado por\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "¿Añadir otra consignación (commit)?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Añadir programa específico para extensiones diff" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Añadir progama específico para extensiones merge" @@ -1745,15 +1782,15 @@ msgstr "Añadir progama específico para extensiones merge" msgid "Add new files automatically to Git" msgstr "Añadir archivos nuevos automáticamente a Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Añadir a lista de &ignorados" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Añadir a la barra de acceso rápido" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Añadir..." @@ -1761,11 +1798,11 @@ msgstr "Añadir..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Añadir/Editar Programa específico de extensiones Diff/Merge" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Añadido" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1773,25 +1810,25 @@ msgid "" "to the ignore list." msgstr "Añadir el archivo plantilla(s)\n%s\na lista de ignorados." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Añadiendo" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Añadir archivo(s) al control de Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Añadir archivo(s) seleccionado(s) o la mascaradearchivo a la lista de 'ignorar'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ajustes de configuraciones\nConfiguraciones" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avanzado" @@ -1799,43 +1836,43 @@ msgstr "Avanzado" msgid "Advanced Diff/Merge Settings" msgstr "Configuraciones avanzadas Diff/Merge" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Configuraciones avanzadas Dif." -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Ajustes avanzados para combinar" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Todo" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Todos los comandos" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Todos los archivos (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Todos los archivos (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Todos los Antecesores" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Todos los ramales locales" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Todas las referencias (refs)" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Todas las etiquetas (tags)" @@ -1843,47 +1880,47 @@ msgstr "Todas las etiquetas (tags)" msgid "All tags only" msgstr "Sólo Etiquetas" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "¡Todos tus cambios se perderán! ¿Relamente quieres reinicar todas las barras de tareas y menus?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "¡Todos tus cambios se perderán! ¿Relamente quieres reinicar todas las asignaciones de teclas?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "¡Todos tus cambios se perderán! ¿Relamente quieres reinicar el menú '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "¡Todos tus cambios se perderán! ¿Relamente quieres reinicar la barra de tareas '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Permitir edición de esta vista\nPermitir edición" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Permitir URL de Gravatar personalizado" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "Permite crear una consignación (commit) vacía que sólo tenga un mensaje de consignación y ningún fichero (cfr. git commit --allow-empty)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Ya está actualizado." @@ -1899,11 +1936,11 @@ msgstr "Impulsar (push) siempre hacia el ramal remoto seleccionado para este ram msgid "Always show long format" msgstr "Mostrar siempre el formato largo" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Usar siempre la configuración local del sistema para mostrar las fechas y horas" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Rectificar" @@ -1911,12 +1948,12 @@ msgstr "Rectificar" msgid "Amend &Last Commit" msgstr "Modificar &última Consigna" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Un editor alternativo que preferiblemente soporte archivos *nix" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1927,7 +1964,7 @@ msgid "" "%mine: the modified file" msgstr "Utilizar un programa Diff externo\r\npara comparar diferencias entre revisiones de archivos\r\n\r\nPuedes especificar los siguientes parámetros para la ruta:\r\n%base: archivo base\r\n%mine: el archivo modificado" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1940,34 +1977,34 @@ msgid "" "%base: the original file without your changes" msgstr "Utilizar un progama Merge externo\r\npara resolver conflictos de archivos.\r\n\r\nPuedes especificar los siguientes parámetros para la ruta:\r\n%merged: donde se guarda, el archivo en conflicto\r\n%theirs: el archivo como está en el repositorio\r\n%mine: tu archvo, con tus cambios\r\n%base: el archivo original sin tus cambios" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Un controlador de archivos incorrecto fue asociado con 1%." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Ha ocurrido un error desconocido." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Ha ocurrido un error desconocido mientras accedía a %1" -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "¡Se encontró un tipo de línea desconocido en el línea %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Etiquetas (tags) anotadas" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Anexar bloque derecho" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Anexar este bloque a la izquierda" @@ -1979,11 +2016,11 @@ msgstr "Cuadros de menú de aplicación:" msgid "Apply &Patch..." msgstr "Aplicar &parche..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Aplicar parche de serie..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Aplicar parche..." @@ -1991,7 +2028,7 @@ msgstr "Aplicar parche..." msgid "Apply Patches" msgstr "Aplicar parches" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Aplicar una serie de parches desde cuenta de correo" @@ -1999,7 +2036,7 @@ msgstr "Aplicar una serie de parches desde cuenta de correo" msgid "Apply unified diff" msgstr "Aplicar Dif, unificado" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Estilo Aqua" @@ -2007,39 +2044,39 @@ msgstr "Estilo Aqua" msgid "Arabic" msgstr "Arábigo" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL arbitraria:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "¿Está seguro de que quiere restablecer columnas?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" -msgstr "¿Seguro que desea cancelar el proceso de reorganizar?" +msgstr "¿Seguro que desea cancelar el proceso de reasentamiento (rebase)?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "¿Seguro que deseas marcar el(los) archivo(s) en conflicto como resuelto(s)?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "¿Seguro que quieres restituir %d objeto(s)? ¡Perderás todos los cambios desde la última actualización!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "¿Seguro que quieres salvar a\"%s\"?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Arreglar &vertical" +msgid "Arrange &vertical\tV" +msgstr "Disponer en &vertical\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "'%s' asignado a la lista de cambios" @@ -2048,11 +2085,11 @@ msgstr "'%s' asignado a la lista de cambios" msgid "Assigned to:" msgstr "Asignado a:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Considerar inalterado" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Considerar válido/inalterado" @@ -2064,34 +2101,34 @@ msgstr "Considerar válido/inalterado (\"Necesita-bloqueo\" en TortoiseSVN)" msgid "At file &creation" msgstr "Al &crear el fichero" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "Al crear el fichero" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "A la revisión: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Por el momento, sólo puede renombrar ramales." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Se intentó una operación no soportada" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Se intentó acceder más allá del final de %1." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Se intentó leer cuando se escribía en %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Se intentó escribir cuando se leía de %1." @@ -2108,11 +2145,11 @@ msgstr "Autentificación" msgid "Authentication data" msgstr "Datos de autentificación" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "E-mail del Autor" @@ -2120,7 +2157,7 @@ msgstr "E-mail del Autor" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autores" @@ -2142,11 +2179,11 @@ msgstr "Auto convertir CrLf" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Auto ocultar:" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Auto ocultar todo:" @@ -2154,23 +2191,23 @@ msgstr "Auto ocultar todo:" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Auto-cerrar si no hay confictos" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Auto-cerrar si no hay errores" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Auto-cerrar si no hay opciones adicionales disponibles." -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Auto-cerrar si no hay que combinar, añadidos ó eliminados" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2184,7 +2221,7 @@ msgstr "Auto-cargar &clave Putty" msgid "Autoload Putty &Key" msgstr "Auto-cargar &clave Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automático" @@ -2204,7 +2241,7 @@ msgstr "Promedio" msgid "B&rowse..." msgstr "E&xplorar..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Negro" @@ -2216,7 +2253,7 @@ msgstr "Segundo plano" msgid "Baltic" msgstr "Báltico" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Gráfico de barras" @@ -2236,7 +2273,7 @@ msgstr "Archivo base:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Basado en TortoiseIDiff de TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Info Básica" @@ -2248,45 +2285,45 @@ msgstr "Entre los ficheros:" msgid "Big5 (Traditional)" msgstr "Big5 (Tradicional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bifurcación mala" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bifurcación buena" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Reiniciar bifurcación" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Iniciar bifurcación" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Mapa de bit \na mapa de bit" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Estilo Oscuro" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Acuse" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Error de Acuse" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Acuse de la versión anterior" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Acuse de autor en cada línea de archivo" @@ -2294,26 +2331,30 @@ msgstr "Acuse de autor en cada línea de archivo" msgid "Blend alpha" msgstr "Combinación alfa" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "Bloques" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Estilo Azul" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Cuerpo" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "¡Se ha indicado tanto /logmsgfile como /logmsg\nSólo se puede especificar uno de ellos." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "¡La ruta al archivo del parche y la ruta de destino deben ser rutas absolutas!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Vista inferior:" @@ -2325,30 +2366,30 @@ msgstr "Ex&plorar..." msgid "Branc&h:" msgstr "Ram&a:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ramal" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "El ramal %s trás %s\n%s avanzará rápidamente a %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Ramal (avance rápido)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Nombre del ramal" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "El nombre Ramal/Etiqueta no es válido." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "El nombre Ramal/Etiqueta no debe estar vacío o no será válido." @@ -2360,11 +2401,11 @@ msgstr "Ramal:" msgid "Bro&wse" msgstr "Na&vegar" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Examinar Referencias" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Buscar programa externo de diff." @@ -2376,7 +2417,7 @@ msgstr "Buscar Referencias" msgid "Browse..." msgstr "Explorar..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID-mala" @@ -2388,7 +2429,7 @@ msgstr "E&xpression de identificador-de-fallo:" msgid "Bug-ID/Issue-Nr:" msgstr "ID-mala/Nº-problema:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "IDs-malas" @@ -2404,7 +2445,7 @@ msgstr "Probador de expresiones regulares de Bugtraq - TortoiseGit" msgid "Button Appearance" msgstr "Apariencia de botón" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Botón1" @@ -2420,7 +2461,7 @@ msgstr "C&omprobar ahora" msgid "C&ommands:" msgstr "C&omandos:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&rear ramal/etiqueta desde la revisión" @@ -2428,11 +2469,11 @@ msgstr "C&rear ramal/etiqueta desde la revisión" msgid "C&urrent Keys:" msgstr "C&laves actuales:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "C&ortar" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2448,11 +2489,11 @@ msgstr "Calcular" msgid "Can double-click in log list to compare with previous revision" msgstr "Puede hacer doble-clic en la lista de registro para comparar con revisión anterior" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "No se puede activar un objeto ActiveX estático." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2461,80 +2502,80 @@ msgid "" "%s" msgstr "No se puede copiar \n%s\na\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "¡No se puede copiar la imagen de mapa de bits en el portapapeles!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "¡No se puede crear una nueva imagen!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "¡No se puede personalizar los menús!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "¡No se puede pegar una imagen de mapa de bits desde el portapapeles!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Cancelar" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Cancelar\nNo dejar TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Cancelar\nNo cambiar vistas" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Cancelar\nMantener el archivo vacío." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Cancelar\nResolver conflictos primero" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Cancelar\nPermanecer con los archivos actuales" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Cancelar\nPermanecer con los ajustes acutales" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Ahora no se pueden combinar consignaciones.\nAsegúrese de que está viendo el registro (log) de su ramal actual y no se aplicaron filtros." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "No se pudo forzar la actualización del ramal actual. Use el comando reset (restablecer) si quiere hacerlo así." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "No se puede mostrar el acuse.\"%s\" no está bajo el control de versiones por Git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "No se puede mostrar dif. debido a nuevas líneas incoherentes en el archivo." @@ -2546,7 +2587,7 @@ msgstr "Casca&da" msgid "Cascaded context menu" msgstr "Menú contextual en cascada" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Diferenciar mayúsculas y minúsculas" @@ -2570,33 +2611,33 @@ msgstr "¡La verificación del certificado falló!" msgid "Change log" msgstr "Registro de cambios" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Cambiar la impresora y las opciones de impresión\nAjustes de impresora" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Cambiar las opciones de impresión\nAjustes de página" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Cambiar estilo de la aplicación\nCambiar Estilo" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Cambiar posición de ventana" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Cambiar tamaño de ventana" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Cambiar tipo" @@ -2604,38 +2645,38 @@ msgstr "Cambiar tipo" msgid "Changed Files" msgstr "Archivos modificados" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Se cambiaron los ficheros entre %s y %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Archivos modificados entre %s, %s y %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Archivos modificados: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Líneas cambiadas, incluyendo los archivos añadidos/eliminados" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Líneas cambiadas, incluyendo los archivos añadidos/eliminados por fecha" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Líneas cambiadas, sin incluir los archivos añadidos/eliminados" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Líneas cambiadas, sin incluir los archivos añadidos/eliminados por fecha" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Lista de cambios %s movida" @@ -2644,7 +2685,7 @@ msgstr "Lista de cambios %s movida" msgid "Changes made (double-click on file for diff):" msgstr "Cambios realizados (doble-click en el archivo para dif.):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Cambiar estilo de la aplicación" @@ -2652,7 +2693,7 @@ msgstr "Cambiar estilo de la aplicación" msgid "Char position where to show a border line in commit text boxes:" msgstr "Posición del caracter dónde mostrar una línea borde, en los cuadros de texto de consignas:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Comprobar" @@ -2664,31 +2705,31 @@ msgstr "Buscar actualizaciones - TortoiseGit" msgid "Check For Updates..." msgstr "Buscar actualizaciones..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Buscar modi&ficaciones" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Comprobar la ruta y/o URL que has introducido." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Marca aquellas entradas del menú que deseas que aparezcan en el menú contextual principal en vez de en el submenú TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Comprobar las entradas del menú que deseas que aparezcan en el menú contextual estendido (SHIFT + click izq)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Marcar para mostrar tiempos relativos en mensajes de reg." -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Marcar para usar un formato abreviado de fecha y hora en los mensajes de reg." @@ -2696,31 +2737,31 @@ msgstr "Marcar para usar un formato abreviado de fecha y hora en los mensajes d msgid "Check:" msgstr "Comprobar:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Comprobación" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "Comprobar con merge" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Entresacar" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Fallo al entresacar" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Entresacar las consignas seleccionadas..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Entresacar esta consigna..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "¡Entresacado fallido! ¿Mantener esta consigna?" @@ -2728,11 +2769,11 @@ msgstr "¡Entresacado fallido! ¿Mantener esta consigna?" msgid "Chinese" msgstr "Chino" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Elejir repositorio" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Cronológía invertida (predeterminado en git)" @@ -2744,78 +2785,78 @@ msgstr "Limpiar" msgid "Clean Type" msgstr "Tip de limpieza" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Limpiar permanentemente" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Limpiar a la papelera de reciclaje" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Limpiar ramales remotos caducos" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Limpiando" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Limpiando." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Falló la limpieza al procesar una de las siguientes rutas:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "La limpieza ha procesado con éxito las siguientes rutas:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Limpiar" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Herramientas de limpieza\nLimpiar" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Limpia %ld URLs almacenadas para %ld árboles de trabajo" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Limpia %ld mensajes de registro (log) almacenados para %ld árboles de trabajo" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Limpiar %ld emparejamientos de usuarios/contraseñas,%ld certificados ssl y %ld nombres-de-usuarios" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Limpia la caché de mensajes de Reg. de %ld repositorios" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Limpiar los datos de autentificación almacenados.\r\nTendrás que introducir usuario y contraseña para todos los repositorios." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Limpiar los tamaños y las posiciones almacenadas de %ld diálogos" @@ -2824,7 +2865,7 @@ msgstr "Limpiar los tamaños y las posiciones almacenadas de %ld diálogos" msgid "Click here to go to the website" msgstr "Pulse aquí para ir al sitio web" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Pulse aquí para seleccionar un mensaje escrito recientemente" @@ -2840,17 +2881,17 @@ msgid "" "extension" msgstr "Pulsa en \"Avanzado\" para especificar programas alternativos de merge basados en extensión de archivo" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Haz clic aquí para ver los comandos para mover bloques de texto\nUso de bloques de texto" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Portapapeles" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Clonar" @@ -2858,7 +2899,7 @@ msgstr "Clonar" msgid "Clone Existing Repository" msgstr "Clonar repositorio existente" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Clonar un repositorio" @@ -2866,49 +2907,49 @@ msgstr "Clonar un repositorio" msgid "Clone into Bare Repo" msgstr "Clonar en repo vacío" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Clonar..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Cerrar" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Cerrar pantalla completa" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Cerrar vista previa de impresión\n&Cerrar" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Cerrar manuálmente" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Cerrar el modo vista previa de impresión \nCancelar vista previa" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Cerrar documento activo \nCerrar" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Cerrar la ventana activa, e indicar que guarde los documentos" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Contraer" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2934,7 +2975,7 @@ msgstr "Colores:" msgid "Combine One Mail" msgstr "Combiar un correo" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Combinar en una consigna" @@ -2942,11 +2983,11 @@ msgstr "Combinar en una consigna" msgid "Comman&ds:" msgstr "Coman&dos:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Comando" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Línea de comandos" @@ -2954,7 +2995,7 @@ msgstr "Línea de comandos" msgid "Command Line To Execute:" msgstr "Línea de comandos a ejecutar:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Comando fallido." @@ -2962,41 +3003,41 @@ msgstr "Comando fallido." msgid "Commands" msgstr "Comandos" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Consigna" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "La consignación (commit) %s NO es visible ahora mismo." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "No se encontró la consignación (commit) %s en \"%s\". ¿Actualizar submódulo ahora?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Fecha de consigna" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Correo Conignador" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Término de consigna" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Info. de consigna" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Mensaje de Consigna" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Consignador" @@ -3004,7 +3045,7 @@ msgstr "Consignador" msgid "Commit Ordering:" msgstr "Orden de consignas:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Consignar super proyecto" @@ -3012,19 +3053,19 @@ msgstr "Consignar super proyecto" msgid "Commit to:" msgstr "Consignar a:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Consignar..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Consignas por autor" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Consignas por fecha" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Consignas cada %s" @@ -3033,15 +3074,15 @@ msgstr "Consignas cada %s" msgid "Commits each week:" msgstr "Consignas cada semana:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Consignar tus cambios al repositorio" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "E-mail del consignador" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3053,52 +3094,52 @@ msgstr "¡Consignando una carpeta no versionada no añadirá recursivamente tus msgid "Common Name:" msgstr "Nombre común:" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Comparar revisión &HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Comparar Ref. seleccionadas" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Comaprar dos archivos" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Comparar espacios en blanco" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Comparar con el &árbol de trabajo" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Comparar con b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Comparar con versión anterior" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Compara todos los espacios en blanco al hacer dif.\nComparar espacios en blanco" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Comparar archivo con la última revisón de consigna para ver los cambios que has hecho." -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Comparando %s con %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Completado" @@ -3114,7 +3155,7 @@ msgstr "Config fuente " msgid "Config type:" msgstr "Config tipo:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Configurar expresiones regulares de filtros" @@ -3148,11 +3189,11 @@ msgstr "Configurar el programa visor para archivos dif. GNU (archivos de parche) msgid "Confirm to kill running git process" msgstr "Confirmar al matar el proceso que ejecute git" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Conflictos" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Archivos de Conflictos" @@ -3160,15 +3201,15 @@ msgstr "Archivos de Conflictos" msgid "Conflict resolved" msgstr "Conflicto resuelto" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "En conflicto" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflictos" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflictos: %d" @@ -3181,98 +3222,98 @@ msgstr "Menús contextuales:" msgid "Context lines for patches" msgstr "Líneas de contexto para parches" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continuar" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Contraer ventana acoplada" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Convertir espacios en tabulaciones" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Convertir tabulaciones en espacios" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Cop&iar" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copiado" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copiar" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copiar de %s a %s, a revisión %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Copiar SHA-1 al portapapeles" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Herramientas de copia\nCopiar" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copiar toda la información al portapapeles" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copiar y renombrar" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Copiar mensages de Reg. al portapapeles" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Copiar Reg. al portapapeles" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copiar rutas al portapapeles" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Copiar nombres de Ref" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copiar selección al por&tapapeles" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copia la selección al Portapapeles\nCopiar" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copiar al portapapeles" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copiar: Nuevo nombre para %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Copiando %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Copiando..." @@ -3280,25 +3321,25 @@ msgstr "Copiando..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Correcciones" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "¡No se pudo añadir %s a la lista de ignorados!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "¡No se pudo comprobar nuevas versiones!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "¡No se pudo buscar una nueva versión! %s (Código de error: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3306,76 +3347,76 @@ msgid "" "%s" msgstr "¡No se pudo copiar los archivos!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "No se puedo crear %1 porque el directorio está lleno." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "¡No se pudo averiguar revisión de la última consigna!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "No se puedo encontrar Super-project" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "¡No se pudo obtener el estado!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "No se pudo abrir %1 porque hay demasiados archivos abiertos." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "No se puedo abrir el archivo\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "No se pudo eliminar %1 porque es el directorio actual.." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "¡No se pudo eliminar %s de la lista de ignorados" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "No se ha podido reiniciar a la primera consigna (primer paso). Abortando..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "No se ha podido reiniciar a la úlrima consigna (segundo paso). Abortando..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "No se ha podido reiniciar hasta la CABEZA original." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "¡No se puede recuperar la URL del archivo!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "No se pudo obtener la revisión %s del archivo %s.\n¡No es posible parchear!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "No se puede iniciar TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3383,7 +3424,7 @@ msgid "" "%s" msgstr "¡No se pudo iniciar visor diff!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3391,7 +3432,7 @@ msgid "" "%s" msgstr "¡No se pudo iniciar programa externo de diff!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3399,11 +3440,11 @@ msgid "" "%s" msgstr "¡No se pudo iniciar programa externo para combidar!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "No se pudo iniciar la tarea de impresión." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3411,11 +3452,11 @@ msgid "" "%s" msgstr "¡No se pudo iniciar el visor de textos!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "No se puede iniciar el Agente Putty (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "¡No se pudo iniciar hilo!" @@ -3423,7 +3464,7 @@ msgstr "¡No se pudo iniciar hilo!" msgid "Coun&t" msgstr "Cantida&d" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Recuento: %u coincidencias." @@ -3436,15 +3477,15 @@ msgstr "Crear &Librería" msgid "Create .gitignore file" msgstr "Crear archivo .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Crear ramal" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Crear ramal en esta versión..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Crear ramal..." @@ -3456,29 +3497,29 @@ msgstr "Crear Lista de cambios" msgid "Create New Branch" msgstr "Crear nuevo ramal" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Crear parche Serial..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Crear Etiqueta" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Crear Etiqueta en esta versión..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Crear Etiqueta..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Crea un nuevo documento\nNuevo" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3487,49 +3528,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Crea un clon superfluo con un histórico truncado al número especificado de revisiones. Un repositorio superfluo tiene una serie de limitaciones (no se puede clonar o recuperar de él, ni impulsar (push) hacia él ni desde él), pero es adecuado si sólo estás interesado en el histórico reciente de un gran proyecto con un largo histórico, y quieres enviar arreglos ó parches." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Crear archivo de parche" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" -msgstr "Crear &petición pull (tomar)" +msgstr "Crear &petición de incorporación (pull)" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Crear repos&itorio aquí... " -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Creado" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Crear un ramal o etiqueta" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Crea una carpeta librería, con una configuración especial para los árboles de trabajo de Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Crea un archivo parche de las diferencias de los dos archivos\nCrear un archivo parche" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Crea una base de datos del repositorio en la ubicación actual" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Crea un archivo de dif. unificado con todos los cambios hechos" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." -msgstr "Creando petición-pull (tomar)..." +msgstr "Creando petición de incorporación (pull)..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "El ayudante de credenciales no debe estar vacío." @@ -3541,7 +3582,7 @@ msgstr "Ayudante de credenciales:" msgid "Credentials" msgstr "Credenciales" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Cor&tar" @@ -3549,7 +3590,7 @@ msgstr "Cor&tar" msgid "Current" msgstr "Actual" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Ramal actual" @@ -3557,7 +3598,7 @@ msgstr "Ramal actual" msgid "Current Branch:" msgstr "Ramal actual:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3569,7 +3610,7 @@ msgstr "El ramal actual %s está al día\n\nSi quiere forzar el reasentado (reba msgid "Current version is:" msgstr "La versión actual es:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "La versión actual es: %s" @@ -3582,7 +3623,7 @@ msgstr "Per&sonalizar..." msgid "Custom" msgstr "Personalizar" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personalizar" @@ -3590,19 +3631,19 @@ msgstr "Personalizar" msgid "Customize Keyboard" msgstr "Personalizar teclado" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Personalizar barra de accesi rápido" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Personalizar barra de accesi rápido..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Personalizar..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3616,88 +3657,92 @@ msgstr "Cirílico" msgid "DCommit Type" msgstr "Tipo de FechaConsigna" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Demonio" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Fecha" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Fecha Última Consigna" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Predeterminado" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menú Predeterminado" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Menú de aplicación Predeterminado. Aparece cuando no hay documentos abiertos." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "Limitación por defecto de los mensajes de registro (log):" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Predeterminar para codificación UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Suprimir" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Suprimir %d ramales" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Suprimir %d ramales remotos" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Suprimir %d etiquetas" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Suprimir &local" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Surprimir Ref..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Borrar todas las etiquetas" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Suprimir e &ignore %d objetos por nombre" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Suprimir y añadir a lista &ignorados" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Suprimir y ignorar %d objetos por &extensión" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Suprimir ramal" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Suprimir ramal/etiqueta" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Suprimir ramal remoto" @@ -3705,34 +3750,34 @@ msgstr "Suprimir ramal remoto" msgid "Delete remote tag - TortoiseGit" msgstr "Eliminar etiqueta remota - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Borrar etiquetas remotas en \"%s\"..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Eliminar etiquetas remotas..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Borrar submódulo" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Suprimir etiqueta" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Eliminar el ramal existente o usar un nombre diferente." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Borrar\nEl fichero está eliminado." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Eliminado" @@ -3740,36 +3785,36 @@ msgstr "Eliminado" msgid "Deleted merge conflict" msgstr "Elimiado conflicto al combiar" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Elimina y añade el(los) archivo(s) seleccionado(s) o mascaradearchivo a la lista 'gnorar'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Suprimir archivos/carpetas del control de versiones" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Suprimir archivos/carpetas del control de versiones pero mantener el archivo" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Eliminar el archivo registro de acciones" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Eliminando" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Borrando datos en caché" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Borrando fichero" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Borrando referencias remotas..." @@ -3789,7 +3834,7 @@ msgstr "Describir" msgid "Describe Strategy" msgstr "Describir estrategia" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Descripción" @@ -3797,7 +3842,7 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Deseleccionar lista de cambios" @@ -3805,33 +3850,33 @@ msgstr "Deseleccionar lista de cambios" msgid "Destination" msgstr "Destino" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "La unidad de disco de destino está llena." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detectar y resaltar los bloques movidos" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Detectar líneas movidas o copiadas desde ficheros existentes en cualquier consignación (commit)" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Detectar líneas movidas y copiadas desde ficheros existentes en la consignación (commit) donde el fichero de destino haya sido creado" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Detectar líneas movidas y copiadas desde ficheros modificados en la misma consignación (commit)" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Detectar líneas movidas o copiadas dentro de un fichero" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3845,11 +3890,15 @@ msgstr "Tamaños y posiciones de diálogos" msgid "Dialogs" msgstr "Cuadros de diálogo" +#. Resource IDs: (156) +msgid "Diff" +msgstr "Diff" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Opciones de diff" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Dif. dos Consignas" @@ -3881,7 +3930,7 @@ msgstr "Archivo Dif.:" msgid "Diff header" msgstr "Diff cabecera" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Diff más tarde" @@ -3893,12 +3942,12 @@ msgstr "Diff posición" msgid "Diff removed lines" msgstr "Diff líneas eliminadas" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Diff con \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Dif. con antecesor %d" @@ -3911,19 +3960,19 @@ msgstr "Diferencia entre" msgid "Diffing" msgstr "Diferenciando" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Comparando (diff') commits (acometimientos)" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Hace un diff del fichero del árbol de trabajo con el anterior a la última consignación (commit)" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Dif. dos consignas cualquiera" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Dir..." @@ -3935,26 +3984,26 @@ msgstr "Directorio:" msgid "Disable sounds" msgstr "Deshabilitar sonidos" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Desactive esta opción si tienee árboles de trabajo realmente grandes y experimenta\ndemasiados accesos al disco cuando explora el árbol de trabajo." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Deshabilitar búsqueda de actualizaciones" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Deshabilitado" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disco lleno mientras accedia a %1" -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Excepción de envío: %1" @@ -3963,44 +4012,52 @@ msgstr "Excepción de envío: %1" msgid "Display &buttons in this order" msgstr "Muestra los &botones en este orden" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Mostrar páginas completas\nVista previa de impresión" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Mostrar la ayuda al hacer clic en botones, menús y ventanas\nAyuda" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Mostrar la ayuda para la tarea o el comando actual\nAyuda" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Muestra instrucciones acerca de cómo utilizar la ayuda\nAyuda" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Mostrar información del programa, número de versión y copyright\nAcerda de" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "Mostrar asunto y cuerpo de los mensajes de consignación (commit)" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "No volver a mostrar esta advertencia (si se selecciona Continuar)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "&No volver a mostrarme este mensaje de nuevo (si está seleccionado Ignorar)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "No seleccionar automáticamente ficheros \"desaparecidos\" (borrados, pero no representados)" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "No autoseleccionar submódulos" @@ -4013,54 +4070,71 @@ msgstr "No volver a mostrar el menú contextual de las siguientes rutas:" msgid "Do not use recycle bin" msgstr "No usar papelera de reciclaje" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "¿Estás seguro que quieres eliminar %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "¿Estás seguro que quieres suprimir la barra de herramientas '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "¿De verdad quiere deshabilitar la comprobación automática de actualizaciones para TortoiseGit?\n\nLa comprobación automática de actualizaciones puede volver a habilitarse en la página general de configuración de TortoiseGit." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "¿De verdad quiere marcar el(los) fichero(s) seleccionado(s) como asumir-válido?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "¿De verdad quiere marcar el(los) fichero(s) seleccionado(s) como saltar-árbol-de-trabajo?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "¿Estás seguro que quieres mover este archivo o carpeta?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "¿Estás seguro que quieres eliminar permanentemente las %d refs seleccionadas? NO se podrán recuperar!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "¿De verdad quiere eliminar \"%s\" del índice?" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "¿Realmente deseas eliminar \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "¿De verdad quiere eliminar los %d ficheros/directorios seleccionados del índice?" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "¿De verdad quiere eliminar los %d ficheros/directorios seleccionados?" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "¿Realmente deseas restaurar la copia? Perderás todos los cambios que has hecho después de crear la copia." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4068,7 +4142,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "¿Realmente desea restituir todos los cambios en\n%s\ny volver a esta revisión? Estas modificaciones serán restituidas por combinación-inversa de las revisiones en tu árbol de trabajo." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4076,21 +4150,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "¿Realmente desea restituir todos los cambios en\n%s\nque se hicierón en esta revisión? Estas modificaciones serán restituidas por combinación-inversa de las revisiones en tu árbol de trabajo." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "¿De verdad quiere retirar al fichero(s) seleccionado(s) el distintivo omitir-árbol-de-trabajo o asumir-inalterado?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" -msgstr "¿Quiere descargar ramales remotos desde el remoto recién añadido?" +msgstr "¿Quiere descargar (fetch) ramales remotos desde el remoto recién añadido?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "¿Quiere cargar los ficheros modificados?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4098,21 +4172,21 @@ msgid "" "as resolved?" msgstr "¿Quieres marcar el archivo\n%s\ncomo resuelto?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "¿Quieres recuperar estos documentos auto-salvados?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "¿Quieres volver a recargar los documentos para reflejar los cambios de configuración?\nNota: ¡se perderán todos los cambios que has hecho!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "¿Quieres ver los cambios?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "¿Quieres resguardar ahora?" @@ -4120,28 +4194,28 @@ msgstr "¿Quieres resguardar ahora?" msgid "Document :" msgstr "Documentos:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "No sé qué se impulsará (push) porque el ramal es desconocido \"%s\"" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" -msgstr "No sé qué se va impulsar porque usted introdujo la URL" +msgstr "No sé qué se va impulsar (push) porque usted introdujo una URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "No recuperar estos documentos auto-salvados\nUsar explicitamente las últimas versiones de los documentos salvados" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "No guardar\nCerrar las vistas sin guardar las modificaciones" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4151,11 +4225,11 @@ msgstr "No guardar\nRecargar las vistas sin guardar las modificaciones" msgid "Don't show the selected items: (press shift key to show them)" msgstr "No mostrar los elementos seleccionados: (pulse la tecla mayúsculas para mostrarlos)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "No mostrar este mensaje de nuevo" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Hecho" @@ -4167,7 +4241,7 @@ msgstr "Abajo" msgid "Download" msgstr "Descarga" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Arrastra para hacer de este menú flotante" @@ -4195,6 +4269,10 @@ msgstr "Formas boton simulado" msgid "Dumy Group For locat TabCtr" msgstr "Grupo simulado para ubicar TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "E&ditar no seleccionados" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "Rutas e&xcluidas:" @@ -4203,7 +4281,7 @@ msgstr "Rutas e&xcluidas:" msgid "E&xit" msgstr "&Salir" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportar..." @@ -4223,11 +4301,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Europa del este" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Editar" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Editar .gitconfig &global" @@ -4243,23 +4321,23 @@ msgstr "Editar .tgitconfig" msgid "Edit Button Image" msgstr "Ediar imagen de botón" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Editar Notas" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Editar autor" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Editar descripción" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Editar programa de extensiones específicas dif" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Editar programa de extensiones específicas merge" @@ -4271,11 +4349,11 @@ msgstr "Editar .gitconfig gl&obal" msgid "Edit global &XDG git/config" msgstr "Editar &XDG git/config global" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Editar config local de Git" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Editar mensage de Reg." @@ -4295,25 +4373,25 @@ msgstr "Editar/Dividir consignación (commit)" msgid "Effective" msgstr "Efectivo" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Cualesquiera nombre o la dirección IP del servidor proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Herramientas Elipse\nEllipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Correo" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "La dirección de correo Para y CC no se puede vaciar a la vez." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Correos" @@ -4321,7 +4399,7 @@ msgstr "Correos" msgid "Empty" msgstr "Vaciar" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Habilitar edición" @@ -4337,7 +4415,7 @@ msgstr "Habilitar Gravatar" msgid "Enable drag context menu" msgstr "Habilitar arrastrar menús contextuales" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Habilitar carga/descarga de ficheros de caché de registro ('log') (tortoisegit.data, tortoisegit.index)" @@ -4346,10 +4424,14 @@ msgstr "Habilitar carga/descarga de ficheros de caché de registro ('log') (tort msgid "Enable log cache" msgstr "Habilitar caché de registro ('log')" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Habilitar mostrado de imagen de Gravatar en el cuadro de diálogo de Registro (log)" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "Habilitar destacamiento de sintaxis" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Controladores de superposición habilitados" @@ -4358,35 +4440,35 @@ msgstr "Controladores de superposición habilitados" msgid "Encode" msgstr "Codificar" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Codificación" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Se encontró un error hardware de I/O mientras se accedía a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Se encontró un bloqueo de violación mientras se accedía a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Se encontró una violación de comprtidos mientras se accedía a %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Se encontró un argumento inadecuado." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Se encontró un error inesperado mientras se leía 1%." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Se encontró un error inesperado mientras se escribía 1%." @@ -4399,11 +4481,11 @@ msgstr "Cifrado" msgid "End" msgstr "Final" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Estilo de fin de línea" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Agrandar la ventana a tamaño completo" @@ -4411,23 +4493,23 @@ msgstr "Agrandar la ventana a tamaño completo" msgid "Enter Log Message" msgstr "Introduce un mensaje registro" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Introduce URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Introuce una GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Introduzca una divisa." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Introduzca una fecha y/o hora." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Introduzca una fecha." @@ -4435,33 +4517,33 @@ msgstr "Introduzca una fecha." msgid "Enter a name for the changelist:" msgstr "Escriba un nombre para la lista de cambios:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Introduce un número entre %1 y %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Introduce un número." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Introduce un entero positivo." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Introduce una hora." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Introduce un entero entre %1 y %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Introduce un entero entre 0 y 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Introduce un entero." @@ -4473,7 +4555,7 @@ msgstr "Introducir contenido de fichero al que probar debajo:" msgid "Enter log &message:" msgstr "Introduce un &mensaje registro." -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "No introduzcas más de %1 caracteres." @@ -4482,43 +4564,43 @@ msgstr "No introduzcas más de %1 caracteres." msgid "Enter the regex string below:" msgstr "Introduzca la cadena de expresión regular debajo:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Borrar todo\nBorra todo" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Borrar selección\nBorrar" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Error" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "¡Error reconstruyendo caché de iconos del Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "Error al validar el certificado del servidor para \"%s\":" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Error al leer/escribir la clave de registro %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Todo actualizado." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4528,28 +4610,28 @@ msgstr "Ejecutable (*.exe)|*.exe|Comando (*.com)|*.com|Información (*.pdf)|*.pd msgid "Executable (+x)" msgstr "Ejecutable (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existente" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Salir" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Expandir (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Expandir ventana acoplada" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Explora ubicación" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportar" @@ -4557,36 +4639,36 @@ msgstr "Exportar" msgid "Export Zip File" msgstr "Exportar archivo Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportar directorio:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exportar selección a..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exportar esta versión..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportar archivos no versionados también" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportando %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportando..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exportar una revisión a un archivo zip" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extensión" @@ -4602,7 +4684,7 @@ msgstr "Extensión:" msgid "Extern DLL Path:" msgstr "Ruta DLL externa:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Externo" @@ -4610,101 +4692,101 @@ msgstr "Externo" msgid "External Program:" msgstr "Programa externo:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Difuninar" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Fallo" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Restitución fallida" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "No se pudo comprobar el archivo \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "No se pudo comprobar el archivo \"%s\" de la revisión %s a la \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "No se pudo conectar.\nEl enlace puede estar roto." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "No se pudo convertir objeto ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Fallo al crear documento vacío." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Fallo al crear el objeto. Asegúrese de que la aplicación está incluida en el registro del sistema." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." -msgstr "Fallo al crear petición-pull (tomar)..." +msgstr "Fallo al crear petición de incorporación (pull)." -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "No se pudo conseguir el archivo base." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "No se pudo conseguir el archivo combinado." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "El lanzar la ayuda ha fallado." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "No se pudo lanzar la aplicación del servidor." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "No se pudo abrir el documento." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Error al ejecutar la operación del servidor." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Error al guardar documento." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Fallo al ajustar/eliminar la lista de cambios '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Error al iniciar el seguimineto de incidencias distribuidor COM '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Fallo al esperar a que el Agente terminase de cargar la clave." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "¡Fallido!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Avance rápido" @@ -4712,62 +4794,62 @@ msgstr "Avance rápido" msgid "Fast Forward o&nly" msgstr "Ú&nicamente avance rápido" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Avance rápido a %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "Recu&perar" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" -msgstr "Recuperar" +msgstr "Descargar (fetch)" + +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Descargar (fetch) y rea&sentar (rebase)" -#. Resource IDs: (14) +#. Resource IDs: (210) msgid "Fetch from SVN repository" -msgstr "Recuperar de repositorio SVN" +msgstr "Descargar (fetch) del repositorio SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" -msgstr "Recuperar de \"%s\"" +msgstr "Descargar (fectch) de \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Recuperar&&In&tegrar" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." -msgstr "Recuperar..." +msgstr "Descargar (fetch)..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." -msgstr "Estado de Recuperación..." +msgstr "Estado de la descarga (fetch)..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." -msgstr "Recuperando archivos cambiados..." +msgstr "Descargando (fetch) archivos cambiados..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." -msgstr "Recuperando archivo..." +msgstr "Descargando (fetch) archivo..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" -msgstr "Recuperando revisión %s del archivo:" +msgstr "Descargando (fetch) revisión %s del archivo:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Archivo" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Codificación del fichero" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "El archivo cambia cada %s" @@ -4776,27 +4858,27 @@ msgstr "El archivo cambia cada %s" msgid "File changes each week:" msgstr "Archivos cambiados cada semana:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Achivo Dif." -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "El fichero no tiene conflictos" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "El fichero está vacío." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "La lista de archivos está vacía" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Archivos de parches" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4808,7 +4890,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamaño del archivo:\t\t%s (%s)\nAncho:\t\t\t%ld pixel\nAlto:\t\t\t%ld pixel\nResolución horizontal:\t%.1f dpi\nResolución vertical:\t%.1f dpi\nProfundidad:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4828,7 +4910,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamaño del archivo:\t\t%s (%s)\nAncho:\t\t\t%ld pixel\nAlto:\t\t\t%ld pixel\nResolución horizontal:\t%.1f dpi\nResolución vertical:\t%.1f dpi\nProfundidad:\t\t\t%d bit\nZoom:\t\t\t%d%%\nTamaño del archivo:\t\t%s (%s)\nAncho:\t\t\t%ld pixel\nAlto:\t\t\t%ld pixel\nResolución horizontal:\t%.1f dpi\nResolución vertical:\t%.1f dpi\nProfundidad:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4840,7 +4922,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamaño de archivo:\t\t\t%s (%s)\nAncho:\t\t\t%ld pixel\nAlto:\t\t\t%ld pixel\nREsolución horizontal:\t%.1f dpi\nResolución vertical:\t\t%.1f dpi\nProfundidad:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4860,7 +4942,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamaño de archivo:\t\t\t%s (%s)\nAncho:\t\t\t%ld pixel\nAlto:\t\t\t%ld pixel\nREsolución horizontal:\t%.1f dpi\nResolución vertical:\t\t%.1f dpi\nProfundidad:\t\t\t%d bit\nZoom:\t\t\t%d%%\nTamaño de archivo:\t\t\t%s (%s)\nAncho:\t\t\t%ld pixel\nAlto:\t\t\t%ld pixel\nREsolución horizontal:\t%.1f dpi\nResolución vertical:\t\t%.1f dpi\nProfundidad:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "NombreArchivo" @@ -4868,17 +4950,17 @@ msgstr "NombreArchivo" msgid "Files" msgstr "Archivos" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Herramienta de relleno\nRelleno" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrado por" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Rutas filtradas" @@ -4890,11 +4972,11 @@ msgstr "Flltro:" msgid "Filter: " msgstr "Filtro:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Buscar" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4904,17 +4986,17 @@ msgstr "Buscar el texto señalado\nBuscar" msgid "Find:" msgstr "Buscar:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Buscar: No se pudo encontrar el texto \"%s\"" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Buscar: Se encontró la primera coincidencia desde el fondo. Se alcanzó el principio del documento." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Buscar: Se encontró la primera coincidencia desde el principio. Se alcanzó el final del documento." @@ -4922,23 +5004,23 @@ msgstr "Buscar: Se encontró la primera coincidencia desde el principio. Se alca msgid "Fingerprints" msgstr "Huellas de validación" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Terminado" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Integración terminada." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "¡Terminado!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Primer Antecesor" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Únicamente Primer Antecesor" @@ -4947,18 +5029,18 @@ msgid "First known &bad:" msgstr "Primer &malo conocido:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Ajustar imagen &heights" +msgid "Fit image &heights\tH" +msgstr "Ajustar &alturas de las imágenes\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Ajustar imagen &widths" +msgid "Fit image &widths\tW" +msgstr "Ajustar a&nchura de la imagen\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Unidades de disquete (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Carpeta" @@ -4970,38 +5052,34 @@ msgstr "Seguir renombrando" msgid "Font" msgstr "Fuente" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Pulse F1, para ayuda, Desplazarse horizontalmente con Ctrl-Rueda del ratón" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "'Parar en copiar/renombrar' para deseleccionar histórico completo" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forzar" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Forzar la creación de ramal/etiqueta - incluso si ya existe uno con el mismo nombre." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." -msgstr "Forzar impulsar (push) sólo si la referencia remota apunta hacia la misma consignación (commit) que el ramal de rastreado remoto.\nEsto puede causar que el repositorio remoto pierda consignaciones; úselo con cuidado.\nEsta opción corresponde a la opción de git --force-with-lease ." +msgstr "Forzar impulsión (push) sólo si la referencia remota apunta hacia la misma consignación (commit) que el ramal de rastreado remoto.\nEsto puede causar que el repositorio remoto pierda consignaciones; úselo con cuidado.\nEsta opción corresponde a la opción --force-with-lease de git." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." -msgstr "Forzar impulsar (push) hacia la referencia remota seleccionada y sustituirla sin ninguna comprobación de seguridad.\nEsto puede causar que el repositorio remoto pierda consignaciones (commits) no vistas; úselo con cuidado.\nEsta opción correspone a la opción --force de git." +msgstr "Forzar impulsión (push) hacia la referencia remota seleccionada y sustituirla sin ninguna comprobación de seguridad.\nEsto puede causar que el repositorio remoto pierda consignaciones (commit) no vistas; úselo con cuidado.\nEsta opción correspone a la opción --force de git." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5019,24 +5097,24 @@ msgstr "Primer plano" msgid "Format Patch" msgstr "Formato de Parche" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Formato de Parche..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Adelante" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Reenviar %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." -msgstr "Detectado un mensaje de consigna vacío. Tienes que introducir uno o la integración no continuará." +msgstr "Detectado un mensaje de consignación (commit) vacío. Tiene que introducir uno o el reasentado (rebase) no podrá continuar." #. Resource IDs: (65535) msgid "Found auto words:" @@ -5062,11 +5140,11 @@ msgstr "Desde ficheros &modificados" msgid "From SVN Repository" msgstr "Desde repositorio SVN " -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Desde ficheros existentes" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Desde ficheros modificados" @@ -5074,7 +5152,7 @@ msgstr "Desde ficheros modificados" msgid "From:" msgstr "Desde:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Pantalla completa" @@ -5082,7 +5160,7 @@ msgstr "Pantalla completa" msgid "Full text search" msgstr "Búsquedas de texto completo" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Totalmente recosiva" @@ -5090,7 +5168,7 @@ msgstr "Totalmente recosiva" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Las opciones ampliadas para el cuadro de diálogo de consignación (commit) están en la página Diálogos 3." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5098,24 +5176,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplificado)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "¡No se pudo inicializar GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ no pudo crear un objeto de mapa de bits. Probablemente no tengas memoria suficiente." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "GPG firma la etiqueta, vea el manual para los detalles" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Obteniendo información. Por favor, espere..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Reuniendo estadísticas" @@ -5159,29 +5237,29 @@ msgstr "General::Diálogos 3" msgid "General::Set Extend Menu Item" msgstr "General::Ajustar elementos del menú extendido " -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Obtener Reg. de combinar" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Obteniendo archivo %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Obteniendo archivo %s, revisión %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Obteniendo información..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Obteniendo información requerida..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Obteniendo Dif. unificado" @@ -5193,23 +5271,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Progreso de comando Git" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Copia y añade archivos a esta CT" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Copia y renombrar objetos versionados aquí" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Copia objeto(s) versionado(s) aquí" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Exportar todos los objetos aquí" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Exportar objetos versionados aquí" @@ -5217,37 +5295,37 @@ msgstr "Git Exportar objetos versionados aquí" msgid "Git Init" msgstr "Git Init" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Ruta de instalación de Git" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Reg." -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Mover y renombrar objeto versionado aquí" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Mover objeto(s) versionado(s) aquí" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git Configuraciones Remotas" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Histórico de revisiones Git" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DConsigna" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" -msgstr "Git SVN Integra" +msgstr "Reasentado (rebase) SVN de git" #. Resource IDs: (326) msgid "Git Synchronization" @@ -5257,7 +5335,7 @@ msgstr "Git Sincronización" msgid "Git clone - TortoiseGit" msgstr "Git clonar - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "El directorio Git no está configurado (vea la página de configuraciones \"General\")." @@ -5265,23 +5343,23 @@ msgstr "El directorio Git no está configurado (vea la página de configuracione msgid "Git for Windows" msgstr "Git para Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "No se encontró Git para Windows (https://msysgit.github.io/)." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "¡Git devolvió de un error al crear un repositorio!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "La lista de revisión de Git contiene el historial completo del fichero" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "La lista de revisión de Git sigue los cambios de nombre del fichero" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5302,7 +5380,7 @@ msgstr "Git::Credencial" msgid "Git::Remote" msgstr "Git::Remoto" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5314,47 +5392,47 @@ msgstr "Ir a Línea" msgid "Go to line" msgstr "Ir a la línea" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Ir al siguiente conflicto\nPróximo conflicto" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Ir a la siguiente diferencia\nPróxima diferencia" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Ir a la siguiente Dif.en-línea\nSiguiente Dif. en-línea " -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Ir al conflicto anterior\nConflicto anterior" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Ir a la diferencia anterior\nDiferencia anterior" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Ir a la anterior Dif.en-línea\nAnteriorDif. en-línea " -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Ir a Línea" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Gráfico" @@ -5370,11 +5448,11 @@ msgstr "Gris" msgid "Greek" msgstr "Griego" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Listas de cambios de grupo" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "&Ocultar rutas cambiadas no vinculadas" @@ -5390,7 +5468,7 @@ msgstr "CABEZA" msgid "HEAD:" msgstr "CABEZA:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Difícil" @@ -5402,7 +5480,7 @@ msgstr "Duro: Reinicia árbol de trabajo y índice (descartar todos los cambios msgid "Hebrew" msgstr "Hebreo" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Ayuda" @@ -5426,11 +5504,11 @@ msgstr "Hexa" msgid "Hide Menus for unversioned paths" msgstr "Ocultar Menús para rutas sin versionar" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Ocultar Parche<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Ocualtar ventana acoplada" @@ -5438,25 +5516,25 @@ msgstr "Ocualtar ventana acoplada" msgid "Hide the script while running" msgstr "Ocultar sec. de comandos mientras se ejecuta" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Ocultar inalterados" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Oculta las referencias inalteradas en la Lista de Comparación de Referencias" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Mostrar/Ocultar la lista de archivos de parche" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Mostrar/Ocultar la lista de archivos de parches\nOculta o muestra la lista de archivos de parches" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Consejo" @@ -5466,7 +5544,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Consejo:seleccione en el menú contextual, cambiar página a 'comandos' y arrastre los botones de la barra de herramientas en la ventana de menú." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Home" @@ -5482,7 +5560,7 @@ msgstr "Scripts de enganches::Configuración del rastreador de problemas" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Scripts de enganches::Integración del rastreador de problemas" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tipo de enganche" @@ -5498,7 +5576,7 @@ msgstr "Rutas I&ncluidas:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5506,55 +5584,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5562,15 +5641,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5594,7 +5673,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5602,7 +5681,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5610,7 +5689,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5618,16 +5697,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5638,17 +5717,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5660,7 +5739,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5724,7 +5803,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Iconos Superpuestos" @@ -5736,7 +5815,7 @@ msgstr "Iconos Superpuestos::Juego de iconos" msgid "Icon Overlays::Overlay Handlers" msgstr "Iconos Superpuestos::Controladores de Superpuestos" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5746,52 +5825,52 @@ msgstr "Iconos (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bm msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Iconos/Diseño/Código:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Idéntico" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Activándolo, evita las superposiciones y mostrar el menú contextual en los diálogos de \"guardar como...\" o \"abrir\"" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Marcandola dos guiones -- se pasán a git, desmarcandola los dos guiones no se pasarán a git, solo se le pasrá un guión - (ver ayuda)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Marcandola, haciendo doble-clic sobre una revisión de la lista de registro se comparará con la revisión anterior" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Marcandola, el diálogo de consigna se iniciará automáticamente después de un error,\r\nconservando tu última selección y el mensaje de registro." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Acitvándola, TortoiseGit comprobará una vez por semana, si hay una versión más reciente disponible" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Activándola, las carpetas de trabajo de los árboles serán excluidas de\nmostrar superposiciones aún mostrarán la supeposición 'normal' para el estado" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Si se pone, los archivos dentro de carpetas no versionadas se mostrarán en el control de estado.\r\nEl control de estado se usa por ejemplo en el diálogo de consignas." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5804,16 +5883,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Si planeas trabajar en esta carpeta, deje esta casilla sin marcar. Típicamente un repositorio vacío sólo puede tener cambios de tipo \"impulsado\" (pushed) hacia él. (Por convención, una carpeta de repositorio vacío debe tener un nombre que termina en '. Git')" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorar" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorar %d objetos por &extensión" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignorar comentarios" @@ -5825,15 +5904,15 @@ msgstr "Archivo ignorado" msgid "Ignore Type" msgstr "Tipo ignorado" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignorar todo el espacio" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorar todos los cambios en espacios en blanco" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignorar líneas en blanco" @@ -5841,7 +5920,7 @@ msgstr "Ignorar líneas en blanco" msgid "Ignore case cha&nges" msgstr "Ignorar todos los cambios" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5859,11 +5938,11 @@ msgstr "Ignorar objeto(s) recusivamente" msgid "Ignore line &endings (recommended)" msgstr "Ignorar terminaciones de línea (recomendable)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignorar espacio al final de línea EOL" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignorar cambio del espacio" @@ -5871,29 +5950,29 @@ msgstr "Ignorar cambio del espacio" msgid "Ignore whitespace" msgstr "Ignorar espacio en blanco" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorar cambios en espacios en blanco" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Ignorar espacio en blanco al comparar la versión de los ascendientes con la de los descendientes" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorado" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Archivos Ignorados" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignorar todos los cambios en espacios en blanco al hacer Dif\nIgnorar todos los cambios en espacios en blanco" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5911,24 +5990,24 @@ msgstr "Texto &y imagen" msgid "Images" msgstr "Imágenes" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Incluyendo carpetas, de sucesores inmediatos" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importar" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importar %s a %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importar ignorados de SVN" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importar ignorados SVN..." @@ -5937,16 +6016,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importar archivo ignorados de SVN al archivo .git/info/exclude (el archivo será sobreescrito)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importando archivo %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "En Lista de cambios" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "En Consignas" @@ -5964,30 +6043,30 @@ msgstr "Incl. arch. &ignorados" #. Resource IDs: (1797) msgid "Include FETCH_HEAD in branch selection boxes" -msgstr "Incluir FETCH_HEAD (descargar cabecera) en los campos de selección de ramal" +msgstr "Incluir FETCH_HEAD (descargar cabecera) en los campos de selección de ramal (branch)" #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Incluir sólo los siguientes rangos de revisiones:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nnmbre de archivo incorrecto." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "importación inicial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Respositorio Git vacío inicializado en %s" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Dif. en línea" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Dif. en línea palabras" @@ -5999,25 +6078,25 @@ msgstr "Diferecnias en línea" msgid "Input" msgstr "Entrar" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Insertar contenido del portapapeles\nPegar" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Memoria insuficiente para efectuar la operación." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Error interno de la aplicación." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Divisa no válida," -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "¡Número de revisión no válido!" @@ -6025,7 +6104,7 @@ msgstr "¡Número de revisión no válido!" msgid "Issuer:" msgstr "Publicante:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6048,7 +6127,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Conservar" @@ -6056,11 +6135,11 @@ msgstr "Conservar" msgid "Keep changelists" msgstr "Mantener listas de cambios" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "¿Mantener archivo localmente?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6074,7 +6153,7 @@ msgstr "Teclado" msgid "Keyboard shortcuts:" msgstr "Atajos de teclado:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Teclas" @@ -6118,19 +6197,39 @@ msgstr "LÍNEA8" msgid "Language:" msgstr "Idioma:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "Última(s) %s consignación(es) (commit)" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "Último(s) %s mes(es)" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "Última(s) %s semana(s)" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "Último(s) %s año(s)" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Últim. Autor" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Última consigna" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Última modificación" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Última modificación:" @@ -6138,7 +6237,11 @@ msgstr "Última modificación:" msgid "Last known &good:" msgstr "Último &bueno conocido:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "Última fecha seleccionada" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Lanzar un programa externo de dif./merge para resolver los conflictos" @@ -6146,17 +6249,17 @@ msgstr "Lanzar un programa externo de dif./merge para resolver los conflictos" msgid "Least active author:" msgstr "Último autor activo:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Dejar como en-conflicto\nEl estatus de conflicto del fichero se mantiene." -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "Deje sólo los bloques marcados" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Vista izquierda:" @@ -6164,11 +6267,11 @@ msgstr "Vista izquierda:" msgid "Left image" msgstr "Imagen izquierda" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Gráfica izquierda" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6182,12 +6285,12 @@ msgstr "Línea barra dif." msgid "Line differences" msgstr "Línea de diferencias" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Línea movida de la línea %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Línea movida a la línea %ld" @@ -6200,26 +6303,26 @@ msgstr "Ancho de línea" msgid "Line:" msgstr "Línea:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Línea: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Líneas añadidas" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Líneas eliminadas" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Listar temas de ayuda\nTemas de Ayuda" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6237,23 +6340,23 @@ msgstr "Cargar imágenes" msgid "Load Putty &Key" msgstr "&Clave Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Cargar cambios\nLos cambios realizados en TortoiseGitMerge se pedieron y fueron reemplazados con los nuevos contenidos." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Cargar cambios\nLas vistas se actualizan con los nuevos contenidos." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Cargando..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Local" @@ -6261,13 +6364,13 @@ msgstr "Local" msgid "Local Branch" msgstr "Ramal local" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "Cambios locales ignorados (ficheros con distintivo asumido-válido/inalterado u omitir-árbol-de-trabajo)" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Estado local" @@ -6275,7 +6378,7 @@ msgstr "Estado local" msgid "Local:" msgstr "Local:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6285,7 +6388,7 @@ msgstr "Ubicación donde los contenidos de la revisión\nseleccionada del reposi msgid "Locator Bar" msgstr "Barra de busquedas" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Reg." @@ -6325,12 +6428,12 @@ msgstr "Reg. mensajes (Mostrar Reg. de diállogo)" msgid "Login:" msgstr "Identificarse:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Revisión más baja mostrada: %ld - Revisión más alta mostrada: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6341,7 +6444,7 @@ msgstr "Revisión más baja mostrada: %ld - Revisión más alta mostrada: %ld - msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6353,14 +6456,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Correo" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "La DLL del sistema de correo no es válida." -#. Resource IDs: (156) -msgid "Main" -msgstr "Principal" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Hazlo vacío (sin directorios de trabajo)" @@ -6373,47 +6472,47 @@ msgstr "Adminis&trar" msgid "Manage" msgstr "Administrar" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Administrar Remotos" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Marcar como resuelto" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Marcar como resuelto\nEl estatus del fichero se cambió a modificado" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "Marcar para comparación" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Marcar este bloque" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Bloques marcados" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Marcar un archivo como resuelto en Git\nMarcar como resuelto" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Marcar revisión como mala" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Marcar revisión como buena" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Mayúsculas y &minúsculas" @@ -6437,7 +6536,7 @@ msgstr "Los menús mostrarán comandos usados recientemente primero" msgid "Menu" msgstr "Menú" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Barra de Menú" @@ -6445,7 +6544,7 @@ msgstr "Barra de Menú" msgid "Menu s&hadows" msgstr "Menús &sombreados" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Combinar" @@ -6453,34 +6552,34 @@ msgstr "Combinar" msgid "Merge &Message" msgstr "&Mensaje de Combinar" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Combianr Punto" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reintegración Combinar" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Fusión entre el ramal original, contenidos del árbol de trabajo (working tree), y el ramal al que cambiar" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Combinar con \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Combinado" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Archivos Combinados" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Fusiona otro ramal" @@ -6488,22 +6587,22 @@ msgstr "Fusiona otro ramal" msgid "Merging" msgstr "Combinando" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Combinando desde %s, de la revisión %s hacia %s, la revisión %s dentro de %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "La combinación requiere de diferentes revisiones o diferentes URLs en 'Desde:' y 'Hacia:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Combinando revisiones %s de %s dentro de %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Mensaje" @@ -6515,7 +6614,7 @@ msgstr "Sólo mensajes" msgid "Message part &expression:" msgstr "Parte del mensaje &expression:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Mensajes" @@ -6523,11 +6622,11 @@ msgstr "Mensajes" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "El mío" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimizar la Cinta" @@ -6539,7 +6638,11 @@ msgstr "Número mínimo de caracteres para un mensaje de consignación (commit): msgid "Misc" msgstr "Miscelánea" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Desaparecido" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Mezclado" @@ -6547,35 +6650,35 @@ msgstr "Mezclado" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mezclado: Dejar el arbol de trabajo sin tocar, reinicar indice" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Fecha de modificación" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Modificado" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Archivos Modificados" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Más" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Más Botones" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Más Comandos..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Más Colores..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Más..." @@ -6595,41 +6698,41 @@ msgstr "&Bajar" msgid "Move &Up" msgstr "&Subir" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Bajar objeto" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Subir objeto" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Mover y renombrar" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Mover a lista decambios" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Mover/Renombrar" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Mover: Nuevo nombre para %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Mover los archivos modificados a la papelera de reciclaje antes de restituir" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Moviendo %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Moviendo..." @@ -6637,11 +6740,11 @@ msgstr "Moviendo..." msgid "My file:" msgstr "Mi archivo:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nombre" @@ -6653,7 +6756,7 @@ msgstr "Nombre:" msgid "Navigate" msgstr "Explorar" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6663,11 +6766,11 @@ msgstr "Ir a una línea específica en la vist \nIr a línea" msgid "Navigation Pane Options" msgstr "Opciones del panel de navegación" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opciones del panel de navegación..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Anidado" @@ -6679,7 +6782,7 @@ msgstr "Redes" msgid "Network::Email" msgstr "Redes::Correo" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nuevo" @@ -6688,43 +6791,43 @@ msgid "New &name:" msgstr "Nuevo &nombre:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nuevo Ramal\\Etiqueta" +msgid "New Branch/Tag" +msgstr "Nuevo Ramal/Etiqueta" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nuevo Menú" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Nuevo identificador criptográfico (hash)" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nuevo mensaje" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nuevo nombre para %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "¡El nuevo nombre no debe estar vacío ni ser el mismo que el original!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nuevo nombre:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Nuevo submódulo" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Consigna más reciente" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Caracteres de nueva línea" @@ -6732,33 +6835,29 @@ msgstr "Caracteres de nueva línea" msgid "Next" msgstr "Siguiente" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Página siguiente\nPágina siguiente" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Siguiente conflicto" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Siguiende Dif." -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Siguiente Dif. en línea" -#. Resource IDs: (73) -msgid "No" -msgstr "No" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Sin &Avance rápido" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Sin &merges" @@ -6770,102 +6869,107 @@ msgstr "No Comprobar" msgid "No Co&mmit" msgstr "Sin Co&mmit" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "CABEZA no encontrada" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "¡No se especificó comando!\n\n¡TortoiseGitProc.exe se usa por las extensiones del shell y no debe ser llamado directamente!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "¡No se ha especificado valor de comando!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "¡No se encontraron diferencias!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "¡No se encontraron diferencias! El Submódulo no se pudo actualizar. ¿Actualizar submódulo ahora?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "No hay dispodible ningún mensaje de error." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "No ocurrió ningún error." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "No hay cambios adicionales después de combinar (merge)" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "No se modificaron archivos o carpetas, ¡no hay nada que TortoiseGit restituya!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "No se pueden mostrar archivos con la configuración actual.\nMarque una o más configuraciones de abajo para ver no versionados, ignorados y/o archivos no modificados.\nPara ver cambios remotos, haga clic en 'Comprobar Repositorio'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "No hay ficheros que mostrar con la actual configuración.\nMarque uno o más ajustes debajo para ver ficheros no versionados, ignorados y/o inalterados." -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Ningún archivo se cambió o añadió desde\nla última consigna. TortoiseGit\nno tiene nada que hacer aquí..." +"the last commit." +msgstr "No se cambiaron o añadieron ficheros\ndesde la última consignación (commit)." -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Ningún archivo se cambió o añadió desde\nla última consigna. TortoiseGit\nno tiene que hacer nada aquí...\n¿Quieres ver los archivos no versionados?" +msgstr "No se cambiaron o añadieron ficheros\ndesde la última consignación (commit).\n¿Quiere ver los ficheros no versionados?" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Ningún gráfico disponible" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "No se encuentra codificador de imagen para %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "Sin limitación" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "No se encontraron m´s revisiones" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "No hay versión anterior." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "No hay ninguna referencia" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "No hay correcciones ortográfícas" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Sin caché de estado. Sólo las carpetas versionadas tendrán superposiciones, los archivos no tendrán superposiciones" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "No hay sugerencias de sinónimos" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "No hay directorio de trabajo." @@ -6873,11 +6977,11 @@ msgstr "No hay directorio de trabajo." msgid "Node size" msgstr "Tamaño del nodo" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Nada" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6889,30 +6993,30 @@ msgstr "Consigna &SVN Normal" msgid "North European" msgstr "Norte de Europa" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Archivos no versionados" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "No todos los archivos pueden ser descargados y verificados." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "No se han eliminado todas las entradas del registro del sistema (o archivos INI)." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "No hay memoria suficiente para completar la operación." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "¡No hay sufuciente memoria\nIntenta reducir el tamaño del gráfico de revisión ya sea\ncolapsando nodos o reduciendo el factor de zoom." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "No hay parches generados." @@ -6920,7 +7024,7 @@ msgstr "No hay parches generados." msgid "Note node" msgstr "Anotar nodo" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6939,26 +7043,26 @@ msgstr "Nota: La carpeta contiene objetos no versionados" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Nota: ¡esto afectará a todos los clientes Tortoise, no sólo TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notas" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" -msgstr "No hay nada que integrar\r\n%s es igual que %s" +msgstr "No hay nada que reasentar (rebase)\n%s es igual que %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" -msgstr "Nada que Integrar" +msgstr "Nada que reasentar (rebase)" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Nada que Consignar" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Atención" @@ -6966,7 +7070,7 @@ msgstr "Atención" msgid "Number Commits" msgstr "Nº de Consignas" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Número de %s" @@ -6979,7 +7083,7 @@ msgstr "Número de autores:" msgid "Number of characters required for moved or copied line detection:" msgstr "Número de caracteres requerido para detección de línea movida o copiada:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Número de caracteres a mostrar en la parte abreviada del identificador criptográfico (hash)" @@ -7051,41 +7155,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Inicialización OLE fallida. Asegúrese que las bibliotecas OLE son de la versión correcta." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Colores office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Identificador criptográfico (hash) antiguo" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Mensaje antiguo" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Consignas más viejas" @@ -7093,15 +7197,15 @@ msgstr "Consignas más viejas" msgid "Older lines" msgstr "Líneas viejas" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Bajo demanda" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Se encontraron nno o más documentos auto-salvados." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Uno o más archivos están en conflicto." @@ -7113,29 +7217,29 @@ msgstr "Sólo ramal actual" msgid "Only Local Branches" msgstr "Sólo ramales locales" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Solo archivos combinados" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Solo archivos descendientes" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Sólo números (opcionalmente separados por comas)\n¡Están permitidos!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Sólo este objeto" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Abrir" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7145,51 +7249,52 @@ msgstr "Abrir un documento existente\nAbrir" msgid "Open certificate" msgstr "Abrir certificado" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Abrir archivos para Dif. o aplicar un parche\nAbrir archivos" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Abrir desde portapapeles" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Abrir archivo de imagen..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Abrir carpeta antecesora" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "Abrir fichero de parche" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Abrir este documento" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Abrir con..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Abrir ayudas\nTemas de ayuda" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Abre el diálogo del navegador de referencia." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Abre el exploradorr de repositorios" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opción" @@ -7198,30 +7303,30 @@ msgid "Options" msgstr "Opciones" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Tamaño ori&ginal" +msgid "Ori&ginal size\tS" +msgstr "Tamaño original &size\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Nombre del origin (repositorio original)" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Otros paneles de tareas" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Otros" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Fuera de lista de cambios" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Fuera de Consignas" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Sín memoria." @@ -7229,7 +7334,7 @@ msgstr "Sín memoria." msgid "Output Directory" msgstr "Directorio de Salida" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Salida.impr" @@ -7237,20 +7342,24 @@ msgstr "Salida.impr" msgid "Override branch if exists" msgstr "Reemplazar ramal si existe" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Sobreescribir" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "Sobreescribir los cambios en el árbol de trabajo (forzar)" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "Configuración de p&ágina..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Página %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7261,15 +7370,15 @@ msgstr "Página %u\nPáginas %u-%u\n" msgid "Page :" msgstr "Página :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Panel 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Panel 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parámetros" @@ -7277,25 +7386,25 @@ msgstr "Parámetros" msgid "Parameters:" msgstr "Parámetros:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Predecesor %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "El Antecesor %d no existe" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Anterior 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Anterior 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Antecessor(es)" @@ -7307,39 +7416,39 @@ msgstr "Parte del código es de TortoiseSVN Blame" msgid "Password" msgstr "Contraseña" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Contraseña:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Pegar" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Pegar mensaje reciente..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "Pegar lista de nombres de &fichero" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "Pegar &último mensaje de consignación (commit)" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "Pegar mensaje &reciente..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Herramienta de pegado\nPegar" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Pegar lista de nombre de archivo" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Pegar mensage de última consigna" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Pega la ruta de svn desde el portapapeles, resultante de una operación de copiar (cortar) o mover" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Parche" @@ -7355,32 +7464,32 @@ msgstr "Parchea objeto &seleccionado" msgid "Patch As Attachment" msgstr "Parche como adjunto" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Ruta de archivos" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Ruta de archivos seleccionados" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Archivos de parches (*.diff, *.patch)|*.diff;*.patch|Todos los archivos (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Parcheando" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Parcheando arcivo '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Ruta" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Se encontró una ruta que concuerda mejor con el patch (parche)." @@ -7388,21 +7497,21 @@ msgstr "Se encontró una ruta que concuerda mejor con el patch (parche)." msgid "Path:" msgstr "Ruta:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Rutas" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Herramienta de lápiz\nLapiz" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Porcentaje de la autoría" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Porcentages" @@ -7410,24 +7519,24 @@ msgstr "Porcentages" msgid "Personalized Menus and Toolbars" msgstr "Menús y barras personalizadas" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Escoger" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Escojer identificador ('hash') de commit (acometimiento)" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "Seleccionar i&dentificador (hash) de la consignación (commit)" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Escojer mensaje de commit (acometimiento)" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "Seleccionar &mensaje de la consignación (commit)" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Recoger %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7437,56 +7546,56 @@ msgstr "Imagen (metarchivo)\nuna imagen" msgid "Picture:" msgstr "Imagen:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Imágenes (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Gráficos (*.gv)|*.gv|Todos los ficheros (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Imágenes (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Todos los archivos (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Gráfico de tarta" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Por favor introduzca un script de enganche (hook) a ejecutar." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Por favor, introduzca una ruta donde aplicar el script de enganche (hook)." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Por favor, seleccione un tipo de enganche (hook)" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Por favor seleccione ramal" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Por favor seleccione ascendencia (upstream)" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Por favor eche un vistazo a las consignaciones omitidas" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Por favor, espera mientras se cancela..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Por favor, espera mientras se obtienen las diferencias..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Por favor, espera..." @@ -7502,35 +7611,35 @@ msgstr "Puerto :" msgid "Port:" msgstr "Puerto:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Enganche post-consignación (commit)" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" -msgstr "Enganche post-impulsado (push)" +msgstr "Enganche post-impulsión (push)" #. Resource IDs: (58115) msgid "Pre&v Page" msgstr "Página An&terior" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Enganche previa consignación (commit)" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" -msgstr "Enganche previo-impulsado (push)" +msgstr "Enganche pre-impulsión (push)" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Preparando consigna..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Anexar el bloque a la derecha" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Anexar este bloque a la izquierda" @@ -7542,11 +7651,11 @@ msgstr "Oprime &Nueva tecla de Acceso directo:" msgid "Press &new shortcut key:" msgstr "Oprime &nueva tecla de acceso directo:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Vista previa" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Vista previa del archivo de parche" @@ -7558,51 +7667,51 @@ msgstr "Vista previa:" msgid "Previous" msgstr "Anterior" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Página Anterior\nPágina Anterior" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Versión Anterior" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflicto anterior" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Diferencia anterior" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Diferencia anterior en línea" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Imprimir" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Imprimir Documento\n&Imprimir" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Imprimir documento activo usando opciones actuales\nImpresión Rápida" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Imprimir documento activo\nImprimir" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Imprimir a archivo" @@ -7610,7 +7719,7 @@ msgstr "Imprimir a archivo" msgid "Printer :" msgstr "Impresora :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Archivos imprimibles (*.prn)|*.prn|Todos los archivos (*.*)|*.*||" @@ -7618,11 +7727,11 @@ msgstr "Archivos imprimibles (*.prn)|*.prn|Todos los archivos (*.*)|*.*||" msgid "Printing" msgstr "Imprimiendo" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programa" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programas (*.exe)|*.exe|Todos los archivos (*.*)|*.*||" @@ -7630,11 +7739,11 @@ msgstr "Programas (*.exe)|*.exe|Todos los archivos (*.*)|*.*||" msgid "Progress" msgstr "Progreso" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Proyecto" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Propiedades" @@ -7642,7 +7751,7 @@ msgstr "Propiedades" msgid "Property Page" msgstr "Página de Propiedades" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Proveedor" @@ -7674,78 +7783,78 @@ msgstr "Podar (prune)" msgid "Prune (All remotes)" msgstr "Podar ([prune] todos los remotos)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" -msgstr "Pull (tomar)" +msgstr "Incorporar (pull)" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." -msgstr "Pull (tomar) requiere que el ramal local seleccionado sea el ramal actual." +msgstr "Incorporar (pull) requiere que el ramal (branch) local seleccionado sea el ramal actual." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." -msgstr "Pull (tomar)..." +msgstr "Incorporar (pull)..." #. Resource IDs: (302) msgid "Pull/Fetch" -msgstr "Pull/Fetch (tomar/descargar)" +msgstr "Incorporar/Descargar (pull/fetch)" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" -msgstr "Diff sobre tomado (pull)" +msgstr "Se incorporó (pull) el diff" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" -msgstr "Registro (log) del tomado (pull)" +msgstr "Se incorporó (pull) el registro (log)" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "Empu&jar" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" -msgstr "Empujar" +msgstr "Impulsar (push)" #. Resource IDs: (1786) msgid "Push Default" -msgstr "Impulsado (push) por defecto" +msgstr "Impulsión (push) predeterminada" #. Resource IDs: (65535) msgid "Push URL:" -msgstr "URL de impulsado (push):" +msgstr "URL de impulsión (push):" #. Resource IDs: (1385) msgid "Push notes" -msgstr "Notas de impulsado (push)" +msgstr "Notas de impulsión (push)" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" -msgstr "Empujar Eti&quetas" +msgstr "Impulsar (push) Eti&quetas" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." -msgstr "Empujar..." +msgstr "Impulsar (push)..." #. Resource IDs: (65535) msgid "Putty Key:" msgstr "Clave:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Clave Putty privada (*.ppk)|*.ppk|Todos los archivos (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Salir de aplicación, pedirá que guarde documentos\nSalir" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7763,23 +7872,27 @@ msgstr "Unidades R&AM" msgid "R&eset" msgstr "R&einiciar" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "R&estaurar este fichero desde el índice" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "R&evertir a esta revisión" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" -msgstr "INTEGRAR" +msgstr "Reasentar (rebase)" #. Resource IDs: (1769) msgid "Randomize Sync Dialog startup position" msgstr "Posición de inicio aleatoria del Cuadro de Diálogo de Sincronización (Sync)" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" -msgstr "Aleatorizar posición de arranque del Cuadro de Diálogo de Sincronización. Esto evita que pulse el botón Pull (tomar) del mismo diálogo." +msgstr "Designar al azar la posición de arranque del Cuadro de Diálogo de Sincronización. Esto evita que pulse por error el botón Incorporar (pull) del propio diálogo." #. Resource IDs: (1535) msgid "Range" @@ -7797,7 +7910,7 @@ msgstr "Re&moto:" msgid "Re&movable drives" msgstr "Unidades e&xtraíbles" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Re&nombrar..." @@ -7813,37 +7926,37 @@ msgstr "Re&inicia Todo" msgid "Re&store defaults" msgstr "Re&staurar predeterminados" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Res&tituir..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Alcanzable " -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Lee la 'Guía de uso diario' antes de que te atranques..." #. Resource IDs: (318) msgid "Rebase" -msgstr "Integrar" +msgstr "Reasentar (rebase)" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." -msgstr "Integrar \"%s\" hacia este..." +msgstr "Reasentar (rebase) \"%s\" sobre este..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." -msgstr "Integrar..." +msgstr "Reasentar (rebase)..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Integrando... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Reciente" @@ -7855,21 +7968,21 @@ msgstr "Archivo Reciente" msgid "Recently modified lines" msgstr "Líneas recientemente modificadas" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Sólo Grabar" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Recuparar documentos auto-salvados\nAbrir lversiones auto-salvadas en lugar de versiones guardadas de forma explícita" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" -msgstr "Recuperar a como estaba antes de integrar" +msgstr "Recuperar al estado anterior al reasentamiento (rebase)" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7883,17 +7996,21 @@ msgstr "Recursar submódulo" msgid "Recursive" msgstr "Recusivo" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "Rehacer" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Rehacer la acción deshecha anteriormente\nRehacer" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Reducir ventana a un icono" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref." @@ -7901,31 +8018,31 @@ msgstr "Ref." msgid "Ref (Click it then go to)" msgstr "Ref. (Haz clic en él y luego ve)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Lista de referencia" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Buscar Ref." -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "Reg.Ref." -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "NombrRef" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Actualizar" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Actualizando..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Filtro de expresión regular" @@ -7937,7 +8054,7 @@ msgstr "Filtros de expresión regular" msgid "Regex:" msgstr "Expresión regular (regex):" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7956,7 +8073,7 @@ msgid "" "\\s : whitespaces" msgstr "Fitros de expresiones regulares:\r\n. : cualquier carácter\r\nc+ : coincidir con carácter c una o más veces\r\nc* : coincidir con carácter c cero o más veces\r\n^ : inicio de línea\r\n$ : fín de línea\r\n(string){n} : coincidir cadena n veves\r\n(abcd) : subexpresiones\r\n[aei0-9] : coincidir a,e,i y 0..9\r\n[^aei0-9] : cualesquiera menos a,e,i y 0..9\r\n\r\n\\w : coincidencias a-z,A-Z,0-9 y _\r\n\\W : cualquier carácter no-alfanumérico\r\n\\d : dígitos 0-9\r\n\\s : espacios en blanco" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Rechazadas pedazos de parche para '%s'" @@ -7969,7 +8086,7 @@ msgstr "Tiempos relativos en el Reg." msgid "Reload" msgstr "Recargar" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8003,19 +8120,19 @@ msgstr "Ramal de seguimiento remoto" msgid "Remote Branch" msgstr "Ramal remoto:" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "URL Remota no debe estar vacía." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Actualización Remota" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "El nombre del Remoto no debe estar vacío." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Estado de Remoto" @@ -8027,12 +8144,12 @@ msgstr "Remoto:" msgid "Remove" msgstr "Quitar" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Quitar %ld objetos" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Quitar %s" @@ -8041,7 +8158,7 @@ msgstr "Quitar %s" msgid "Remove &all untracked files (-fx)" msgstr "Eliminar &todos los archivos sín seguimiento (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Eliminar &ramal" @@ -8049,21 +8166,21 @@ msgstr "Eliminar &ramal" msgid "Remove &non-ignored untracked files (-f)" msgstr "Eliminar archvios sín seguimiento &no-ignorados (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Elimina todos los comentario antes de realizar el diff para que los cambios del interior de los comentarios no se muestren como diferentes." -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Quitar de lista de &ignorados" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Quitar de la barra de herramientas de acceso rápido" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Quitar de lista de cambios" @@ -8075,7 +8192,7 @@ msgstr "Eliminar archvios ignorados (-fX)" msgid "Remove untracked directories (-d)" msgstr "Eliminar directorios sin seguimiento (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Quitar archivos sin seguimiento del árbol de trabajo, ..." @@ -8083,11 +8200,11 @@ msgstr "Quitar archivos sin seguimiento del árbol de trabajo, ..." msgid "Removed" msgstr "Quitado" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Quitado de la lista de cambios" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8095,7 +8212,7 @@ msgid "" "from the ignore list." msgstr "Quitado el archivo plantilla(s)\n%s\nde la ista de ignorados." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Quitado el archivo o archivo-mascara de la lista de elementos ignorados." @@ -8103,11 +8220,11 @@ msgstr "Quitado el archivo o archivo-mascara de la lista de elementos ignorados. msgid "Rena&me..." msgstr "Renom&brar..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Renombrado" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Renombrar %s" @@ -8116,20 +8233,20 @@ msgstr "Renombrar %s" msgid "Rename - TortoiseGit" msgstr "TortoiseGit - Renombra" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Renombrar \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Renombrar/mover" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Renombrar archivos/carpetas dentro del control de versión" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8139,7 +8256,7 @@ msgstr "Repetir la última acción\nRepetir" msgid "Replace &All" msgstr "Reemplazar &todo" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8153,12 +8270,12 @@ msgstr "Reemplazar con:" msgid "Replace:" msgstr "Reemplazar:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Reemplazadas %d coincidencias" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Reemplazando" @@ -8176,17 +8293,17 @@ msgstr "Repositorio:" #. Resource IDs: (334) msgid "Request pull" -msgstr "Solicitar pull (tomar)" +msgstr "Solicitar incorporación (pull)" #. Resource IDs: (65535) msgid "Requests a username and a password" msgstr "Se requiere un nombre de usuario y una contraseña" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Res&olver..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Reinicia" @@ -8198,25 +8315,25 @@ msgstr "Reinicia &Todo" msgid "Reset Type" msgstr "Tipo de Reinicio" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Reinicia \"%s\" a este..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Restablecer ramal activo" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Reiniciar columnas" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Restablecer ramal actual \"%s\" a" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Resolver" @@ -8224,126 +8341,122 @@ msgstr "Resolver" msgid "Resolve Submodule Conflict" msgstr "Resolver conflicto de submódulo" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Resolver conflictos usando 'el mío'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Resolver conflictos usando 'el de ellos'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Resuelto" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Resuelto:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Resuelve los archivos con conflictos" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" -msgstr "Reinicia integrar" +msgstr "Reiniciar reasentado (rebase)" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Restaurar" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Restaurar por defecto" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Restaurar después de consignar" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Restaurar ventana a tamaño normal" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Restaurado" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Reintentar" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Reintentando en 2 segundos..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Restituir" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Restituir consigna" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Restituir consigna %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Recuperar a la revisión anterior" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Recuperar a la revisión %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Restituido" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Restituye todos los cambios realizados desde la última actualización" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Restituye un añadido al control de versión" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Revisar Parche con TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Revisar/aplicar un archivo Dif. unificado con TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Revisar/aplicar un sólo &parche..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisión" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisión %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisión %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Gráfico de revisión" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Archivos de Revisión" @@ -8359,31 +8472,31 @@ msgstr "Filtro Gráfico de revisión" msgid "Revision graph" msgstr "Gráfico de Revisión" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Restituir revisión(ones). Todos los cambios se integrarán en tu copia de trabajado." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revisión:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Retroceder" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Rebobinando %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Texto erriquecido (RTF)\ntexto con fuente y formato de párrafo" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Vista derecha:" @@ -8391,21 +8504,21 @@ msgstr "Vista derecha:" msgid "Right image" msgstr "Imagen derecha" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Fila %d de%d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Fila %d-%d de%d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Fila abajo" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Fila arriba" @@ -8413,11 +8526,11 @@ msgstr "Fila arriba" msgid "S&elect..." msgstr "S&eleccionar..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "M&ostrar botones en una fila" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "M&ostrar botones en dos filas" @@ -8425,15 +8538,23 @@ msgstr "M&ostrar botones en dos filas" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Mostrar barra de herramientas de acceso rápido bajo la Cinta" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "O&mitir no seleccionados" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "Embalar (squash) no seleccionados" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "E&stadísticas" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "Conmutar/Comprobar..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8453,7 +8574,7 @@ msgstr "El servidor SMTP requiere autentificación" msgid "SMTP Server:" msgstr "Servidor SMTP:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, directo al servidor de destino" @@ -8461,11 +8582,11 @@ msgstr "SMTP, directo al servidor de destino" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8473,19 +8594,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "Tipo de consigna SVN" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "Dconsigna SVN..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" -msgstr "Recuperar de SVN" +msgstr "Descargar (fetch) del SVN" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" -msgstr "Reasentado de SVN" +msgstr "Reasentado (rebase) de SVN" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "Revisión SVN" @@ -8497,15 +8618,15 @@ msgstr "Se&guroCrLf:" msgid "Safe Crlf:" msgstr "Seguro CrLf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Mismo" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Consignas de la misma fecha" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8523,35 +8644,39 @@ msgstr "Ejemplo de mensaje de registro (log) para probar el bugtraq: cadenas de msgid "Sample text:" msgstr "Texto de ejemplo:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Salvar" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Guardar &como..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Guardar &como...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Guardar como" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Guardar fichero del fondo como\nSe le ha preguntado dónde guardar el fichero del fondo" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Guardar archivo" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Guardar el fichero de la izquierda como\nSe le ha preguntado dónde guardar el fichero de la izquierda" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8559,13 +8684,13 @@ msgid "" "%s" msgstr "Guardar el fichero de la izquierda\nLas modificaciones se guarda en\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Guardar el fichero de la derecha como\nSe le ha pregundado dónde guardar el fichero de la derecha" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8573,74 +8698,74 @@ msgid "" "%s" msgstr "Guardar el fichero de la derecha\nLas modificaciones se guardan en\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Salvar todo\nAmbos archivos serán guardados" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "Guardar y excluir\nSus cambios son guardados y se usa el contenido original" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "Guarde e ignore los bloques marcados\nSólo se guardan sus ediciones manules, los bloques marcados se dejan como están" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "Guardar e incluir\nSus cambios son guardados y se incluyen los bloques marcados" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Salvar como" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Guardar como..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Guardar como\nSe le ha preguntado dónde guardar el fichero" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "¿Guardar cambios a %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Guardar modificaciones." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "Guardar fichero de parche" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Guardar revisión &en..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Guarda el documento activo con un nuevo nombre\nGuardar Como" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Guardar documento activo\nGuardar" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8662,13 +8787,13 @@ msgstr "Guardar dif. unificado" msgid "Save unified diff since HEAD" msgstr "Guardar dif. unificado desde HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Guardar\nGuarda el fichero con los indicadores de conflicto." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8680,12 +8805,12 @@ msgstr "rdar\nLas modificaciones se guardan en\n%s" msgid "Saved Data" msgstr "Datos Guardados" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Fallo al guardar configuración (clave: \"%s\", valor: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Fallo al guardar nostas." @@ -8697,11 +8822,11 @@ msgstr "Escanear" msgid "Scintilla" msgstr "Ápice" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Desplazar a la izquierda" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Desplazar a la derecha" @@ -8709,7 +8834,7 @@ msgstr "Desplazar a la derecha" msgid "Se&ttings..." msgstr "Con&figuración..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Buscar mensajes de &Reg..." @@ -8721,20 +8846,20 @@ msgstr "Buscar &arriba" msgid "Search for:" msgstr "Búsqueda de:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Buscando la mejor ruta para aplicar el parche..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Búsqueda fallida en %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Seleccionar" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Seleccionar &Todo" @@ -8750,59 +8875,59 @@ msgstr "Seleccionar &Menú contextual:" msgid "Select &window:" msgstr "Seleccionar &ventana:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Seleccionar herramientas de color\nSeleccionar Color" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Seleccionar Archivo..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Seleccionar cliente SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Seleccionar un botón." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Seleccionar un objeto del que obtener ayuda" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Seleccionar lista de cambios" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Seleccionar aplicación dif." -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Seleccionar fichero" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Seleccionar la carpeta que quieres asociar a este seguidor de problemas" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Seleccionar carpeta a donde exportar.\nPuede que tengas que crear una nueva carpeta antes de realizar esta exportación." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Seleccionar carpeta a ejecutar sentencias para" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Seleccione la carpeta a donde guardar los archivos seleccionados" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Seleccionar archivo de script de enganche (hook)" @@ -8810,20 +8935,20 @@ msgstr "Seleccionar archivo de script de enganche (hook)" msgid "Select items automatically" msgstr "Seleccionar objetos automáticamente" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Seleccionar aplicación de 'merge'" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Seleccionar destino a combinar" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8835,15 +8960,19 @@ msgid "" "checker used for commit messages." msgstr "Seleccionar el idioma que este usando este proyecto. Esta configuración afecta al corrector ortográfico usado para los mensajes de consignación (commit)." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "Seleccionar ramal (branch) en seguimiento" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Seleccionar el visor de archivos dif." -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Seleccione qué fichero quiere guardar como" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8853,7 +8982,7 @@ msgstr "Seleccione qué fichero quiere guardar como\nNota: ¡Hay un conflicto no msgid "Select/deselect &all" msgstr "Seleccionar/deseleccionar &todo" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "Historial de selección" @@ -8861,7 +8990,7 @@ msgstr "Historial de selección" msgid "Send" msgstr "Enviar" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Enviar Correo" @@ -8869,11 +8998,11 @@ msgstr "Enviar Correo" msgid "Send Mail after create" msgstr "Enviar por Correo después de crear" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Enviar por correo Error al enviar el mensaje." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Enviar Correo..." @@ -8881,19 +9010,19 @@ msgstr "Enviar Correo..." msgid "Send Patch" msgstr "Enviar Ruta" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Enviar Ruta por Correo" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Enviar Ruta(s) por Correo" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Enviando contenido" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Enviando..." @@ -8913,28 +9042,28 @@ msgstr "Establecer au&tor" msgid "Set author &date" msgstr "Establecer &fecha de autoría" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." -msgstr "Establece el remoto como el \"pushremote\" (remoto de vertido) para el ramal local seleccionado." +msgstr "Establece el remoto como el \"pushremote\" (remoto de impulsión) para el ramal local seleccionado." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." -msgstr "Establece el ramal remoto como el \"pushbranch\" (ramal de vertido) para el ramal local seleccionado." +msgstr "Establece el ramal remoto como el \"pushbranch\" (ramal de impulsión) para el ramal local seleccionado." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Configurando propiedades..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Configuraciones" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Configuraciones - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8942,7 +9071,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Shell Extendido" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "¡La caché de iconos del Shell se reconstruyó!" @@ -8954,7 +9083,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "&Fecha/hora abriviada en los mensajes de reg." -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Acortar lista de propiedades" @@ -8966,7 +9095,7 @@ msgstr "Mostrar" msgid "Show &Accelerator for:" msgstr "Mostrar &Acelerador para:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Mostrar &Reflujo" @@ -8974,15 +9103,15 @@ msgstr "Mostrar &Reflujo" msgid "Show &Unversioned Files" msgstr "Mostar archivos &No versionados" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Mostrar Proyecto en &Conjunto" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Mostar &cambios" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Mostrar &Reg." @@ -8990,15 +9119,19 @@ msgstr "Mostrar &Reg." msgid "Show &log..." msgstr "Mostrar &Reg..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "Mostrar referencias (refs) &anidadas" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Mostrar &superposiciones y menú contextual sólo en el explorador" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Mostrar encima de la Cinta" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Mostrar por debajo la Banda" @@ -9006,35 +9139,35 @@ msgstr "Mostrar por debajo la Banda" msgid "Show Environment Variables" msgstr "Mostrar variables de entorno" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Mostrar menos Botones" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Mostrar revison de nodos HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Mostrar Dif.-enlínea , palabra a palabra\nDif.-enlínea por-palabra" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Mostar Dif. en línea\nDif. en línea" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Mostrar más Botones" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Mostrar barra de herramientas de acceso rápido encima de la Cinta" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Mostrar barra de herramientas de acceso rápido bajo la Cinta" @@ -9042,11 +9175,11 @@ msgstr "Mostrar barra de herramientas de acceso rápido bajo la Cinta" msgid "Show Screen&Tips on toolbars" msgstr "Mostrar Pantalla&Ayudas en barra de herramientas" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Mostrar espacios en blanco" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Mostrar una visión general de todo el gráfico" @@ -9054,7 +9187,7 @@ msgstr "Mostrar una visión general de todo el gráfico" msgid "Show asterisk log prefix" msgstr "Mostrar asterisco como prefijo de registro (log)" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "Mostrar asterisco como prefijo de registro (log) en el cuadro de diálogo de registro" @@ -9062,11 +9195,11 @@ msgstr "Mostrar asterisco como prefijo de registro (log) en el cuadro de diálog msgid "Show author" msgstr "Mostrar autor" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Mostrar ramales donde esta consignación (commit) está activa" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Mostrar cambios como dif. &unificado" @@ -9086,15 +9219,15 @@ msgstr "Mostrar fecha" msgid "Show describe in log" msgstr "Mostrar 'describe' en el registro (log)" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "Mostrar 'describe' en el cuadro de diálogo de registro (log)" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Mostrar carpeta destino" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Mostrar Dif." @@ -9106,11 +9239,15 @@ msgstr "Mostrar Dif. de la última consigna" msgid "Show excluded folders as normal" msgstr "Mostrar carpetas excluidas como normales" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "Mostrar cambios adicionales después de combinar (merge)" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Mostrar menús &completos después de un breve tiempo" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Mostrar nombre de fichero" @@ -9126,7 +9263,7 @@ msgstr "Mostrar archivos i&gnorados" msgid "Show ignore local changes flagged files" msgstr "Mostrar ficheros con indicador de ignorar cambios locales" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Mostrar sólo consignaciolnes (commits) e&tiquetados" @@ -9134,90 +9271,90 @@ msgstr "Mostrar sólo consignaciolnes (commits) e&tiquetados" msgid "Show linenumber&s" msgstr "Mostrar número&s de línea" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Mostrar reg." -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Mostrar reg. &antes de renombrar/copiar" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Mostrar registro (log) de %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Mostrar Reg. de submódulos" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Mostrar Reg. de esta carpeta" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Mostrar reg..." -#. Resource IDs: (96) +#. Resource IDs: (1535) 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: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Mostrar archivos modificados en el árbol de trabajo" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Mostrar siguiente cambio de la consigna seleccionada\nMostrar siguiente" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Mostrar nodos más viejos en la parte superior" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Mostrar u ocultar la barra de línea dif.\nAlternar BarraLíneaDif" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Mostrar u ocultar la barra de localización\nAlternar BarraLocalizac" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Mostrar u ocultar la barra de estado\nAlternar BarraEstado" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Mostrar u ocultar la barra de estado\nAlternar Barra Estado" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Mostrar u ocultar la barra de herramientas\nAlternar BarraHerramientas" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Mostrar número de línea original" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Mostrar cambio anterior de la consigna seleccionada\nMostrar anterior" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Mostrar propiedades de la revisión" @@ -9225,7 +9362,7 @@ msgstr "Mostrar propiedades de la revisión" msgid "Show shortcut &keys in ScreenTips" msgstr "Mostrar &teclas de acceso directo en la Pantalla de Consejos" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9235,7 +9372,7 @@ msgstr "Mostrar caracteres especiales para los espacios en blanco y saltos de l msgid "Show status of subrepositories in parent folders" msgstr "Mostrar estado de subrepositorios en carpetas progenitoras" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Mostrar símbolos en las etiquetas REF para partes sustituidas en los nombres de REF" @@ -9247,45 +9384,43 @@ msgstr "Mostrar archivos no &modificados" msgid "Show un&versioned files" msgstr "Mostrar archivos no &versionados" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Mostrando %1!d! referencia(s), %2!d! referencia(s) seleccionada(s)" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Mostrando %ld revisión(es), desde la revisión %s a la revisión %s - %ld revisión(es) seleccionada(s), %ld fichero(s) seleccionado(s)\n\n\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Muestra una representación gráfica de copias/etiquetas/ramales" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Mostrar todos los archivos que cambiaron desde la última actualización, localmente y en el repositorio" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "Mostrar todos los ficheros que fueron modificados desde la última consignacion (commit)" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Mostrar información sobre TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Mostrar reg. de referencias" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Muestra el archivo de reg. de acciones en el editor de texto predeterminado" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Mostrar el reg. del archivo/carpeta seleccionado(a)" @@ -9297,7 +9432,7 @@ msgstr "Fir&ma" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "Contribuciones significativas por: (vea el repositorio Git para una lista completa)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Estilo plateado" @@ -9305,20 +9440,20 @@ msgstr "Estilo plateado" msgid "Since" msgstr "Desde" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Tamaño" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Saltar" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Saltar Parche: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Omitir árbol de trabajo" @@ -9326,23 +9461,23 @@ msgstr "Omitir árbol de trabajo" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Omitir árbol de trabajo (\"Bloqueado\" en TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Saltado" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Saltado falta destino" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Diapositiva" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Caracter de pestaña inteligente" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Suave" @@ -9350,13 +9485,13 @@ msgstr "Suave" msgid "Soft: Leave working tree and index untouched" msgstr "Blando: Deja árbol de trabajo y índice intacto" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Alguno(s) archivo(s) se han cambiado fuera TortoiseGitMerge.\n¿Quieres cargar los cambios?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9370,7 +9505,7 @@ msgstr "Ordenar por cantidad de consignas" msgid "Sort tag list in reversed order" msgstr "Ordenar lista de etiquetas en orden inverso" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9380,49 +9515,53 @@ msgstr "Especifica cuantos objetos quieres mantener en el registro de diálogo d msgid "Spin1" msgstr "Madeja1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Dividir líneas" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Dividir la ventana activa en paneles\nDividir" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" -msgstr "Machacar" +msgstr "Compactar (squash)" + +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "Compactación (squash) (con consignación (commit) debajo)" -#. Resource IDs: (246) +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Gráfico de barras apilado" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Gráfico de líneas apilado" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Estándar" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Inicio (Avance-Rápido)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Iniciar Entresacar" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Iniciar enganche (hook) de consignado (commit)" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" -msgstr "Iniciar Integrar" +msgstr "Iniciar reasentado (rebase)" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Iniciar modo bifurcar..." @@ -9430,7 +9569,7 @@ msgstr "Iniciar modo bifurcar..." msgid "Start registry editor" msgstr "Iniciar el editor de registro" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Inicia un servidor git ejecutando el protocolo git" @@ -9442,39 +9581,47 @@ msgstr "Resguardar" msgid "Stash &Message" msgstr "&Mensaje de Resguardo" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Aplicar Resguardo" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Lista de Resguardos" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Meter Resguardo" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Guardar Resguardo" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Operación de reguardo en marcha..." +#. Resource IDs: (2705) +msgid "State" +msgstr "Estado" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Estático" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Estadísticas" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Estado" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "Barra de estado" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configuración de la Barra de Estado" @@ -9486,32 +9633,32 @@ msgstr "Colores de Estado y acciones" msgid "Status cache" msgstr "Caché de Estado" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Caché de Estado para una sola carpeta, con estado completo y superposiciones recursivas" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Caché de estado mantenida en un proceso externo que detecta archivos cambiados, puede mostrar las superposiciones recursivas" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Caché de estado sólo para una carpeta, sin superposiciones recursivas" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Detener el modo bifurcar" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "Almacena la ruta al fichero que va a usarsepara un diff en un posterior clic-primario. Mantener pulsado la tecla Ctrl para eliminar la última ruta guardada." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Estrategia" @@ -9519,15 +9666,15 @@ msgstr "Estrategia" msgid "Strip lines starting with \"#\" in commit message" msgstr "Despojar de líneas que comiencen con \"#\" al mensaje de consignación (commit)" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Estilo" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Asunto" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Asunto:" @@ -9535,7 +9682,7 @@ msgstr "Asunto:" msgid "Submodule" msgstr "Submódulo" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "Submódulo &Actualizar..." @@ -9543,7 +9690,7 @@ msgstr "Submódulo &Actualizar..." msgid "Submodule Add" msgstr "Añadir Submódulo" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Submódulo Añadir..." @@ -9551,15 +9698,15 @@ msgstr "Submódulo Añadir..." msgid "Submodule Diff" msgstr "Submódulo Dif." -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Submódulo Init" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Submódulo Sincr" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Submódulo Actualizar" @@ -9567,7 +9714,7 @@ msgstr "Submódulo Actualizar" msgid "Submodule Update Options" msgstr "Opciones de actualización de Submódulo" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9582,15 +9729,15 @@ msgstr "Submódulo del proyecto:" msgid "Submodules" msgstr "Submódulos" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Correcto" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Conmutar" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Conmutar %s a la %s, Revisión %s" @@ -9599,43 +9746,43 @@ msgstr "Conmutar %s a la %s, Revisión %s" msgid "Switch To" msgstr "Conmutar a" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Volver a la ventana del panel anterior\nPanel Anterior" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Cambiar entre vista de panel simple y doble" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Conmutar vista entre simple o doble pamel\nConmutar vista entre simple o doble pamel" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Cambiar vista izquierda y derecha" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Conmutar el contenido de la vista izquierda con la derecha\nConmutar vista izquierda y derecha" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Conmutar a la ventana del documento siguiente" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Conmutar a la ventana del panel siguiente\nSiguiente Panel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Conmutar a la ventana del documento anterior" @@ -9643,19 +9790,19 @@ msgstr "Conmutar a la ventana del documento anterior" msgid "Switch/Checkout" msgstr "Conmutar/Comprobar" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Conmutar/Comprobar a" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Conmutar/Comprobar a este..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Cambiar/Comprobar árbol de trabajo a otro ramal/etiqueta" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Intercambia la comparación izquierda<->derecha" @@ -9667,23 +9814,23 @@ msgstr "Simboliza nombres ref" msgid "Symlink" msgstr "Vínculo simbólico" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" -msgstr "Sincronizar repositorios remotos, incluyendo pull (adquirir), push (impulsar), email (correo), patch (parchear), y demás" +msgstr "Sincronizar repositorios remotos, incluyendo incorporaciones (pull), impulsiones (push), servicio de correo electrónico, y demás" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sincronizar..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Sistema" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "El sistema está en modo desconectado. Compruebe Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9693,11 +9840,11 @@ msgstr "Las entradas del registro del sistema se han eliminado y el archivo INI msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" @@ -9713,7 +9860,7 @@ msgstr "Pestaña Marcador" msgid "Tab size:" msgstr "Tamaño Pestaña:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Etiqueta" @@ -9721,16 +9868,16 @@ msgstr "Etiqueta" msgid "Tag (FF)" msgstr "Etiqueta (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Info Etiqueta" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Etiquetar el árbol de trabajo a %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Etiquetas" @@ -9738,11 +9885,11 @@ msgstr "Etiquetas" msgid "Tags:" msgstr "Etiquetas:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tareas" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Panel de Tareas" @@ -9754,11 +9901,11 @@ msgstr "Ficheros temporales (incluyendo imágenes de Gravatar)" msgid "Test" msgstr "Prueba" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Sólo Provisional" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Ficheros de texto (*.txt)|*.txt|Todos los ficheros (*.*)|*.*||" @@ -9766,13 +9913,19 @@ msgstr "Ficheros de texto (*.txt)|*.txt|Todos los ficheros (*.*)|*.*||" msgid "Thai" msgstr "Tailandés" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "La configuración remota ha cambiado\n¿Quieres guardar ahora o descartar los cambios?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "El valor \"número de\" para esas \"Últimas N\" opciones.\nDebe ser > 0" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9780,64 +9933,78 @@ msgid "" "Do you really want to delete it?" msgstr "El ramal \"%s\" en un ramal remoto.\n\n¿De verdad quiere eliminarlo?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "¡El tamaño cortado no coincide con el número de líneas a añadir/eliminar!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "El mensaje de la consigna no debe estar vacío." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "La URL del ayudante de credencial \"%s\" ya existe.\n¿Quiere sobreescribirla?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "El ayudante de credencial fue cambiado.\n¿Quiere guardar ahora o descartar los cambios?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "El árbol de trabajo actual no está limpio.\n¿Quieres guardar los cambios?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "La limitación por defecto de los mensajes de registro (log) cuando abre un cuadro de diálogo de Mensaje de Registro.\nNota: Para mostrar todas las consignaciones (commit) en el cuadro de diálogo Mensaje de Registro,\npuede hacer clic primario en el control de fecha \"DESDE\", y luego hacer clic en el elemento \"Sin limitación\"." + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "El motor del dif. abortó debido a un error:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "La referencia (ref) fuente introducida es ambigua.\n¡Tiene que hacerla única (ej. añadiendo \"refs/heads/\" (referencias/cabeceras) como prefijo para ramales o \"refs/tags/\" (referencias/etiquetas) para etiquetas)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "El ramal descargado (fetch) representa un avance rápido sobre el ramal actual.\n\n¿Fusionar (merge) o abrir el cuadro de diálogo reasentar (rebase) de todas formas?" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "¡El archivo %s no existe!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "¡El archivo %s no se encontró en el archivo de parche!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "El archivo \"%s\" no existe en tu arbol de trabajo.\n¿Quieres seleccionar otro archivo de diferencias?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9846,15 +10013,15 @@ msgid "" "Do you want to remove the file?" msgstr "El archivo \n%s\nestá vacío.\n¿Quieres eliminar el archivo?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "El archivo es muy grande" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "El archivo es muy grande para abrirlo." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9862,7 +10029,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "El archivo\n%s\n¡ya existe! ¿Quieres sobreescribirlo?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9870,14 +10037,14 @@ msgid "" "is not a valid text file!" msgstr "El archivo\n%s\n¡no es una rchivo de texto válido!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "La carpeta %s\ncontiene archivo(s) no versionado(s) y/o modificado(s). ¿Quieres quitarla de todos modos?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9886,78 +10053,78 @@ msgid "" "Would you like to create it first?" msgstr "La carpeta \n%s\nno existe.\n¿Quieres crearla primero?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "El script de enganche (hook) devolvió un error:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "La imagen no puede mostarse." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "El proveedor de seguimiento de problemas no se pudo crear. Por favor, comprueba que está instalado correctamente." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "El proveedor de seguimiento de problemas no pudo validar la cadena de parámetros" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "¡En la línea %d se esperaba la línea indicada en el nuevo archivo!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "El número de línea debe estar entre %d y %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "El ramal local \"%s\" no realiza avance-rápido (fast-forward) hacia el ramal remoto \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "Los nombres del ramal local y del ramal remoto están vacíos.\n¿Continuar?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "El nombre del ramal/etiqueta está vacío. Estó ocasionará el borrado del remoto.\n¿Continuar?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "El número máximo de líneas del reg. de acción a mantener.\nCualquier línea posterior añadida a este límite eliminará las líneas más antiguas del archivo." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "La operación ha fallado." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Los parámetros '/ruta' y '/rutadearchivo' son mutuamente excluyentes.\nSólo debes especificar uno de ellos." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "El parche no es limpiamente aplicable a %s, y no se proporcionó información de la versión.\n¡El parcheado no es posible!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9967,7 +10134,7 @@ msgid "" "do not match!" msgstr "¡El parche parece obsoleto! La línea\n%s del archivo\ny la línea de parche\n%s\n¡no coinciden!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9978,7 +10145,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "¡La ruta/URL que has introducido parece ser ilegal en Windows!\nPuedes intentarlo de todos modos, pero es posible que más adelante obtengas un error.\n\nUna ruta válida en windows no debe contener '<<>|\"?*:' o uno de los nombres de los siguientes dispositivos:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\n¿Quieres continuar de todos modos?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9989,36 +10156,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "El parche\n%s\nparece que no coincidir con rutas en el fichero de parches.\nPero TortoiseGitMerge ha encontrado la ruta\n%s\ncon mejor coincidencia. ¿Quieres usar la ruta sugerida en su lugar?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "El proceso aún está ejecutándose.\n¿Está seguro de abortar?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "¡La expresión regular no es válida!\nPor favor introduzca una expresión regular válida." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "El remoto \"%s\" ya existe.\n¿Quieres sobreescribirlo?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "El ramal remoto no ha cambiado.\n\n¿Abrir el cuadro de diálogo reasentar (rebase) de todas formas?" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "El repositorio se ha creado correctamente." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "El archivo seleccionado parece tener aún uno o más confictos marcados en el.\n¿Seguro que quieres marcar el archivo como resuelto?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10026,7 +10200,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "El submódulo \"%s\" está sucio.\nEs decir, consignar el superprojecto no puede rastrear ó salvar dichos cambios al submódulo.\n¿Consignar el submódulo ahora o ignorar los cambios sucios?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10035,7 +10209,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "¡La carpeta objetivo\n%s\nes una carpeta especial y no está pensada para que sea un repositorio raíz!\n¿Está seguro de que quiere inicializar un repositorio git dentro de esa carpeta?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10044,26 +10218,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "La carpeta de destino \n%s\n¡no está vacía!\n¿Seguro que quieres inicializar un repositorio git dentro de esa carpeta?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "El texto es idéntico, ¡pero los ficheros no coinciden!\nSe encontraron las siguientes diferencias:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "El tiempo en segundos después del cual el análisis de los archivos seleccionados se detiene.\r\nUn valor bajo hará antes disponible la lista de auto-comletado,\r\npero puede no escanear todos los archivos." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Las dos URL's seleccionadas no son creadas desde la misma raíz.\n¡No es posible mostrar los mensajes de reg. entre ellas!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10073,34 +10247,34 @@ msgstr "El árbol de trabajo (working tree) no está limpio y contiene cambios n msgid "Their file:" msgstr "Sus archivos:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "De ellos" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Hay cambios o objetos sin versionar dentro de uno o más submódulos.\nEsos archivos no son listados para consignar. Necesitas consignar estos archivos en el submódulo" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Actualmente hay %d controladores de superposición instalados además de los que usa Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Hay más vistas editables.\n¿Qué vista quiere guardar?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "No hay proveedores de seguimiento de problemas disponibles." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10109,85 +10283,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "¡Aún hay conflictos sin resolver en la línea %d!\nPrimero debes resolver estos conflictos antes de guardar.\n¿Aún así quieres guardar el archivo con los conflictos?\n¡Si haces clic en SI, tendrás que resolver los conflictos manualmente en otro editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "¡Hay modificaciones sin guardar!\n¿Quieres guardar los cambios?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "No hay nada que añadir. Todos los archivos y carpetas están ya bajo el control de versiones, se han ignorado o los parámetros de configuración global de ignorados los ignoró." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Diccionario" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Estos son guradados más recientemente que los documentos actualmente abiertos y contienen cambios que se realizaron antes de cerrar la aplicación." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Este campo es obligatorio y no puede estar vacío." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Esta no es una URL válida.\nPor favor, introduzca una URL aquí." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "¡Esta no es una ruta válida!\nUna ruta válida no debe contener '<<>|\"?*:' o uno de los nombres de los siguientes dispositivos:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "Esta operación no se puede iniciar mientras el cuadro de diálogo de registro (log) aún esté cargando consignaciones (commits)." -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Este programa está ligado a la exportación omitida de %s en el archivo %s. Esta máquina puede tener una versión incompatible de %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Este programa requiere el archivo %s, que no se encuentra en este sistema." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Esta propiedad sólo está permitida en carpetas, no en archivos." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" -msgstr "Este nombre remoto produce colisiona con las especificaciones de referencia (refspec) obtenidas de otros remotos\nPor favor use otro nombre" +msgstr "Este nombre remoto colisiona con las especificaciones de referencia (refspec) descargadas (fetch) de otros remotos\nPor favor, use otro nombre" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Esta tarea requiere un árbol de trabajo limpio." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Esto eliminará el registro de comandos que has usado en esta aplicación y restaurará el conjunto de comandos predeterminados visibles en los menús y barras de herramientas. No deshará ninguna personalización explícita. ¿Seguro que quieres hacer esto?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Dif. a tres bandas" @@ -10203,14 +10377,14 @@ msgstr "Mosaico horizontal" msgid "To" msgstr "A" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" -msgstr "Para evitar obtener la etiquetas incorrectas, si este no es un remoto oficial,\nle advertimos que deshabilite la obtención de etiqueta para este remoto.\n¿Deshabilitar la obtención de etiqueta?" +msgstr "Para evitar descargar (fetch) la etiquetas incorrectas, si este\nno es un remoto oficial, le advertimos que deshabilite la\ndescarga de etiqueta para este remoto.\n¿Deshabilitar la descarga de etiqueta?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10222,13 +10396,13 @@ msgstr "Para limpiar los ficheros temporalmente, debe asegurarse de que ningúna msgid "To:" msgstr "A:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Alternar entre mostrar Una/Dos páginas\nAlternar entre mostrar Una/Dos páginas" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Accionar filtros" @@ -10240,11 +10414,11 @@ msgstr "Barra de herramientas" msgid "Toolbar Name" msgstr "Nombre de barra de herramientas" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opciones de la barra de herramientas" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Error interno de la barra de herramientas. Por favor, póngase en contacto con su proveedor." @@ -10260,16 +10434,16 @@ msgstr "Herramientas" msgid "Tools:" msgstr "Herramientas:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10279,20 +10453,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit detectó que el fichero \"%s\" no existe, pero se presenta como \"Añadido\".\nEl cuadro de diálogo de consignación (commit) no puede manejar esto.\n\n¿Quiere eliminarlo del índice?" +"Do you want to restore or remove it from the index?" +msgstr "TortoiseGit detectó que el fichero \"%s\" no existe, pero aparece como \"Añadido\" or \"Modificado\".\nEl cuadro de diálogo de consignación (commit) no puede manejar esto.\n\n¿Quiere restaurarlo o eliminarlo de índice?" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit encontró nombres de archivos parecidos. ¿Quieres que el archivo:%s\ntambien sea renombrado?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit no mostrará los siguientes superpuestos: %s" @@ -10301,18 +10475,18 @@ msgstr "TortoiseGit no mostrará los siguientes superpuestos: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame ya fue inicializado para el repositorio \"%s\". No se puede cambiar durante la ejecución a otro repositorio (\"%s\")." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Versión %d.%d.%d.%d" @@ -10328,7 +10502,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Documentación\nTortoiseGitBlame.Documentación" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10336,7 +10510,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Una herramienta visual Dif, parte de TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10350,16 +10524,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10368,18 +10542,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge no puede procesar este fichero de parche. El nombre de fichero \"%s\" aparece más de una vez." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10418,11 +10592,11 @@ msgstr "Rastrear" msgid "Tracked Remote Branch:" msgstr "Ramal remoto rastreado:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Ramal rastreado" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Transfiriendo a %s" @@ -10431,39 +10605,35 @@ msgstr "Transfiriendo a %s" msgid "Transparent &color..." msgstr "&Color transparente..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Recortar a la derecha" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Intenta una 'Limpieza'. Si eso no funciona necesitas hacer una copia local nueva." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Inténtalo de nuevo" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turco" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Modificaciones TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Teclea" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Tipo:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "La URL y el directorio no deben estar vacíos." @@ -10487,24 +10657,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "No se pudo cargar el soporte del sistema de correo." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "No se pudo procesar el comando, servidor ocupado." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "No se pudo leer desde %1, está abierto por otro." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "No se pudo leer, es de solo-escritura." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10512,91 +10682,95 @@ msgid "" "from the top pane in the log dialog." msgstr "¡No se pudo reconstruir la ruta del árbol de trabajo!\nEsto pasará si el archivo se ha renombrado.\nPor favor, inicie el diálogo de registro solamente en este archivo y luego restituye los cambios\nen el panel superior del diálogo de registro." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "No se pudo escribir, es de solo-lectura." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "No se pudo escribir %1, es de solo-lectura ó está abierto por otro." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Desmarcar" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Deshacer" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Deshacer %d Acciones." -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Deshacer 1 Acción" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Deshacer Añadir..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Deshacer última acción\nDeshacer" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Deshacer últimas modificaciones\nDeshacer" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Formato de archivo inesperado." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "Retirar el distintivo omitir-árbol-de-trabajo y asumir-inalterado" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "desplegar" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Texto sin formato\ntexto sin formato alguno" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Diff unificado de las revisiones HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Desconocido" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Profundidad desconocida" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Desmarcar este bloque" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "¡Conflictos no resueltos!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "Vaciar la configuración del ramal (branch) en seguimiento" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Sin título" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "No versionado" @@ -10604,7 +10778,7 @@ msgstr "No versionado" msgid "Unversioned files mark parent folder as modified" msgstr "Archivos de la carpeta antecesora marcados como no versionados" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Desversionando %s" @@ -10617,23 +10791,23 @@ msgstr "Arriba" msgid "Update" msgstr "Actualización" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Referencia de actualización" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Actualizar submódulos" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Actualizado" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Actualizando objetos ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Actualizando índice" @@ -10645,30 +10819,26 @@ msgstr "Usar imagen &Predeterminada:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Usar &un-panel como vista predeterminada para 2-archivos dif." -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Usar &otro bloque de texto" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Usa 'mi' bloque de texto" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Usa 'mi' bloque de texto en lugar de el de 'ellos'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Usa 'su' bloque de texto" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Usa 'su' bloque de texto en lugar del 'mio'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Usar Bloques" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Usar el componente de ruta HTTP" @@ -10689,15 +10859,15 @@ msgstr "Usar Thin &Pack (Para conexiones de red lentas)" msgid "Use Unified Diff from &clipboard" msgstr "Usar Dif. Unificado desde el &portapapeles" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Usa otro nombre o utilizar el \"Forzar\" como opción para sobrescribir." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Utilice un nombre diferente o use la opción \"Reemplazar ramal\"." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10707,7 +10877,7 @@ msgstr "Usar todo el contenido de la vista izquierda\nUsar archivo Izqi" msgid "Use block from left before right" msgstr "Usar bloque de la izquierda antes que el derecho" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10717,25 +10887,25 @@ msgstr "Usar bloque de la vista izquierda antes que el derecho\nUsar bloque izqu msgid "Use block from right before left" msgstr "Usar bloque de la derecha antes que el izquierdo" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Usar bloque de la vista derecha antes que el izquierdo\nUsar bloque derecho antes que el izquierdo" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Usar ambos bloques de texto (este primero)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Usar ambos bloques de texto (este el último)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "Usar servidor configurado" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Usar bloque izq" @@ -10751,15 +10921,15 @@ msgstr "Usar color del ramal local para el ramal actual" msgid "Use recycle bin when reverting" msgstr "Usar la papelera de reciclaje al restituir" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Usar expresiones regulares" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Usar el bloque de la derecha" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Usar espacios" @@ -10767,61 +10937,61 @@ msgstr "Usar espacios" msgid "Use system locale for date/time" msgstr "Fecha/hora configurada por el sistema" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Usar bloque de texto '&mío'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Usar bloque de texto de '&ellos'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Usar bloque de texto '&mío' antes que el de '&ellos'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Usar bloque de texto '&mío' antes que el de '&ellos'Usar el bloque de texto 'mio' el lugar de el de 'ellos'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Usar bloque de texto '&mío'\nUsar el '&mío' como bloque de texto" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Usar bloque de texto de 'ellos' en lugar del 'mio'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Usar bloque de texto de 'ellos' antes que el 'mío'\nUsar el de 'ellos' como bloque de texto en lugar de el 'mío'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Usar bloque de texto de '&ellos' antes que el 'mío'\nUsar el de '&ellos' como bloque de texto" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Usar el bloque de texto de la vista Izqi\nUsar bloque Izqi" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Usar es&te bloque de texto" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "Usar la hora actual al establecer la fecha de autoría (author) y la fecha de consignación (commit)." -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10829,7 +10999,7 @@ msgid "" "%s" msgstr "Usar la ruta encontrada.\nAplicar el parche a\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10841,19 +11011,19 @@ msgstr "Usar la ruta original.\nAplicar el parche a\n%s" msgid "Use this" msgstr "Usar este" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Usar archivo &completo" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Usar este bloque a la izquierda" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Usar otro &archivo completo" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Usado para rectificar el aviso del ramal actual." @@ -10869,11 +11039,11 @@ msgstr "Info de Usuario" msgid "User Name:" msgstr "Usar Nombre:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Usuaro cancelado" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10883,11 +11053,11 @@ msgstr "El nombre de usuario y correo deben ponerse antes de consignar.\r\n ¿Qu msgid "User&name:" msgstr "NombreUser:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nombre de Usuario:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10906,7 +11076,7 @@ msgid "" "/line:" msgstr "Opciones válidas de línea de comandos son:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valor" @@ -10914,24 +11084,24 @@ msgstr "Valor" msgid "Version" msgstr "Versión" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Versión %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Versión 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Versión 1 (Hora de consignación (commit) más reciente)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Versión 2 (Base)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Versión 2 (Base) (Hora de consignación (commit) más reciente)" @@ -10939,11 +11109,11 @@ msgstr "Versión 2 (Base) (Hora de consignación (commit) más reciente)" msgid "Version Information" msgstr "Información de Versión" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versión:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versionados" @@ -10955,23 +11125,27 @@ msgstr "Vietnamita" msgid "View" msgstr "Ver" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Ver .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "Barras de vista" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Vista Parche" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Ver Parche>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Ver la revisión para ruta en visor web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Ver revisión en editor alternativo" @@ -10983,11 +11157,11 @@ msgstr "Ver gitconfig de todo el sistema" msgid "Visit our website" msgstr "Visita nuestra web" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10998,7 +11172,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ADVERTENCIA:\r\n¡Cambia estos ajustes sólo si estás seguro de lo que estás haciendo!\r\nPara ajustar los valores a predeterminados, borra el valor del texto." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Espera" @@ -11006,7 +11180,7 @@ msgstr "Espera" msgid "Wait for the script to finish" msgstr "Espera a que la sentencia termine" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Esperando una entrada" @@ -11014,15 +11188,15 @@ msgstr "Esperando una entrada" msgid "Walk Be&haviour" msgstr "Comportamiento en marcha" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Advertencia" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "¡Advertencia!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11030,7 +11204,7 @@ msgid "" "Do you really want to continue?" msgstr "Advertencia: \"%s\" se eliminará permanentemente. ¡NO se podrá recuperar!\r\n\r\n¿Realmente quieres continuar?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11038,56 +11212,56 @@ msgstr "Web" msgid "Western European" msgstr "Europa Occidental" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Cuando se activa, mantenga pulsada la tecla Mayús junto con clic-derecho para obtener los menús añadidos de TortoiseGit en al menú contextual" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Aplicando un parche, ignorará los cambios en espacios en blanco en las líneas contextuales si es necesario" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Al cerrar un cuadro de diálogo de progreso con una proceso de git en ejecución, pedir confirmación antes de matarlo (kill)." -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Cuando esté habilitado, TortoiseGit los elementos de menú contextual para mover estarán disponibles al arrastrar carpetas / ficheros" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Cuando está hablitado, los números de versión más grandes van primero. Esto es porque las últimas versiones son normalmente más útiles." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Habilitándolo, los objetos versionados que figuran en el diálogo de consigna se seleccionarán automáticamente" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Cuando el parche no se aplica limpiamente, recurrirá a combinar a tres bandas si el parche registra que són identicos los objetos se supone que se aplicará, y tendremos eso objetos disponibles a nivel local." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "Cuando teclea la URL, el nombre remoto se rellenará automáticamente con \"origen\" si el nombre remoto está vacío, así que no tiene que hacerlo." -#. Resource IDs: (96) +#. Resource IDs: (1533) 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" @@ -11097,15 +11271,15 @@ msgid "" "authentication and/or encryption." msgstr "Mientras se ejecuta el demonio, todos los datos de este repositorio son expuestos sin autentificación y/o cifrado." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Cambios de espacios en blanco (tabulaciones, espacios)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Espacios en blanco" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Posición de Ventana" @@ -11113,15 +11287,15 @@ msgstr "Posición de Ventana" msgid "Windows" msgstr "Ventanas" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11165,11 +11339,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "Dentro de un fichero:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Dentro de un fichero" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Árbol de Trabajo" @@ -11177,29 +11351,25 @@ msgstr "Árbol de Trabajo" msgid "Working Tree Path:" msgstr "Ruta del Árbol de Trabajo:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Cambios de directorio de Trabajo" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Acortar líneas largas" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Acortar líneas largas en el borde derecho de la vista\nAcortar líneas largas" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Si" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Sí a todo" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Ya tienes la última versión instalada." @@ -11209,51 +11379,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Aquí puedes deshabilitar controladores concretos de superposiciones.\nDeshabilita controladores que no van a usar una ranura de superposición y da a otras extensiones del shell la posibilidad de mostrar sus superposiciones." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "¡Sólamente puedes pegar bitmap con un tamaño de (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "¡No puedes crear más de %d barras de herramientas definidas por el usuario!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "¡No se pueden ajustar propiedades en carpetas, sólo en archivos!\nSi quieres ajustar todos los archivos de la carpeta,\ndebes activar las casilla 'recusivo'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "No puedes cambiar el tipo de esta ref. renombrándola." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "Tiene una versión antigua de Git para Windows (https://msysgit.github.io/) instalada, que contiene problemas de seguridad.\n\nDebe considerar una actualziación a la 1.9.5+." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Tienes maarcado \"incluir sin seguimiento\".\nEsto incluye una llamnada \"git clean -fd\", así que los archivos/directorios ignorados serán borrados sin/o usando la papelera de reciclaje." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "Ha marcado bloques cambiados. ¿Cómo deben guardarse esos bloques?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Has modificado las propiedades sín salvarlas previamente.\n¿Quieres guardarlas ahora?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11261,67 +11431,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Ha seleccionado %d elementos para los que mostrar las diferencias (diff).\nPara cada uno de estos elementos, se iniciará una nueva instancia del visor de diff.\n¿De verdad quiere mostrar las diff para tantos elementos a la vez?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "¡No has introducido número de problema!\n¿Seguro que quieres consignar, sin número de problema?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "¡No has introducido tu línea de Firmado-por!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Has marcado algunos archivos como \"Restaurar después de consignar\".\n¿Quieres restaurarlos ahora? Perderás todos los cambios en este archivo después de marcarlo." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Puedes definir hasta %d herramientas." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Debes introducir un mensaje de registro para la consigna." -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Debes reiniciar tu equipo para que los cambios surtan efecto." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "¡Debe seleccionar un nombre para el archivo zip!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Selecciona una carpeta.\r\nLa exportación sólo es posible en un archivo (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Selecciona un archivo no versionado.\nEl archivo será añadido al control de versiones cuando consignes." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "¡Debes introducir un texto!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "¡Debes seleccionar una imagen!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Has cambiado el juego de iconos de %s a %s.\n¡Este cambio no tendrá efecto hasta que reinicies tu equipo, o salgas y entres de nuevo!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11331,7 +11501,7 @@ msgstr "Tus mensages de Reg. previamente introducidos se han guardado.\nPulsa aq msgid "Your version is:" msgstr "Tu versión es:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Tu versión es: %d.%d.%d.%d" @@ -11341,10 +11511,10 @@ msgid "Zip File" msgstr "Archivo Zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Fuera Zoo&m" +msgid "Zoo&m out\t-" +msgstr "Ale&jar\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zoom" @@ -11356,80 +11526,80 @@ msgstr "&Dentro Zoom" msgid "Zoom &Out" msgstr "&Fuera Zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Dentro Zoom\nDentro Zoom" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Fuera Zoom\nFuera Zoom" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "De&ntro Zoom" +msgid "Zoom i&n\t+" +msgstr "Ace&rcar\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Dentro Zoom" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Fuera Zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zoom para encajar" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zoom para encajar en altura" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zoom para encajar en ancho" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Predeterminado]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[No asignado]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "\"%s\" contiene un repositorio git. No funcionará como un submódulo tal como está.\n¿Quiere borrar la .git-entry y añadir todos los ficheros en el repositorio más alto, o mantenerlo como un repositorio aparte en un subdirectorio?" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" contiene un submódulo git. Es probable que este no funcione más en el destino después de copiarlo.\n¿Quiere borrar la .git-entry y añadir todos los ficheros en el repositorio más alto, o ignorar este posible problema y mantenerlo?" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" no es válido." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" no es un repositorio" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11443,7 +11613,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "añadir \"entresacar desde\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "añadido" @@ -11451,7 +11621,7 @@ msgstr "añadido" msgid "added files" msgstr "archivos añadidos" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "un fichero sin nombre" @@ -11459,14 +11629,19 @@ msgstr "un fichero sin nombre" msgid "and support the developers" msgstr "y apoyar a los desarrolladores" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "considerar-válido" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "autor (>=0,5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "basado en TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11499,30 +11674,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "consignas" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "conflicto" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copiado desde\r\n%s - revisión %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "día" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "Eliminado" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "diff desde pipe" @@ -11534,7 +11709,7 @@ msgstr "muerto" msgid "eMail settings" msgstr "Configuraciones de correo electrónico" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11543,16 +11718,16 @@ msgid "" "%s" msgstr "exportado\n%s\na\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "externo" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git no se cerró limpiamente (código de salida %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorado" @@ -11560,15 +11735,15 @@ msgstr "ignorado" msgid "include &untracked" msgstr "incluir &sín seguimiento" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incompleto" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "heredar" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "objetos mantenidos localmente" @@ -11576,7 +11751,7 @@ msgstr "objetos mantenidos localmente" msgid "keep the file lists in English" msgstr "mantener las listas de ficheros en inglés" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11585,7 +11760,7 @@ msgid "" "%s = %ld" msgstr "línea: %d(+) %d(-) archivos: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11600,11 +11775,11 @@ msgstr "línea: %d(+) %d(-) archivos: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "combinado" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "faltante" @@ -11612,7 +11787,7 @@ msgstr "faltante" msgid "missing/deleted/replaced" msgstr "faltante/borrado/reemplazado" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "modificado" @@ -11620,7 +11795,7 @@ msgstr "modificado" msgid "modified/copied" msgstr "modificado/copiado" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mes" @@ -11628,40 +11803,44 @@ msgstr "mes" msgid "new branch" msgstr "nuevo ramal" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "no" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "no hay descripción disponible para este comando." -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "no-versionado" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "ninguno" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "no encontrado" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "atrancado" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "en %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "parcheado" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixels" @@ -11669,11 +11848,11 @@ msgstr "pixels" msgid "possible or real conflict/obstructed" msgstr "real o posible conflicto/atrancado" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestre" @@ -11681,35 +11860,35 @@ msgstr "trimestre" msgid "renamed" msgstr "renombrado" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "reemplazado" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "ruta de escaneado:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "Omitir-árbol de trabajo" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "conmutar a\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "ocúpese de los cambios de submódulos" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "a %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "a %s" @@ -11718,35 +11897,35 @@ msgstr "a %s" msgid "u&nknown changes" msgstr "cambios de&sconocidos" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "semana" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - todos los usuarios de Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - usario actual de Windows" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - sólo este repositorio" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "wincred - usuario actual de Windows" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - sólo este repositorio" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "año" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "si" diff --git a/Languages/Tortoise_fr.po b/Languages/Tortoise_fr.po index be633e97b..00d6fc7c2 100644 --- a/Languages/Tortoise_fr.po +++ b/Languages/Tortoise_fr.po @@ -22,9 +22,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: French (http://www.transifex.com/projects/p/tortoisegit/language/fr/)\n" "MIME-Version: 1.0\n" @@ -33,7 +33,7 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -55,138 +55,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# auteurs vus individuellement :" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB transféré" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 contenait un objet inattendu." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 contient un chemin incorrect." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 contient un schéma incorrect." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 a un mauvais format." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 n'a pas été trouvé." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! Jour" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! Jours" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! Heure" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! Heures" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! Minute" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! Mois" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! Mois" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! Seconde" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! Secondes" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! Semaine" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! Semaines" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! Année" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! Années" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! objets sélectionnés" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minutes" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" -msgstr "%1!s!↩⏎\nAffiche %2!d! fichiers, %3!d! sous-modules et %4!d! répertoires, %5!d! objets au total." +msgstr "%1!s!\r\nAffiche %2!d! fichiers, %3!d! sous-modules et %4!d! répertoires, %5!d! objets au total." -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" -msgstr "%1!s!↩⏎\nTaille %2!s!" +msgstr "%1!s!\r\nTaille %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1 : %2\nContinuer l'exécution du script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -194,52 +194,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nImpossible de trouver ce fichier.\nVérifier que le chemin et le nom du fichier spécifiés sont corrects." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig ou %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d octets transférés" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB transféré" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d livraisons en attente \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d files modifiés" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d fichiers supprimés." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d fichiers restaurés dans %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d fichiers sélectionnés, %d fichiers au total" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "Les %d auteurs les plus actifs avec au moins %d livraisons chacun (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -247,78 +247,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "transparence %i%%\ncliquez pour activer / désactiver la transparence\ndouble-cliquez pour activer / désactiver automatiquement la transparence" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minute(s) et %ld seconde(s)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld de %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - à la révision : %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [récupéré]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s en %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s nécessite Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, à %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Arborescence de travail" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) de %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Exporte %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nN'a pas pu être patché correctement." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nVoulez-vous le supprimer quand même?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -334,6 +334,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3 manière de fusionner" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Annuler" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&À propos de TortoiseGitBlame..." @@ -362,15 +366,15 @@ msgstr "&Ajouter un filtre" msgid "&Add New/Save" msgstr "&Ajouter nouveau/Enregistrer" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "L'&Ajouter" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Ajouter ou Supprimer des Boutons" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Ajouter..." @@ -410,7 +414,7 @@ msgstr "&Assigner" msgid "&Associate double-click event with:" msgstr "&Associer les événements double-clic avec :" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "Cacher &Automatiquement" @@ -426,15 +430,15 @@ msgstr "&Chargement automatique de la clef Putty" msgid "&Backup original file" msgstr "&Sauvegarde du fichier original" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Annoter..." -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Annoter les modifications" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Annoter les révisions" @@ -458,7 +462,7 @@ msgstr "&Branche :" msgid "&Browse Dir" msgstr "&Parcourir le répertoire" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Parcourir le dépôt" @@ -494,7 +498,7 @@ msgstr "&Catégorie:" msgid "&Choose commands from:" msgstr "&Choisir les commandes depuis:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Nettoyer..." @@ -518,7 +522,7 @@ msgstr "&Fermer la(es) fenêtre(s)" msgid "&Command:" msgstr "&Commande:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Livrer" @@ -526,23 +530,27 @@ msgstr "&Livrer" msgid "&Commit submodule..." msgstr "&Engager le sous module..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Livrer w/o" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "Livr&er..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Comparer les révisions" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "$Compresser le graphique" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Continuer" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copier" @@ -562,11 +570,11 @@ msgstr "&Personnalisé" msgid "&Default" msgstr "&Défaut" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "E&ffacer" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Supprimer (conserver localement)" @@ -574,7 +582,7 @@ msgstr "&Supprimer (conserver localement)" msgid "&Delete Filter" msgstr "Supprimer le filtre" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Supprimer à distance et en local" @@ -586,11 +594,11 @@ msgstr "&Détecter les lignes déplacées ou copiées" msgid "&Detect moved or copied lines:" msgstr "&Détecter les lignes déplacées ou copiées:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "Voir les &différences" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "Comparer avec la révision précé&dente" @@ -602,7 +610,7 @@ msgstr "&Répertoire :" msgid "&Disabled" msgstr "&Désactiver" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Rejeter" @@ -610,7 +618,7 @@ msgstr "&Rejeter" msgid "&Do the same for the rest" msgstr "Faire de &même pour le reste" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Ranger" @@ -618,11 +626,15 @@ msgstr "&Ranger" msgid "&Don't ask me again" msgstr "Ne plus &demander" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "Ne plus afficher ce message" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Bas" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Télécharger" @@ -630,11 +642,11 @@ msgstr "&Télécharger" msgid "&Edit" msgstr "&Editer" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Editer .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Editer TOUT" @@ -642,7 +654,7 @@ msgstr "&Editer TOUT" msgid "&Edit Filter" msgstr "Modifi&er le filtre" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Editer les conflits" @@ -667,10 +679,10 @@ msgid "&Enable edit" msgstr "&Activer l'édition" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "Quitt&er" +msgid "&Exit\tCtrl+W" +msgstr "Sorti&e\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exporter la sélection vers..." @@ -682,27 +694,27 @@ msgstr "&Externe" msgid "&File" msgstr "&Fichier" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Rechercher" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Trouver\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Adapter les images à la fenêtre" +msgid "&Fit images in window\tF" +msgstr "Ajuster l'images dans la &fenêtre\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "Disques &fixes" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flottant" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Suivre les renommages" @@ -714,7 +726,7 @@ msgstr "&Police des commentaires :" msgid "&Font:" msgstr "&Police :" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Forcer" @@ -734,9 +746,9 @@ msgstr "&Livraison de style Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Aller à\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" -msgstr "" +msgstr "&Griser les chemins modifiés non versionés" #. Resource IDs: (65535) msgid "&Green:" @@ -746,7 +758,7 @@ msgstr "&Vert:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Aide" @@ -754,7 +766,7 @@ msgstr "&Aide" msgid "&Help Topics" msgstr "Rubriques d'&aide" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Cacher" @@ -762,11 +774,11 @@ msgstr "&Cacher" msgid "&Icon Set:" msgstr "Jeu d'&icônes :" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorer" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorer %d éléments par nom" @@ -780,14 +792,14 @@ msgid "&Image" msgstr "&Image" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informations de l'image" +msgid "&Image info\tI" +msgstr "&Information de l'image\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Image uniquement" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importer..." @@ -799,7 +811,7 @@ msgstr "Répertoire &initial :" msgid "&Initialize submodules (--init)" msgstr "&Initialiser les sous-modules (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Installer" @@ -811,11 +823,11 @@ msgstr "&Aller directement à la première différence au chargement" msgid "&Keep CR" msgstr "&Conserver CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Conserver l'état actuel" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Labels" @@ -843,7 +855,7 @@ msgstr "$Limite:" msgid "&Line number" msgstr "Numéro de &ligne" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Numéro de &ligne (%d - %d)" @@ -860,7 +872,7 @@ msgstr "Vue en &liste" msgid "&Local Branch:" msgstr "Branche &locale :" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "Branches &locale " @@ -884,11 +896,11 @@ msgstr "Animations du &Menu :" msgid "&Menu contents:" msgstr "Contenu du &Menu :" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Fusionner" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "F&usionner..." @@ -944,6 +956,10 @@ msgstr "&Suivant >" msgid "&Next Page" msgstr "&Page Suivante" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Non" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Pas d'événement double-clic" @@ -960,31 +976,27 @@ msgstr "&Aucun" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Une Page" #. Resource IDs: (1828) msgid "&Onto" -msgstr "" +msgstr "Dans" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Ouvrir" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Ouvrir le site de Git pour Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Ouvrir..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Ouvrir...\tCtrl+O" @@ -997,18 +1009,18 @@ msgid "&Overlay Icon:" msgstr "$Icon de superposition" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Images de superposition" +msgid "&Overlay images\tO" +msgstr "Images de superp&osition\tS" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Mot de passe :" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "Co&ller" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "TOUT &prendre" @@ -1016,7 +1028,7 @@ msgstr "TOUT &prendre" msgid "&Port:" msgstr "&Port :" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Prévisualisation de l'Impression" @@ -1024,11 +1036,15 @@ msgstr "&Prévisualisation de l'Impression" msgid "&Print..." msgstr "&Imprimer..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "Im&primer...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Procéder" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Tirer" @@ -1036,10 +1052,14 @@ msgstr "&Tirer" msgid "&Push all branches" msgstr "&Pousser toutes les branches" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&ReLivrer" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "&Rebase" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "Commentaires &récents" @@ -1052,7 +1072,7 @@ msgstr "&Récursif" msgid "&Red:" msgstr "&Rouge:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Refaire" @@ -1068,7 +1088,7 @@ msgstr "&Rafraîchir" msgid "&Regular Expression" msgstr "Expression &Régulière" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "Me le &rappeler plus tard" @@ -1076,7 +1096,7 @@ msgstr "Me le &rappeler plus tard" msgid "&Remote Branch:" msgstr "Branche &distante" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "B&ranches distante" @@ -1084,7 +1104,7 @@ msgstr "B&ranches distante" msgid "&Remote:" msgstr "À &distance :" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Effacer" @@ -1096,7 +1116,7 @@ msgstr "&Enlever ce fichier de l'index" msgid "&Replace" msgstr "&Remplacer" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Navigateur-dépôt" @@ -1104,7 +1124,7 @@ msgstr "&Navigateur-dépôt" msgid "&Reset" msgstr "&Réinitialiser" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Réinitialiser la Barre d'outils" @@ -1120,23 +1140,27 @@ msgstr "&Réinitialiser mes données d'utilisation" msgid "&Reset to Default" msgstr "&Réinitialiser aux Valeurs par Défaut" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Résolu" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Restaurer" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Restaurer l'ancien état" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "&Réessayer" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Annuler les modifications de cette révision" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Annuler les modifications de ces révisions" @@ -1148,7 +1172,7 @@ msgstr "Client &SSH :" msgid "&Saturation:" msgstr "&Saturation" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Sauvegarder" @@ -1156,15 +1180,19 @@ msgstr "&Sauvegarder" msgid "&Save authentication" msgstr "&Enregistrer l'authentification" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "Enregistrer le graphique &sous..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Sauver la liste des fichiers sélectionnés vers..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Sauvegarder\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Set Git patch" @@ -1172,7 +1200,7 @@ msgstr "&Set Git patch" msgid "&Set upstream/track remote branch" msgstr "&Régler le flux d'envoi/la piste de la branche distante" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "Confi&guration" @@ -1192,7 +1220,7 @@ msgstr "&Afficher les labels texte" msgid "&Signing key ID:" msgstr "id de la clef de &signature :" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Sauter" @@ -1200,7 +1228,7 @@ msgstr "&Sauter" msgid "&Squash" msgstr "&Écraser" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Écraser TOUT" @@ -1212,7 +1240,7 @@ msgstr "&Départ" msgid "&Start Group" msgstr "Groupe de &Départ" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Sauvegarde" @@ -1232,7 +1260,7 @@ msgstr "Vue &symbolique" msgid "&Tab size:" msgstr "&Taille des tabulations :" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "Document &Tabulé" @@ -1240,7 +1268,7 @@ msgstr "Document &Tabulé" msgid "&Tag" msgstr "É&tiquettes" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Tags" @@ -1276,7 +1304,7 @@ msgstr "&Barres d'outils et Rangement des fenêtres" msgid "&Toolbars:" msgstr "&Barres d'outils:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1288,7 +1316,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Malle:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "Réessayer" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Deux Pages" @@ -1296,15 +1328,15 @@ msgstr "&Deux Pages" msgid "&URL:" msgstr "&URL :" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "Ann&uler" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Diff &unifié" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "Diff &unifiée avec" @@ -1316,7 +1348,7 @@ msgstr "&Disques inconnus" msgid "&Up" msgstr "&Haut" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "Mettre à jo&ur l'élément à la révision" @@ -1328,11 +1360,11 @@ msgstr "&Branche:" msgid "&Use auto-completion of file paths and keywords" msgstr "&Utiliser l'autocomplétion des chemins de fichiers et des mots-clé" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Nom :" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Affichage" @@ -1340,7 +1372,7 @@ msgstr "&Affichage" msgid "&View:" msgstr "&Voir:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Avertir de l'absence de signature de livraison" @@ -1356,6 +1388,10 @@ msgstr "&Mot entier" msgid "&Within file" msgstr "Dans le fichier" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "Oui" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&ignorer les changements d'espaces" @@ -1364,46 +1400,46 @@ msgstr "&ignorer les changements d'espaces" msgid "&known changes" msgstr "C&hangements connus" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit par défaut)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(de %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(pas de liste de changements)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(pas de numéro de ligne)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(pas de valeur)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(non trouvé)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(inconnu)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- tout -" @@ -1411,13 +1447,14 @@ msgstr "- tout -" msgid "--&all" msgstr "--&tous" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1425,7 +1462,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config dans le dépôt racine" @@ -1441,7 +1478,7 @@ msgstr ".gitignore dans les dossiers contenant les objets" msgid ".gitignore in the repository root" msgstr ".gitignore dans le dépôt racine" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig dans le dépôt racine" @@ -1457,31 +1494,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1490,66 +1527,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit est une extension du shell.\nCela signifie qu'il est intégré dans l'explorateur Windows.\nPour utiliser TortoiseGit veuillez ouvrir l'explorateur et faire un click-droit sur le dossier que vous souhaitez\nafin d'ouvrir le menu contextuel où vous trouverez toutes les commandes TortoiseGit.\nEt lisez le manuel !" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Attention : Aucun contrôle n'a été effectué pour savoir si ces branches sont complétement fusionnées sur HEAD." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Attention : Cette action supprimera les branches distantes." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Attention : Cette branche n'est pas totalement fusionnée sur HEAD." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "HEAD actuelle détachée, vous travaillez sur (aucune branche).\nVoulez-vous créer une branche maintenant?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Voulez-vous vraiment supprimer TOUTEla réserve ?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Application de la réserve en échec !!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Réservation POP en échec !!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Réservation échouée !!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "le répertoire précédent sur lequel appliquer le rebase existe toujours mais est un mbox\n\nQue voulez-vous ?" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Application de la réserve en échec, il y a des conflits" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Réservation POP en échec, il y a des conflits" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Application de la réserve réussie" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Réservation POP réussie" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Réservation réussie" @@ -1557,7 +1594,7 @@ msgstr "Réservation réussie" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1569,71 +1606,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." -msgstr "Une branche avec un nom identique à celui saisie pour le tag existe déjà (donc la référence est ambigue).⏎ Cela peut poser des problèmes, vous devriez donc éviter cela." +msgstr "Une branche avec un nom identique à celui saisie pour le tag existe déjà (donc la référence est ambigue).\nCela peut poser des problèmes, vous devriez donc éviter cela." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Une branche avec ce nom existe déjà." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Un processus de fusion est encours afin que cette livraison soit une livraison fusionnée. Si vous souhaitez annuler la fusion, vous devez réaliser une remise à zéro (reset) ou une mise à jour forcée." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Une nouvelle version est disponible. Veuillez télécharger la version actuelle!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Une liste de chemins séparés par saut de ligne pour lesquels le menu contextuel sera affiché.\r\nSi vous ajoutez un caractère '*' à la fin d'un chemin, alors tous les fichiers et les sous-répertoires sous ce chemin seront inclus aussi." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Une liste de chemins séparés par saut de ligne pour lesquels le menu contextuel ne sera pas affiché.\r\nSi vous ajoutez un caractère '*' à la fin d'un chemin, alors tous les fichiers et les sous-répertoires sous ce chemin seront exclus aussi.\r\nUne liste vide autorise le menu contextuel sur tous les chemins." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Une liste de chemins séparés par saut de ligne pour lesquels le menu contextuel sera affiché.\r\nSi vous ajoutez un caractère '*' à la fin d'un chemin, alors tous les fichiers et les sous-répertoires sous ce chemin seront exclus aussi.\r\nUne liste vide autorise le menu contextuel sur tous les chemins." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Une ressource demandée n'est pas disponible." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." -msgstr "Un tag avec un nom identique à celui saisie pour la branche existe déjà (donc la référence est ambigüe).⏎ Cela peut poser des problèmes, vous devriez éviter cela." +msgstr "Un tag avec un nom identique à celui saisie pour la branche existe déjà (donc la référence est ambigüe).\nCela peut poser des problèmes, vous devriez éviter cela." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Un tag avec ce nom existe déjà." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Un programme de visualisation des fichiers des fichiers de différence GNU (ou fichier patch).\r\nSi vous en avez pas d'autre, utilisez le NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "&Interrompre" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "À &propos" @@ -1649,11 +1686,11 @@ msgstr "Renommer avec des abréviations" msgid "Abbreviated size" msgstr "Taille des abréviations" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Interrompre" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "&Abandonner la fusion" @@ -1661,11 +1698,11 @@ msgstr "&Abandonner la fusion" msgid "Abort Merge" msgstr "Interrompre la fusion" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Interrompre la fusion en cours." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "A propos" @@ -1685,12 +1722,12 @@ msgstr "A propos de TortoiseGitMerge" msgid "Accept certificate" msgstr "Accepter le certificat" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "L'accès à %1 n'est pas autorisé." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Action" @@ -1698,26 +1735,26 @@ msgstr "Action" msgid "Action log" msgstr "Journal des actions" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Actions" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Liste des tâches courantes" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Fichiers Actifs" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Les objets ActiveX ne peuvent pas être sauvegardés pendant la fermeture de Windows !\nAnnuler toutes les modifications apportées à %1 ?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Ajouter" @@ -1725,7 +1762,7 @@ msgstr "Ajouter" msgid "Add &Signed-off-by" msgstr "Ajouter &Signé-de-par" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Ajouter '%s' au dictionnaire" @@ -1738,15 +1775,15 @@ msgstr "Ajouter à distance" msgid "Add \"&Signed-off-by\"" msgstr "Ajouter une \"&signature\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" -msgstr "" +msgstr "Ajouter une autre livraison ?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Ajouter un programme de comparaison selon l'extension" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Ajouter un programme de fusion selon l'extension" @@ -1754,15 +1791,15 @@ msgstr "Ajouter un programme de fusion selon l'extension" msgid "Add new files automatically to Git" msgstr "Ajouter les nouveaux fichiers automatiquement à Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Ajouter à la liste des &ignorés" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Ajouter à la Barre d'outils d'Accès Rapide" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Ajouter..." @@ -1770,11 +1807,11 @@ msgstr "Ajouter..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Ajout/Edition du programme de comparaison/fusion par extension" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Ajouté" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1782,25 +1819,25 @@ msgid "" "to the ignore list." msgstr "Les motifs de fichiers\n%s\nont été ajoutés à la liste des ignorés." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Ajouté" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Ajouter des fichiers sous contrôle de Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Ajouter le(s) fichier(s) sélectionné(s) ou le filtre de fichier à la liste des 'ignorés'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ajuster la configuration\nConfiguration" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avancé" @@ -1808,43 +1845,43 @@ msgstr "Avancé" msgid "Advanced Diff/Merge Settings" msgstr "Configuration avancée de la comparaison/fusion" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Configuration avancée de la comparaison" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Configuration avancée de la fusion" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Tout" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Toutes les Commandes" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Tous fichiers (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Tous fichiers (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Tous les parents" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Toutes les branches locales" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Toutes les références" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Tous les tags" @@ -1852,47 +1889,47 @@ msgstr "Tous les tags" msgid "All tags only" msgstr "Uniquement tous les tags" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Toutes vos modifications seront perdues ! Voulez-vous réellement réinitialiser toutes les barres d'outils et tous les menus ?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Toutes vos modifications seront perdues ! Voulez-vous réellement réinitialiser les raccourcis claviers ?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Toutes vos modifications seront perdues ! Voulez-vous réellement réinitialiser le menu '%s' ?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Toutes vos modifications seront perdues ! Voulez-vous réellement réinitialiser la barre d'outils '%s' ?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Autoriser l'édition pour cette vue\nAutoriser l'édition" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Autoriser l'utilisation d'URL Gravatar personnalisée" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." -msgstr "" +msgstr "Autoriser la création d'une livraison vide qui n'aurait qu'un message sans fichiers (cf. git commit --allow-empty)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Déjà à jour." @@ -1908,11 +1945,11 @@ msgstr "Toujours envoyer les modifications à la branche distante sélectionnée msgid "Always show long format" msgstr "Toujours montrer le long format" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Toujours utiliser les réglages internationaux du système pour afficher les heures et les dates" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Corriger" @@ -1920,12 +1957,12 @@ msgstr "Corriger" msgid "Amend &Last Commit" msgstr "Modifier la dernière livraison" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Un éditeur alternatif. Qui devrait de préférence prendre en charge les fins de ligne à la *nix." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1936,7 +1973,7 @@ msgid "" "%mine: the modified file" msgstr "Un programme externe de comparaison est utilisé\npour comparer différentes versions de fichiers\n\nVous pouvez utiliser les paramètres suivant pour le chemin :\n%base : nom du fichier de base\n%mine : le fichier modifié" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1949,34 +1986,34 @@ msgid "" "%base: the original file without your changes" msgstr "Un programme de fusion externe est utilisé\npour résoudre les fichiers en conflit\n\nVous pouvez utiliser les paramètres suivant pour le chemin :\n%merged : où enregistrer le fichier en conflit\n%theirs : le fichier tel qu'il est dans le dépôt\n%mine : votre fichier, avec vos propres modifications\n%base : le fichier original sans vos modifications" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Un descripteur de fichier invalide a été associé à %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Une erreur inconnue est survenue." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Une erreur inconnue est survenue lors de l'accès à %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Un type de ligne inconnu a été trouvé à la ligne %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Tags annotés" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Annexer le bloc de droite" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Annexer ce bloc à gauche" @@ -1988,11 +2025,11 @@ msgstr "Menus de la Bordure de l'Application :" msgid "Apply &Patch..." msgstr "Appliquer le patch..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Appliquer une série de patchs..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Appliquer un Patch..." @@ -2000,7 +2037,7 @@ msgstr "Appliquer un Patch..." msgid "Apply Patches" msgstr "Appliquer les patchs..." -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Appliquer une série de patchs contenus dans une boîte de messagerie" @@ -2008,7 +2045,7 @@ msgstr "Appliquer une série de patchs contenus dans une boîte de messagerie" msgid "Apply unified diff" msgstr "Appliquer un diff standard" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Style Aqua" @@ -2016,39 +2053,39 @@ msgstr "Style Aqua" msgid "Arabic" msgstr "Arabe" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL arbitraire :" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Êtes-vous sur de réinitialiser les colonnes ?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Êtes-vous sûr de vouloir interrompre le processus de rebase ?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Êtes-vous sûr de vouloir marquer le(s) fichier(s) en conflit comme résolu?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Êtes-vous sûr de vouloir faire revenir à l'ancienne version %d élément(s) ? Vous allez perdre toutes vos modifications depuis la dernière mise à jour !" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Êtes-vous sur de vouloir sauvegarder vers \"%s\" ?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Arranger &verticalement" +msgid "Arrange &vertical\tV" +msgstr "Arranger &verticalement\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Assigné à la liste de modifications '%s'" @@ -2057,11 +2094,11 @@ msgstr "Assigné à la liste de modifications '%s'" msgid "Assigned to:" msgstr "Assigné à:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Ignorer le suivi de modification locale" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Gérer manuellement le suivi de modification" @@ -2073,34 +2110,34 @@ msgstr "Assumer valide/inchangé (\"Besoin-verrou\" dans TortoiseSVN)" msgid "At file &creation" msgstr "A la &création du fichier" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "A la création du fichier" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "À la révision : %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Pour le moment, vous pouvez uniquement renommer les branches." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Une opération non supportée a été tentée." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Une tentative a été faite pour accéder à %1 après sa fin." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Une tentative a été faite pour lire %1 ouvert en écriture." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Une tentative a été faite pour écrire %1 ouvert en lecture." @@ -2117,11 +2154,11 @@ msgstr "Authentification" msgid "Authentication data" msgstr "Données d'authentification" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Auteur" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "E-mail de l'auteur" @@ -2129,7 +2166,7 @@ msgstr "E-mail de l'auteur" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Auteur:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Auteurs" @@ -2151,11 +2188,11 @@ msgstr "Convertion automatique des fins de ligne de style Windows" msgid "Auto Crlf:" msgstr "Fin de ligne auto :" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Cacher Automatiquement" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Cacher Tout Automatiquement" @@ -2163,23 +2200,23 @@ msgstr "Cacher Tout Automatiquement" msgid "Auto&Crlf" msgstr "&Fin de ligne auto :" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Fermeture automatique s'il n'y a pas de conflits" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Fermeture automatique s'il n'y a pas d'erreurs" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Fermeture automatique si aucune autre option n'est disponible" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Fermeture automatique s'il n'y a pas de fusions, ajouts ou suppressions" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2193,7 +2230,7 @@ msgstr "Chargement automatique de la &clef Putty" msgid "Autoload Putty &Key" msgstr "&Chargement automatique de la &clef Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatique" @@ -2213,7 +2250,7 @@ msgstr "Moyenne" msgid "B&rowse..." msgstr "Parcou&rir..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Retour" @@ -2225,7 +2262,7 @@ msgstr "Arrière plan" msgid "Baltic" msgstr "Balte" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Graphique en barre" @@ -2245,7 +2282,7 @@ msgstr "Fichier de base :" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Basé sur TortoiseIDiff de TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Info basique" @@ -2257,45 +2294,45 @@ msgstr "Entre les fichiers:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditionel)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bifurcation incorrecte" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bifurcation correcte" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Réinitialiser la bifurcation" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Début de la bifurcation" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\nun bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Style Black" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Annoter..." -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Annoter l'erreur" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Annoter la révision précédente" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Annote chaque ligne d'un fichier pour un auteur" @@ -2303,26 +2340,30 @@ msgstr "Annote chaque ligne d'un fichier pour un auteur" msgid "Blend alpha" msgstr "Fusionner la transparence" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Style Blue" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Corps" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg et /logmsgfile ont été spécifiés tous les deux !\nUn seul des deux peut être spécifié." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Les chemins du fichier de patch et de la cible doivent être absolus !" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Vue du bas:" @@ -2334,30 +2375,30 @@ msgstr "Parc&ourir..." msgid "Branc&h:" msgstr "Branc&he:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Branche" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Branche %s en retard sur %s\n%s sera transférée rapidement vers %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Branche (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Nom de la branche" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Nom de branche/tag incorrecte." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Le nom de branche/tag ne doit pas être vide ou est incorrecte." @@ -2369,11 +2410,11 @@ msgstr "Branche :" msgid "Bro&wse" msgstr "&Explorer" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Explorer les références" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Choix d'un programme externe de gestion des différences" @@ -2385,7 +2426,7 @@ msgstr "Explorer les références" msgid "Browse..." msgstr "Parcourir..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" @@ -2397,7 +2438,7 @@ msgstr "E&xpression de l'identifiant de bug:" msgid "Bug-ID/Issue-Nr:" msgstr "Bug-&ID/ N° d'incident :" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-IDs" @@ -2413,7 +2454,7 @@ msgstr "Testeur d'expression régulière Bugtraq - TortoiseGit" msgid "Button Appearance" msgstr "Apparence du Bouton" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Bouton1" @@ -2429,7 +2470,7 @@ msgstr "&Vérifier maintenant" msgid "C&ommands:" msgstr "C&ommandes:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&réer une branche/étiquette depuis une révision" @@ -2437,11 +2478,11 @@ msgstr "C&réer une branche/étiquette depuis une révision" msgid "C&urrent Keys:" msgstr "Touches Act&uelles :" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "Co&uper" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "MAJ" @@ -2457,11 +2498,11 @@ msgstr "Calculer" msgid "Can double-click in log list to compare with previous revision" msgstr "Peut double-cliquer dans la liste du journal pour comparer avec avec la révision précédente" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Ne peut pas activer un objet ActiveX statique." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2470,80 +2511,80 @@ msgid "" "%s" msgstr "Impossible de Copier \n%s\nvers\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Ne peut pas copier l'image dans le presse-papiers !" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Ne peut pas créer une nouvelle image !" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Impossible de modifier les menus !" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Ne peut pas coller l'image du presse-papiers !" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Annuler" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" -msgstr "Annuler⏎\n ne pas quitter TortoiseGitMerge" +msgstr "Annuler\nNe pas quitter TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "Annuler⏎\n Ne pas basculer les vues" +msgstr "Annuler\nNe pas basculer les vues" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "Annuler⏎\nGarder le fichier vide" +msgstr "Annuler\nGarder le fichier vide" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "Annuler⏎\nRésoudre les conflits d'abord." +msgstr "Annuler\nRésoudre les conflits d'abord." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" -msgstr "Annuler⏎\nRester avec les fichiers actuels" +msgstr "Annuler\nRester avec les fichiers actuels" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" -msgstr "Annuler⏎\nRester avec les réglages actuels" +msgstr "Annuler\nRester avec les réglages actuels" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Impossible de combiner les livraisons pour le moment.\nAssurez-vous que vous consultez le journal de votre branche courante et qu'aucun filtre n'est actif." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Ne peut pas forcer la mise à jour de la branche courante. Utiliser la command reset, si vous voulez le faire." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Impossible d'afficher l'annotation. \"%s\" n'est pas versionné par git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Il n'est pas possible de monter la diff en raison de retours à la ligne incompatibles dans ce fichier" @@ -2555,7 +2596,7 @@ msgstr "Cascade" msgid "Cascaded context menu" msgstr "Menu contextuel en cascade" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Sensible à la casse" @@ -2579,33 +2620,33 @@ msgstr "Vérification du certificat échouée !" msgid "Change log" msgstr "Changer le journal" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Modifier l'imprimante et les options d'impression\nConfiguration d'impression" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Changer les options d'impression\nPanneau de configuration" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Changez le style de l'application\nChanger le style" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Changer la position de la fenêtre" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Changer la taille de la fenêtre" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Changer le type" @@ -2613,38 +2654,38 @@ msgstr "Changer le type" msgid "Changed Files" msgstr "Fichiers modifiés" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Fichiers modifiées entre %s et %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Fichiers modifiés entre %s, %s et %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Fichiers modifiés : %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Lignes modifiées incluant les fichiers ajoutés/supprimés" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Lignes modifiées incluant les fichiers ajoutés/supprimés par date" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Lignes modifiées sans inclure les fichiers ajoutés/supprimés" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Lignes modifiées sans inclure les fichiers ajoutés/supprimés par date" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Liste des changements %s déplacée" @@ -2653,7 +2694,7 @@ msgstr "Liste des changements %s déplacée" msgid "Changes made (double-click on file for diff):" msgstr "Changements effectués (double-cliquez pour voir les différences) :" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Changer le style de l'application" @@ -2661,7 +2702,7 @@ msgstr "Changer le style de l'application" msgid "Char position where to show a border line in commit text boxes:" msgstr "Position du caractère à laquelle on affiche une ligne de bordure dans la boîte de texte de livraison" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Sélectionner" @@ -2673,31 +2714,31 @@ msgstr "Vérifier les mises à jour - TortoiseGit" msgid "Check For Updates..." msgstr "Vérifier les mises à jours..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Vérifier les modi&fications" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Vérifiez le chemin et/ou l'URL que vous avez entré" -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Sélectionnez les entrées de menu que vous voulez faire apparaître dans le menu contextuel supérieur au lieu du sous-menu TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Sélectionnez les entrées de menu que vous voulez faire apparaître dans le menu contextuel (SHIFT + clic-gauche)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Sélectionnez pour afficher le format de date et heure relatif dans le journal" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Sélectionnez pour utiliser un format de date et heure moins détaillé dans le journal" @@ -2705,31 +2746,31 @@ msgstr "Sélectionnez pour utiliser un format de date et heure moins détaillé msgid "Check:" msgstr "Vérifier : " -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Extraire" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "Extraction avec fusion" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Cherry Pick" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Cherry Pick échoué" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Livraisons sélectionnées pour le Cherry Pick..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Cherry Pick cette livraison..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Echec d'écrémage! On passe le commentaire?" @@ -2737,11 +2778,11 @@ msgstr "Echec d'écrémage! On passe le commentaire?" msgid "Chinese" msgstr "Chinois" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Choisir le dépôt" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Ordre chronologique inversé (défaut de git)" @@ -2753,78 +2794,78 @@ msgstr "Nettoyer" msgid "Clean Type" msgstr "Type de nettoyage" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Supprimer de façon permanente" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Supprimer à la poubelle" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Nettoyage banches distantes périmées" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Nettoyage" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Nettoyage." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Le nettoyage a échoué pour les chemins suivants :\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Le nettoyage a été effectué avec succès dans les chemins suivants :\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Nettoyer" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Outil Effacer\nEffacer" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Efface %ld URL stockées pour %ld arborescences de travail" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Efface %ld commentaires stockés pour %ld arborescences de travail" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Efface %ld paires nom d'utilisateur/mot de passe, %ld certificats SSL et %ld noms d'utilisateur" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Supprime les commentaires des répertoires %ld" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Supprime l'authentification stockée.\r\nVous devrez ressaisir vos nom/mot de passe pour tous les dépôts." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Efface les tailles et les positions stockées des %ld boîtes de dialogue." @@ -2833,7 +2874,7 @@ msgstr "Efface les tailles et les positions stockées des %ld boîtes de dialogu msgid "Click here to go to the website" msgstr "Cliquez ici pour accéder au site internet" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Cliquez ici pour sélectionner un commentaire précédent" @@ -2849,17 +2890,17 @@ msgid "" "extension" msgstr "Cliquez sur \"Avancé\" pour spécifier un programme de fusion par extension de fichiers" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Cliquer afin de voir les commandes pour déplacer des blocs de texte\nUtiliser des blocs de texte" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Presse-papiers" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Cloner" @@ -2867,7 +2908,7 @@ msgstr "Cloner" msgid "Clone Existing Repository" msgstr "Cloner un dépôt existant" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "&Cloner un dépôt" @@ -2875,49 +2916,49 @@ msgstr "&Cloner un dépôt" msgid "Clone into Bare Repo" msgstr "Cloner vers un dépôt nu" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Cloner..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Fermer" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Quitter le Mode Plein écran" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Fermer l'Aperçu avant Impression\n&Fermer" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Fermeture manuelle" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Fermer le mode aperçu avant impression\nAnnuler l'aperçu" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Fermer le document actif\nFermer" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Fermer la fenêtre avec demande de confirmation d'enregistrement" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Replier" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2943,7 +2984,7 @@ msgstr "Couleurs:" msgid "Combine One Mail" msgstr "Combiner en un seul email" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Combiner en une seule livraison" @@ -2951,11 +2992,11 @@ msgstr "Combiner en une seule livraison" msgid "Comman&ds:" msgstr "Comman&des:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Commande" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Ligne de commande" @@ -2963,7 +3004,7 @@ msgstr "Ligne de commande" msgid "Command Line To Execute:" msgstr "Ligne de commande à exécuter :" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Échec de la commande." @@ -2971,41 +3012,41 @@ msgstr "Échec de la commande." msgid "Commands" msgstr "Commandes" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Livrer" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "La livraison %s N'EST PAS encore visible." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Livraison %s non trouvée dans \"%s\". Mettre à jour le sous-module maintenant ?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Date de livraison" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Email de livraison" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Fin de livraison" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Informations de livraison" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Commentaires de livraison" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Nom de livraison" @@ -3013,7 +3054,7 @@ msgstr "Nom de livraison" msgid "Commit Ordering:" msgstr "Livraisons ordonnées:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Livrer le super projet" @@ -3021,19 +3062,19 @@ msgstr "Livrer le super projet" msgid "Commit to:" msgstr "Livrer vers :" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Livrer..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Livraisons par auteur" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Livraisons par date" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Livrer chaque %s" @@ -3042,15 +3083,15 @@ msgstr "Livrer chaque %s" msgid "Commits each week:" msgstr "Livraisons chaque semaine :" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Livrer vos modifications dans le dépôt" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "E-mail du commiteur" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3062,52 +3103,52 @@ msgstr "Livrer un dossier non-versionné n'ajoutera pas récursivement ses enfan msgid "Common Name:" msgstr "Nom commun :" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "comparer les révisions &HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Comparer les références sélectionnées" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Comparer deux fichiers" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Comparer les espaces" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Comparer avec l'arborescence de travail" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Comparer avec la b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Comparer avec la révision précédente" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Comparer tous les espaces lors de la différenciation\nComparer les espaces" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Compare le fichier avec la dernière version mise à jour pour afficher les changements que vous avez fait" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Comparaison de %s avec %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Terminé" @@ -3123,7 +3164,7 @@ msgstr "Source de configuration" msgid "Config type:" msgstr "Type de configuration:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Configurer l'expression régulière du filtre" @@ -3157,11 +3198,11 @@ msgstr "Configurer le programme de visualisation de fichiers de différences GNU msgid "Confirm to kill running git process" msgstr "Confirmer pour tuer le processus git en cours" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "conflit" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Fichiers conflictuels" @@ -3169,15 +3210,15 @@ msgstr "Fichiers conflictuels" msgid "Conflict resolved" msgstr "Conflit résolu" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "En conflit" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflits" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflits : %d" @@ -3190,98 +3231,98 @@ msgstr "Menus Contextuels:" msgid "Context lines for patches" msgstr "Lignes de contexte pour le patch" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continuer" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Contracter la fenêtre rangée" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Convertir les espaces en tabulations" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Convertir les tabulations en espaces" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Copier" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copié" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copier" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copie de %s vers %s, Révision %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Copier SHA-1 dans le presse-papiers" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Outil Copier\nCopier" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copier toutes les informations dans le presse-papiers" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copier et renommer" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Copier les messages des journaux dans le presse-papier" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Copier le commentaire dans le presse-papiers" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copier les chemins dans le presse-papiers" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Copier les noms ref" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copier la sélection dans le &presse-papiers" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copier la sélection et la mettre dans le presse papiers\nCopier" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copier dans le presse-papiers" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copier : Nouveau nom pour %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Copie de %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Copie..." @@ -3289,25 +3330,25 @@ msgstr "Copie..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Corrections" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Ne peut pas ajouter %s à la liste des ignorés !" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Ne peut pas vérifier la disponibilité d'une nouvelle version !" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "Ne peut pas vérifier la disponibilité d'une nouvelle version! %s (Code d'erreur: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3315,76 +3356,76 @@ msgid "" "%s" msgstr "Impossible de copier les fichiers!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 ne peut pas être créé parce que le répertoire est plein." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Impossible de déterminer la dernière révision livrée !" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Impossible de trouver le super-projet" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Ne peut pas obtenir l'état !" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 ne peut pas être ouvert car il y a trop de fichiers ouverts." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Ne peut pas ouvrir le fichier\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 ne peut pas être supprimé puisque c'est le répertoire courant." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Ne peut pas retirer %s de la liste des ignorés" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Impossible de réinitialiser à la première livraison (première étape). Interruption..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Impossible de déterminer la dernière révision livrée (seconde étape). Interruption..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Impossible de revenir au HEAD original." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Ne peut pas obtenir l'URL du fichier !\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Ne peut pas récupérer la révision %s du fichier %s.\nL'application du patch n'est pas possible !" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Ne peut pas démarrer TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3392,7 +3433,7 @@ msgid "" "%s" msgstr "Impossible de démarrer le visionneur de différences!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3400,7 +3441,7 @@ msgid "" "%s" msgstr "Impossible de démarrer le programme externe de différenciation!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3408,11 +3449,11 @@ msgid "" "%s" msgstr "Impossible de démarrer le programme externe de fusion!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Ne peut pas démarrer l'impression." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3420,11 +3461,11 @@ msgid "" "%s" msgstr "Impossible de démarrer le visionneur de texte!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Impossible de lancer l'agent Putty (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Ne peut pas démarrer l'unité d'exécution(thread) !" @@ -3432,7 +3473,7 @@ msgstr "Ne peut pas démarrer l'unité d'exécution(thread) !" msgid "Coun&t" msgstr "Comp&ter" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Nombre: %u correspondances." @@ -3445,15 +3486,15 @@ msgstr "Créer une bibliothèque" msgid "Create .gitignore file" msgstr "Créer le fichier .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Créer une branche" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Créer une branche depuis cette révision..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Créer une branche..." @@ -3465,29 +3506,29 @@ msgstr "Créer une liste de changements" msgid "Create New Branch" msgstr "Créer une nouvelle branche" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Créer une série de patchs..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Créer une étiquette" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Créer une étiquette depuis cette révision..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Créer une étiquette..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Créer un nouveau document\nNouveau" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3496,49 +3537,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Créer un clone allégé avec un historique tronqué au nombre de révisions spécifié. Un dépôt allégé a un certain nombre de limitations (vous ne pouvez ni le cloner li l'extraire, ni pousser quelque soit le sens), mais il est adéquate si vous êtes uniquement intéressé par l'historique récente d'un grand projet avec une longue histoire, et souhaitez envoyer des corrections sous forme de patch." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Créer le fichier de patch" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Créer une &demande de tirage" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Créer un &dépôt ici..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Créé" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Création d'une branche ou d'une étiquette" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Création d'un répertoire de bibliothèque avec des paramètres spéciaux pour les arborescences de travail de Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Crée un fichier de mise à jour des différences entre les deux fichiers\nCréer un fichier de mise à jour" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Crée un dépôt dans le répertoire courant" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Crée un fichier de différence, au format unifié, avec toutes vos modifications" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Création de demande d'extraction..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "\"Credential helper\" ne doit pas être vide." @@ -3550,7 +3591,7 @@ msgstr "Crédit des aides:" msgid "Credentials" msgstr "Crédits" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "C&ouper" @@ -3558,7 +3599,7 @@ msgstr "C&ouper" msgid "Current" msgstr "Courant" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Branche courante" @@ -3566,7 +3607,7 @@ msgstr "Branche courante" msgid "Current Branch:" msgstr "Branche courante :" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3578,7 +3619,7 @@ msgstr "La branche courante %s est à jour\n\nSi vous voulez forcer le rebase, m msgid "Current version is:" msgstr "La version courante est :" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "La version courante est : %s" @@ -3591,7 +3632,7 @@ msgstr "&Personnaliser..." msgid "Custom" msgstr "Personnalisé" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personnaliser" @@ -3599,19 +3640,19 @@ msgstr "Personnaliser" msgid "Customize Keyboard" msgstr "Personnaliser le Clavier" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Personnaliser la Barre d'outils d'Accès Rapide" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Personnaliser la Barre d'outils d'Accès Rapide..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Personnaliser..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3625,88 +3666,92 @@ msgstr "Cyrillique" msgid "DCommit Type" msgstr "Type de DCommit" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Service" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Date" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Date de dernière livraison" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Défaut" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menu par Défaut" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Menu application par défaut. Apparaît quand aucun document n'est ouvert." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "Limites par défaut des messages du journal:" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Encodage UTF-8 par défaut" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Supprimer" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Supprimer %d branches" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Supprimer %d branches distantes" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Supprimer %d étiquettes" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Supprimer &localement" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Supprimer Ref..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Supprimer toutes les étiquettes" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Supprimer et &ignorer %d éléments par nom" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Supprimer et ajouter à la liste des &ignorés" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Supprimer et ignorer %d éléments par &extension" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Supprimer la branche" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Supprimer la branche / étiquette" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Supprimer la branche distante" @@ -3714,34 +3759,34 @@ msgstr "Supprimer la branche distante" msgid "Delete remote tag - TortoiseGit" msgstr "Supprimer le tag distant - Tortoisegit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Supprimer l'étiquette distante sur \"%s\"..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Supprimer les tags distants..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Supprimer le sous module" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Supprimer l'étiquette" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Effacer la branche existante ou utiliser un autre nom." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "Supprimer⏎\nLe fichier est retiré." +msgstr "Supprimer\nLe fichier est retiré." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Effacé" @@ -3749,36 +3794,36 @@ msgstr "Effacé" msgid "Deleted merge conflict" msgstr "Supprimer le confit de fusion" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Supprimer et ajouter le(s) fichier(s) sélectionné(s) ou le filtre à la liste des fichiers à ignorer" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Effacer les fichiers / les répertoires du contrôle de version" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Supprime les fichiers / les répertoires du contrôle de version en conservant les fichiers" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Supprime le journal des actions" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Supprime" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Efface les données du cache" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Efface les fichiers" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Supprimer les refs distant..." @@ -3798,7 +3843,7 @@ msgstr "Description" msgid "Describe Strategy" msgstr "Décrire la stratégie" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Description" @@ -3806,7 +3851,7 @@ msgstr "Description" msgid "Description:" msgstr "Description:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Désélectionner la liste de changement" @@ -3814,33 +3859,33 @@ msgstr "Désélectionner la liste de changement" msgid "Destination" msgstr "Destination" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Le disque de destination est plein." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Détecter et mettre en évidence les blocs déplacés" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Détecter les lignes déplacées ou copiées dans les fichiers existants de n'importe quelle livraison" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Détecter les lignes déplacées ou copiées dans les fichiers existants des livraisons où le fichier de destination a été créé" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Détecter les lignes déplacées ou copiées dans les fichiers modifiés de la même livraison" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Détecter les lignes copiées ou modifiées dans le fichier" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3854,11 +3899,15 @@ msgstr "Tailles et positions des boîtes de dialogue" msgid "Dialogs" msgstr "Boîtes de dialogue" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Options du Diff" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Diff de deux livraisons" @@ -3890,7 +3939,7 @@ msgstr "Fichier diff :" msgid "Diff header" msgstr "Diff les en-têtes" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Diff plus tard" @@ -3902,12 +3951,12 @@ msgstr "Diff la position" msgid "Diff removed lines" msgstr "Diff les lignes supprimées" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Diff avec \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Comparer avec le parent %d" @@ -3920,19 +3969,19 @@ msgstr "Différences entre" msgid "Diffing" msgstr "Voir différence" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Différenciation des livraisons" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Compare le fichier de l'arborescence de travail avec celui avant la dernière livraison." -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Diff de deux des livraisons" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Rép..." @@ -3944,26 +3993,26 @@ msgstr "Répertoire :" msgid "Disable sounds" msgstr "Désactiver le son" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Désactiver cette option si vous avez une énorme arborescence de travail et que vous constatez trop d'accès disque lorsque vous explorez l'arborescence de travail." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Désactiver les recherches de mises à jour" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Désactivé" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disque plein pendant l'accès à %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Envoie l'exception : %1" @@ -3972,44 +4021,52 @@ msgstr "Envoie l'exception : %1" msgid "Display &buttons in this order" msgstr "Afficher les &boutons dans cet ordre" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Afficher les pages entières\nApreçu avant impression" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Aide sur les éléments d'interface\nAide" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Voir l'aide pour la tâche courante ou la commande\nAide" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Instruction pour utiliser l'aide\nAide" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Voir les informations du programme, sa version et son copyright\nÀ propos" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "Afficher le sujet et le corps des messages de livraison" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "Ne &plus montrer ces alertes (si Continuer est choisi)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "&Ne pas montrer à nouveau cet avertissement (si Ignorer est sélectionné)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "Ne pas sélectionner automatiquement les fichiers \"manquants\" (effacés, mais non suivis)" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Ne pas sélectionner automatiquement les sous-modules" @@ -4022,54 +4079,71 @@ msgstr "Ne pas afficher le menu contextuel pour les chemins suivants :" msgid "Do not use recycle bin" msgstr "Ne pas utiliser la corbeille" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Voulez-vous vraiment supprimer %s ?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Voulez-vous vraiment supprimer la barre d'outils '%s' ?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "Voulez-vous vraiment désactiver les recherches de mises à jour pour TortoiseGit?\n\nLes recherches de mises à jour peuvent être réactivées dans l'onglet général des paramètres de TortoiseGit." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Voulez-vous réellement marquer le(s) fichier(s) sélectionné(s) comme supposé valide?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Voulez-vous réellement marquer le(s) fichier(s) sélectionné(s) comme a ne pas afficher dans l'arborescence de travail?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Voulez-vous vraiment déplacer ce fichier ou ce répertoire ?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Voulez-vous vraiment supprimer de manière permanante les %d références séletionnées ?\nElles ne pourront PAS être restaurées !" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "Voulez-vous vraiment supprimer \"%s\" de l'index ?" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Voulez-vous vraiment supprimer \"%s\" ?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "Voulez-vous vraiment supprimer les %d fichiers/dossiers sélectionnés de l'index ?" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "Voulez-vous vraiment supprimer les %d fichiers/dossiers sélectionnés ?" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Êtes-vous sûr de vouloir restaurer la copie ? Vous perdrez toutes vos modifications depuis la création de la copie." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,7 +4151,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Voulez-vous vraiment annuler toutes vos modifications dans \n%s\net revenir à cette révision ? Ces changements seront fusionnés dans votre arborescence de travail." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4085,21 +4159,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Voulez-vous vraiment annuler toutes vos modifications dans \n%s\nqui ont été faites sur cette révision ? Ces changements seront fusionnés dans votre arborescence de travail." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "Voulez-vous réellement marquer le(s) fichier(s) sélectionné(s) comme à ne pas afficher dans l'arborescence de travail?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Voulez-vous chercher des branches distantes à partir des branches distantes nouvellement ajoutées ?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Voulez-vous charger les fichiers modifiés?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4107,21 +4181,21 @@ msgid "" "as resolved?" msgstr "Voulez-vous marquer le fichier\n%s\ncomme résolu?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Voulez-vous récupérer ces documents automatiquement sauvegardés?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Voulez-vous recharger le document pour tenir compte du changement des options ?\nNote : vous allez perdre vos dernières modifications !" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Voulez-vous voir les modifications ?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Voulez-vous ouvrir la sauvegarde ?" @@ -4129,42 +4203,42 @@ msgstr "Voulez-vous ouvrir la sauvegarde ?" msgid "Document :" msgstr "Document :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Je ne sais pas ce qui poussera, car la branche \"%s\" est inconnue" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Je ne sais pas ce qui va pousser parce que vous entrez l'URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Ne pas récupérer les documents sauvegardés automatiquement\nUtiliser la dernière version explicitement sauvegardée des documents" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" -msgstr "Ne pas sauver⏎\nFermer les vues sans sauver les modifications" +msgstr "Ne pas sauver\nFermer les vues sans sauver les modifications" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "Ne pas sauver⏎\nRecharger les vues sans sauver les modifications" +msgstr "Ne pas sauver\nRecharger les vues sans sauver les modifications" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" -msgstr "" +msgstr "Ne pas afficher les éléments sélectionnés: (appuyez sur la touche shift pour les afficher)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Ne plus afficher ce message" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Terminé" @@ -4176,7 +4250,7 @@ msgstr "Bas" msgid "Download" msgstr "Télécharger" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Glisser pour rendre ce menu flottant" @@ -4204,6 +4278,10 @@ msgstr "Bouton de formulaire factice " msgid "Dumy Group For locat TabCtr" msgstr "Groupe factice pour locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "Mo&difier les non sélectionnés" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "E&xclure les chemins :" @@ -4212,7 +4290,7 @@ msgstr "E&xclure les chemins :" msgid "E&xit" msgstr "&Quitter" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xporter..." @@ -4232,11 +4310,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Europe de l'est" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Editer" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Modifier le fichier .gitconfig &global" @@ -4252,23 +4330,23 @@ msgstr "Editer .tgitconfig" msgid "Edit Button Image" msgstr "Editer l'Image de Bouton" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Editer les notes" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Editer l'auteur" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Editer la description" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Editer les programmes de diff spécifiques aux extensions" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Editer programme de fusion selon extension" @@ -4280,11 +4358,11 @@ msgstr "Modifier le fichier .gitconfig &global" msgid "Edit global &XDG git/config" msgstr "Modifier la configuration globale du fichier git/.config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Modifier la configuration locale de Git" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Editer l'historique des messages" @@ -4298,31 +4376,31 @@ msgstr "Éditer..." #. Resource IDs: (1827) msgid "Edit/Split commit" -msgstr "" +msgstr "Modifier/Découper la livraison" #. Resource IDs: (1770) msgid "Effective" msgstr "Effectife" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Le nom ou l'adresse IP du serveur de proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Outils Ellipse\nEllipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Les champs 'À' et 'Copie à' ne peuvent pas être vide en même temps." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Emails" @@ -4330,7 +4408,7 @@ msgstr "Emails" msgid "Empty" msgstr "Vide" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Activer l'édition" @@ -4346,7 +4424,7 @@ msgstr "Activer Gravatar" msgid "Enable drag context menu" msgstr "Activer le menu contextuel par glisser" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Activer chargement/sauvegarde les fichiers cache du journal (tortoisegit.data, tortoisegit.index)" @@ -4355,10 +4433,14 @@ msgstr "Activer chargement/sauvegarde les fichiers cache du journal (tortoisegit msgid "Enable log cache" msgstr "Activer le cache du journal" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Activer l'affichage des images Gravatar dans la fenêtre du journal" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "Activer la coloration syntaxique" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Gestionnaires de Recouvrement Activés" @@ -4367,35 +4449,35 @@ msgstr "Gestionnaires de Recouvrement Activés" msgid "Encode" msgstr "Encoder" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Encodage" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Une erreur matériel d'entrée/sortie a été rencontrée pendant l'accès à %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Une violation de verrouillage a eu lieu pendant l'accès à %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Une violation de partage a eu lieu pendant l'accès à %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Un argument incorrect a été rencontré." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Une erreur inconnue est survenue pendant la lecture de %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Une erreur inconnue est survenue pendant l'écriture de %1." @@ -4408,11 +4490,11 @@ msgstr "Cryptage" msgid "End" msgstr "Fin" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Fin de la ligne de Style" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Agrandir la fenêtre à la taille de l'écran" @@ -4420,23 +4502,23 @@ msgstr "Agrandir la fenêtre à la taille de l'écran" msgid "Enter Log Message" msgstr "Entrer un commentaire" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Entrer une URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Entrez un GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Entrez une monnaie." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Entrez une date et/ou une heure." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Entrez une date." @@ -4444,33 +4526,33 @@ msgstr "Entrez une date." msgid "Enter a name for the changelist:" msgstr "Entrer un nom pour la liste de changements :" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Entrez un nombre entre %1 et %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Entrez un nombre." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Entrez un entier positif." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Entrez une heure." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Entrez un entier entre %1 et %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Entrez un entier entre 0 et 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Entrez un entier." @@ -4482,7 +4564,7 @@ msgstr "Saisir le contenu du fichier à tester ci-dessous:" msgid "Enter log &message:" msgstr "Entrer co&mmentaire :" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "N'entrez pas plus de %1 caractères." @@ -4491,43 +4573,43 @@ msgstr "N'entrez pas plus de %1 caractères." msgid "Enter the regex string below:" msgstr "Saisir la chaîne regex ci-dessous:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Tout effacer\nTout effacer" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Enlever la sélection\nEnlever" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Erreur" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Erreur lors de la reconstruction du Cache d'Icônes du Shell !" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "Erreur de validation du certificat de serveur pour \"%s\" :" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Erreur lors de la lecture/écriture de la clé de registre %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Tout a été mis à jour." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4537,28 +4619,28 @@ msgstr "Exécutable (*.exe)|*.exe|Commande (*.com)|*.com|Information (*.pdf)|*.p msgid "Executable (+x)" msgstr "Exécutable (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existant" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Sortir" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Etendre (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Etendre la fenêtre rangée" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Explorer vers" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exporter" @@ -4566,36 +4648,36 @@ msgstr "Exporter" msgid "Export Zip File" msgstr "Exporter le fichier Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exporter répertoire :" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exporter la sélection vers..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exporter cette révision..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exporter aussi les fichiers non versionnés" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportation %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportation..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exporter une révision vers un fichier Zip" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extension" @@ -4611,7 +4693,7 @@ msgstr "Extension :" msgid "Extern DLL Path:" msgstr "Chemin des DLL externes :" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Externe" @@ -4619,101 +4701,101 @@ msgstr "Externe" msgid "External Program:" msgstr "Programme externe :" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Fondre" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Échoué" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Échec pour retourner à l'ancienne version" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Echec de l'extraction du fichier \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Echec de l'extraction du fichier \"%s\" de la révision %s vers \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Impossible de se connecter.\nLe lien peut être défectueux." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Échec de conversion de l'objet ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Échec de création d'un document vide." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Échec de la création de l'objet. Assurez-vous que l'application est entrée dans la base de registre du système." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Impossible de créer une demande de tirage." -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Impossible d'obtenir le fichier de base." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Impossible d'obtenir le fichier de fusion." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Échec de lancement de l'aide." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Échec du lancement de l'opération serveur." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Échec d'ouverture du document." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "L'opération serveur a échoué." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Échec de l'enregistrement du document." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Échec de la définition / suppression de la liste de modifications '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Échec au démarrage du fournisseur COM du système de suivi des problèmes '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Pageant n'a pas chargé la clef dans le temps imparti." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Échoué !" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Transfert rapide" @@ -4721,62 +4803,62 @@ msgstr "Transfert rapide" msgid "Fast Forward o&nly" msgstr "Transfert rapide &seulement" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Transfert rapide vers %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "Récupé&rer" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Extraire" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Extraire && Re&base" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Extraire depuis un dépôt SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Extraire depuis \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Extraire&&Re&base" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Extraire..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Etat de l'extraction..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Extraction des fichiers modifiés..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Extraction du fichier..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Extraction de la révision %s du fichier :" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Fichier" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Fichier en cours d'encodage" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Modification de fichier chaque %s" @@ -4785,27 +4867,27 @@ msgstr "Modification de fichier chaque %s" msgid "File changes each week:" msgstr "Modifications de fichier chaque semaine :" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Différences de fichiers" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Le fichier n'a pas de conflit" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Le fichier est vide." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "La liste des fichiers est vide" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Fichiers patch" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4817,7 +4899,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Taille du fichier :\t\t%s (%s)\nLargeur :\t\t\t%ld pixel\nHauteur :\t\t\t%ld pixel\nRésolution horizontale :\t%.1f dpi\nRésolution verticale :\t%.1f dpi\nProfondeur :\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4837,7 +4919,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Taille du fichier :\t%s (%s)\nLargeur :\t\t\t%ld pixel\nHauteur :\t\t\t%ld pixel\nRésolution horizontale :\t%.1f dpi\nRésolution verticale :\t%.1f dpi\nProfondeur :\t\t%d bit\nZoom :\t\t\t%d%%\n\nTaille du fichier :\t%s (%s)\nLargeur :\t\t\t%ld pixel\nHauteur :\t\t\t%ld pixel\nRésolution horizontale :\t%.1f dpi\nRésolution verticale :\t%.1f dpi\nProfondeur :\t\t%d bit\nZoom :\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4849,7 +4931,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Taille du fichier :\t\t%s (%s)\nLargeur :\t\t\t%ld pixel\nHauteur :\t\t\t%ld pixel\nRésolution horizontale :\t%.1f dpi\nRésolution verticale :\t%.1f dpi\nProfondeur :\t\t%d bit\nZoom :\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4869,7 +4951,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Taille du fichier :\t%s (%s)\nLargeur :\t\t\t%ld pixel\nHauteur :\t\t\t%ld pixel\nRésolution horizontale :\t%.1f dpi\nRésolution verticale :\t%.1f dpi\nProfondeur :\t\t%d bit\nZoom :\t\t\t%d%%\n\nTaille du fichier :\t%s (%s)\nLargeur :\t\t\t%ld pixel\nHauteur :\t\t\t%ld pixel\nRésolution horizontale :\t%.1f dpi\nRésolution verticale :\t%.1f dpi\nProfondeur :\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nom de fichier" @@ -4877,17 +4959,17 @@ msgstr "Nom de fichier" msgid "Files" msgstr "Fichiers" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Outil Remplier\nRemplir" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrer" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtrer les chemins" @@ -4899,11 +4981,11 @@ msgstr "Filtre:" msgid "Filter: " msgstr "Filtre :" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Rechercher" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4913,17 +4995,17 @@ msgstr "Rechercher le texte spécifié\nRechercher" msgid "Find:" msgstr "Trouve:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Find: Text non trouvé \"%s\"" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Find: Première occurrence en partant du bas. Début du document atteint." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Find: Première occurrence trouvée depuis le haut. Fin du document atteint." @@ -4931,23 +5013,23 @@ msgstr "Find: Première occurrence trouvée depuis le haut. Fin du document atte msgid "Fingerprints" msgstr "Empruntes" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Terminé" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Fin de rebase." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Fini !" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Premier parent" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Premier parent d'abord" @@ -4956,18 +5038,18 @@ msgid "First known &bad:" msgstr "Dernière &mauvaise version connue :" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Ajuster les images selon la &hauteur" +msgid "Fit image &heights\tH" +msgstr "Ajuster les images selon la &hauteur\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Ajuster les images selon la &largeur" +msgid "Fit image &widths\tW" +msgstr "Ajuster les images selon la &largeur\tL" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Lecteurs de disquette (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Dossier" @@ -4979,38 +5061,34 @@ msgstr "Suivre les renommages" msgid "Font" msgstr "Police" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Pour l'Aide, appuyer sur F1. Défilement horizontal avec Ctrl-Molette" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Pour l'historique complet, désélectionnez 'Arrêt à la copie/renommage'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forcer" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Force la création d'une branche / étiquette - même s'il en existe déjà une de même nom." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "Forcer pousser seulement si si la référence distante pointe sur le même commit que la branche distante suivie.\nCela peut entraîner que le référentiel distant perde des commits; à utiliser avec précaution.\nCette option correspond à l'option git --force-with-lease." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "Forcer la commande \"pousser\" seulement si la référence distante pointe sur la même livraison que la branche distante suivie. Cela peut entraîner que le référentiel distant perde des livraisons; à utiliser avec précaution. Cette option correspond à l'option git --force." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5028,20 +5106,20 @@ msgstr "Premier plan" msgid "Format Patch" msgstr "Formater le patch" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Formater le patch..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Transferer" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Transférer %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5071,11 +5149,11 @@ msgstr "Depuis les fichiers &modifiés" msgid "From SVN Repository" msgstr "Du dépôt SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Depuis les fichiers existants" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Depuis les fichiers modifiés" @@ -5083,7 +5161,7 @@ msgstr "Depuis les fichiers modifiés" msgid "From:" msgstr "Du :" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Plein Écran" @@ -5091,7 +5169,7 @@ msgstr "Plein Écran" msgid "Full text search" msgstr "Recherche plein texte" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Complètement récursif" @@ -5099,7 +5177,7 @@ msgstr "Complètement récursif" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "D'autres options pour la fenêtre de livraison sont sur la page de Dialogs 3." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5107,24 +5185,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplifié)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ ne peut être initialisé !" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ ne peut créer un objet bitmap. Vous n'avez probablement plus assez de mémoire." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" -msgstr "" +msgstr "GPG signe l'étiquette, voir le manual pour plus de détails" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Obtention d'informations. Veuillez patienter..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Récupération des statistiques" @@ -5168,29 +5246,29 @@ msgstr "Général::Boîtes de dialogue 3" msgid "General::Set Extend Menu Item" msgstr "Général::Sélectionner un élément de menu contextuel étendu" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Obtenir les journaux de fusion" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Obtention du fichier %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Obtention du fichier %s, révision %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Obtention d'informations..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Obtention des informations requises..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Obtention diff standard" @@ -5202,23 +5280,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Progression de la commande Git" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git copier et ajouter les fichiers à cette copie de travail" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Copier et renommer l'élément versionné ici" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Copier les éléments versionnés ici" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Exporter tous les éléments ici" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Exporter les éléments versionnés ici" @@ -5226,35 +5304,35 @@ msgstr "Git Exporter les éléments versionnés ici" msgid "Git Init" msgstr "Initialisation de Git" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Chemin d'installation de Git" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Journal Git" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Déplacer et renommer l'élément versionné ici" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Déplacer les éléments versionnés ici" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Configuration distante de Git" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Liste des révisions Git" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5266,7 +5344,7 @@ msgstr "Synchronisation de Git" msgid "Git clone - TortoiseGit" msgstr "Clone Git - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Répertoire Git non sélectionné (voir la page de configuration \"générale\")" @@ -5274,23 +5352,23 @@ msgstr "Répertoire Git non sélectionné (voir la page de configuration \"gén msgid "Git for Windows" msgstr "Git pour Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git pour Windows (https://msysgit.github.io/) introuvable." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git a reporté une erreur lors de la création d'un dépôt !\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "La liste des révisions Git contient l'historique complet du fichier" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Liste des révisions git en suivant le renommage des fichiers" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5311,7 +5389,7 @@ msgstr "Git::Credential" msgid "Git::Remote" msgstr "Git::Distant" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5323,47 +5401,47 @@ msgstr "Aller à la ligne" msgid "Go to line" msgstr "Aller à la ligne" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Aller au conflit suivant\nConflit suivant" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Aller à la différence suivante\nDifférence suivante" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Aller à la prochaine différence de ligne\nDifférence de ligne suivante" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Aller au conflit précédent\nConflit précédent" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Aller à la différence précédente\nDifférence précédente" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Aller à la précédente différence de ligne\nDifférence de ligne précédente" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Aller à la ligne" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Graphique" @@ -5379,11 +5457,11 @@ msgstr "Gris" msgid "Greek" msgstr "Grec" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Regrouper les listes de changements" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "&Cacher les chemins modifiés non versionés" @@ -5399,7 +5477,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD :" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Dur" @@ -5411,7 +5489,7 @@ msgstr "Dur: Réinitialiser l'arborescence de travail et l'index (annuler toutes msgid "Hebrew" msgstr "Hébreu" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Aide" @@ -5435,11 +5513,11 @@ msgstr "Héxa" msgid "Hide Menus for unversioned paths" msgstr "Cacher les menu pour les dossiers non versionnés" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Cacher le patch<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Cacher fenêtre rangée" @@ -5447,25 +5525,25 @@ msgstr "Cacher fenêtre rangée" msgid "Hide the script while running" msgstr "Masquer le script pendant l'exécution" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Masquer les modifications locales" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Masquer les références aux modifications locales dans la liste de comparaison des Références" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Afficher/Masquer la liste des fichiers de patch" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Afficher/Cacher la liste des fichiers patch\nAffiche ou cache la liste des fichiers patch" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Conseil" @@ -5475,7 +5553,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Astuce : sélectionner le menu contextuel, aller à la page 'Commandes' et glissez les boutons de barre d'outils dans la fenêtre du menu." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Accueil" @@ -5491,7 +5569,7 @@ msgstr "Scripts d'Accroche::Configuration du Système de Suivi de Problèmes" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Scripts d'Accroche::Intégration du Système de Suivi de Problèmes" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Type de hook" @@ -5507,7 +5585,7 @@ msgstr "I&nclure les chemins :" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5515,55 +5593,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +S" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5571,15 +5650,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +L" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5603,7 +5682,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5611,7 +5690,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5619,7 +5698,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5627,16 +5706,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5647,17 +5726,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5669,7 +5748,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5733,7 +5812,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Recouvrements d'icône" @@ -5745,7 +5824,7 @@ msgstr "Recouvrements d'icône::Jeu d'icônes" msgid "Icon Overlays::Overlay Handlers" msgstr "Recouvrements d'icône::Gestionnaires de Recouvrement" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5755,52 +5834,52 @@ msgstr "Icones (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bm msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Icônes/Design/Code :\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Identique" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Si activé, empêche l'affichage du recouvrement dans les boîtes de dialogue 'Enregistrer sous...' ou 'Ouvrir...'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Si coché --track est passé à git, si non coché --no-track est passé à git, autrement ni --track ni --no-track ne sont passés à git (voir l'aide)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Si coché, double-cliquer sur une révision dans le journal la compare avec la révision précédente" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Si cochée, la boîte de dialogue de livraison sera relancée automatiquement après une erreur,\ntout en préservant votre dernière sélection et le message de log." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Si activé, TortoiseGit vérifie une fois par semaine si une nouvelle est disponible" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Si activé, les répertoires de l'arborescence de travail qui n'affichent\npas de recouvrement afficheront quand-même le recouvrement\npour le status 'normal'" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Si mis, les fichiers dans des répertoires non versionnés sont visibles dans le contrôle de statut.\r\nLe contrôle de statut est utilisé par exemple dans la fenêtre de livraison." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5813,16 +5892,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Si vous envisagez de travailler dans ce dossier, laissez l'option décochée. Typiquement, un dépôt nu ne peut accepter que avoir des changements 'poussés' vers lui. (Par convention, un dossier de dépôt doit avoir un nom qui se termine par \".git\")" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorer" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorer %d éléments par &extension" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignorer les commentaires" @@ -5834,15 +5913,15 @@ msgstr "Ignorer le fichier" msgid "Ignore Type" msgstr "Ignorer le type" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignorer tous les espaces" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorer toutes les modification d'espace" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignorer les lignes vides" @@ -5850,11 +5929,11 @@ msgstr "Ignorer les lignes vides" msgid "Ignore case cha&nges" msgstr "Ignorer les modificatio&ns de casse" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "Ignorer les changements⏎\nIgnorer les changements externes." +msgstr "Ignorer les changements\nIgnorer les changements externes." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5868,11 +5947,11 @@ msgstr "Ignorer l'objet(s) récursivement" msgid "Ignore line &endings (recommended)" msgstr "Ignor&er les fins de lignes (recommandé)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignorer les espaces en fin de ligne" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignorer les changements d'espace" @@ -5880,29 +5959,29 @@ msgstr "Ignorer les changements d'espace" msgid "Ignore whitespace" msgstr "Ignorer les espaces" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorer les modifications d'espace" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Ignorer les espaces lors de la comparaison des versions des parents et des enfants" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignoré" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Fichiers ignorés" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignorer toutes les modification d'espaces lors de la différenciation\nIgnorer toutes les modifications d'espace" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5920,24 +5999,24 @@ msgstr "Image &et texte" msgid "Images" msgstr "Images" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Les enfants immédiat, avec les dossiers" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importer" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importe %s vers %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importer les ignorés SVN" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importer les ignorés SVN..." @@ -5946,16 +6025,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importer le fichier à ignorer svn vers .git/info/exclude file (le fichier sera réécrit)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Import du fichier %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Dans la Liste de changements" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Dans les livraisons" @@ -5973,30 +6052,30 @@ msgstr "Inclure les fichiers &ignorés" #. Resource IDs: (1797) msgid "Include FETCH_HEAD in branch selection boxes" -msgstr "" +msgstr "Include FETCH_HEAD dans les boites de sélection de branches" #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "N'inclure que les révisions suivantes:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nom de fichier incorrect." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Import initial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Dépôt Git vide initialisé dans %s." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Différences en ligne" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Différences de ligne dans les mots" @@ -6008,25 +6087,25 @@ msgstr "Différences en ligne" msgid "Input" msgstr "Entrer" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Insérer le presse papiers\nColler" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Mémoire insuffisante pour exécuter l'opération." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Erreur interne de l'application." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Monnaie Invalide." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Numéro de révision invalide !" @@ -6034,7 +6113,7 @@ msgstr "Numéro de révision invalide !" msgid "Issuer:" msgstr "Rapporteur:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6057,7 +6136,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Conserver" @@ -6065,15 +6144,15 @@ msgstr "Conserver" msgid "Keep changelists" msgstr "Conserver les listes de modifications" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Garder le fichier local ?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "Garder les cas résolus⏎\nAller au premier conflit non résolu" +msgstr "Garder les cas résolus\nAller au premier conflit non résolu" #. Resource IDs: (16136) msgid "Keyboard" @@ -6083,7 +6162,7 @@ msgstr "Clavier" msgid "Keyboard shortcuts:" msgstr "Raccourcis clavier :" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Touches" @@ -6127,19 +6206,39 @@ msgstr "LIGNE8" msgid "Language:" msgstr "Langue" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "%s dernière(s) livraison(s)" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "%s dernier(s) mois" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "%s dernière(s) semaine(s)" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "%s dernière(s) année(s)" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Dernier auteur" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Dernière livraison" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Dernière modification" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Dernière modification :" @@ -6147,7 +6246,11 @@ msgstr "Dernière modification :" msgid "Last known &good:" msgstr "Dernière &bonne version connue :" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "Dernière date sélectionnée" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Lancement de l'outil externe de compraraison / fusion pour résoudre les conflits" @@ -6155,17 +6258,17 @@ msgstr "Lancement de l'outil externe de compraraison / fusion pour résoudre les msgid "Least active author:" msgstr "Auteur le moins actif :" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" -msgstr "Laisser le statut en conflit⏎\nLe statut de conflit du fichier est gardé" +msgstr "Laisser le statut en conflit\nLe statut de conflit du fichier est gardé" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "Ne laisser que les blocs marqués" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Vue de gauche :" @@ -6173,11 +6276,11 @@ msgstr "Vue de gauche :" msgid "Left image" msgstr "Image de gauche" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Graphique en ligne" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6191,12 +6294,12 @@ msgstr "Barre des lignes de différence" msgid "Line differences" msgstr "Différences de ligne" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Ligne déplacée depuis la ligne %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Ligne déplacée à la ligne %ld" @@ -6209,26 +6312,26 @@ msgstr "Épaisseur de la ligne" msgid "Line:" msgstr "Ligne :" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Ligne : %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Lignes ajoutées" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Lignes supprimées" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Voir les sujets de l'aide\nAide" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6246,23 +6349,23 @@ msgstr "Charger les images" msgid "Load Putty &Key" msgstr "Charger une &clef Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." -msgstr "Charger les changements⏎\nLes changements faits dans TortoiseGitMerge sont perdus et remplacés avec le nouveau contenu." +msgstr "Charger les changements\nLes changements faits dans TortoiseGitMerge sont perdus et remplacés avec le nouveau contenu." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "Charger les changements⏎\nLes vues sont mises à jour avec le nouveau contenu." +msgstr "Charger les changements\nLes vues sont mises à jour avec le nouveau contenu." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Chargement..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Local" @@ -6270,13 +6373,13 @@ msgstr "Local" msgid "Local Branch" msgstr "Branche locale" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" -msgstr "" +msgstr "Changements locaux ignorés (fichiers de l'arbre de travail supposés marqués comme validés/inchangés ou ignorés)" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "État local" @@ -6284,17 +6387,17 @@ msgstr "État local" msgid "Local:" msgstr "Local:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." -msgstr "Les emplacements où les contenus des⏎\nrévisions choisies du dépôt seront sauvées dedans." +msgstr "Les emplacements où les contenus des\nrévisions choisies du dépôt seront sauvées dedans." #. Resource IDs: (32854) msgid "Locator Bar" msgstr "Barre localisateur" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Journal" @@ -6334,12 +6437,12 @@ msgstr "Commentaires (Afficher boite de dialogue)" msgid "Login:" msgstr "Login :" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Plus basse révision affichée : %ld - Plus haute révision affichée : %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6350,7 +6453,7 @@ msgstr "Plus basse révision affichée : %ld - Plus haute révision affichée : msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6362,14 +6465,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Courrier" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "La DLL du système de mail n'est pas valide." -#. Resource IDs: (156) -msgid "Main" -msgstr "Page principale" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Partir de rien (Aucun répertoire de travail)" @@ -6382,47 +6481,47 @@ msgstr "&Gérer" msgid "Manage" msgstr "Gérer" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Gestion des éléments distants" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Marquer comme résolu" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" -msgstr "Marquer comme résolu⏎\nLe statut du fichier est changé en modifié" +msgstr "Marquer comme résolu\nLe statut du fichier est changé en modifié" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "Marqué pour la comparaison" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Marquer ce bloc" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Blocs marqués" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Marque un fichier comme résolu dans Git\nMarque comme résolu" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Marque la révision comme mauvaise" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Marque la révision comme bonne" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Respecter la &casse" @@ -6446,7 +6545,7 @@ msgstr "Les me&nus affichent les commandes utilisées récemment en premier" msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Barre de Menu" @@ -6454,7 +6553,7 @@ msgstr "Barre de Menu" msgid "Menu s&hadows" msgstr "&Ombres des Menus" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Fusionner" @@ -6462,34 +6561,34 @@ msgstr "Fusionner" msgid "Merge &Message" msgstr "Fusionner le &commentaire" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Point de fusion" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Fusionner Réintégrer" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Fusion entre la branche d'origine, l'arbre de travail et la branche sur laquelle on bascule" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Fusionner vers \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Fusionné" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Fichiers fusionnés" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Fusion d'une autre branche" @@ -6497,22 +6596,22 @@ msgstr "Fusion d'une autre branche" msgid "Merging" msgstr "Fusion" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Fusion de %s, révision %s vers %s, révision %s dans %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "La fusion nécessite des révisions ou des URLs différentes dans 'De :' et 'À :'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Fusion des révisions %s de %s dans %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Commentaire" @@ -6524,7 +6623,7 @@ msgstr "Seul&ement un message" msgid "Message part &expression:" msgstr "Expression régulière du message:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Commentaires" @@ -6532,11 +6631,11 @@ msgstr "Commentaires" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Le mien" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Réduire le Bandeau" @@ -6548,7 +6647,11 @@ msgstr "Nombre minimum de caractères pour un message de livraison :" msgid "Misc" msgstr "Divers" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Manquant" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Mélangé" @@ -6556,35 +6659,35 @@ msgstr "Mélangé" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Modéré : Laissez l'arborescence de travail inchangée et réinitialiser l'index" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Date de modification" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Modifié" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Fichiers modifiés" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Plus" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Plus de Boutons" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Plus de Commandes..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Plus de couleurs..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Plus..." @@ -6604,41 +6707,41 @@ msgstr "&Déplacer vers le Bas" msgid "Move &Up" msgstr "Déplacer vers le Ha&ut" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Déplacer l'Élément vers le Bas" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Déplacer l'Élément vers le Haut" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Déplacer et renommer" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Déplacer vers la liste de changements" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Déplacer/Renommer" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Déplacer : Nouveau nom pour %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Déplacer les fichiers modifiés vers la corbeille avant de revenir en arrière" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Déplacement de %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Déplacement..." @@ -6646,11 +6749,11 @@ msgstr "Déplacement..." msgid "My file:" msgstr "Mon fichier :" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nom" @@ -6662,7 +6765,7 @@ msgstr "Nom :" msgid "Navigate" msgstr "Naviguer" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6672,11 +6775,11 @@ msgstr "Naviguer jusqu’à une ligne spécifique dans la vue\nAller à la ligne msgid "Navigation Pane Options" msgstr "Options du Panneau de Navigation" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Options du Panneau de Navigation..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Niché" @@ -6688,7 +6791,7 @@ msgstr "Réseau" msgid "Network::Email" msgstr "Réseau::Courriel" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nouveau" @@ -6697,43 +6800,43 @@ msgid "New &name:" msgstr "Nouveau &nom :" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nouvelle branche \\ étiquette" +msgid "New Branch/Tag" +msgstr "Nouvelle branche/étiquette" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nouveau Menu" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Nouveau hash" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nouveau message" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nouveau nom pour %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Le nouveau nom ne doit pas être vide ni être le même que l'original !" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nouveau nom :" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Nouveaux sous modules" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Dernier moment d'engagement" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Nouvelles lignes" @@ -6741,33 +6844,29 @@ msgstr "Nouvelles lignes" msgid "Next" msgstr "Suivant" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Page Suivante\nPage Suivante" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Prochain conflit" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Prochaine différence" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Différence entre les lignes suivante" -#. Resource IDs: (73) -msgid "No" -msgstr "Non" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Pas de transfert &rapide" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Ne pas &fusionner" @@ -6779,102 +6878,107 @@ msgstr "Pas de vérification" msgid "No Co&mmit" msgstr "Pas de livraisons" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "Pas de HEAD trouver" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Pas de commande entrée !\n\nTortoiseGitProc.exe est utilisé par l'extension du shell et ne doit pas être appelé directement !" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Aucune valeur de commande spécifiée !" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Aucune différence trouvée !" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Aucune différence trouvée ! Submodule n'est peut-être pas à jour. Mettre submodule à jour maintenant?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Aucun message d'erreur valide." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Aucune erreur n'est survenue." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "Pas de changement supplémentaire après la fusion" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Pas de fichiers ou répertoires modifiés. Il n'y a pas matière à revenir en arrière pour TortoiseGit !" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Aucun fichier à afficher avec les paramètres actuels.\nCochez un des paramètres ci-dessous pour voir les fichiers non-versionnés, ignorés et/ou non modifiés.\nPour voir les changements de la version distance, cliquez sur 'Vérifier le Dépôt'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "Aucun fichier a affiché avec les réglages actuels.\nSélectionner un ou plusieurs réglages ci-dessous pour voir les fichiers non versionés, ignorés et/ou inchangés." -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Aucun fichier changé ou ajouté depuis\nla dernière livraison. Il n'y a rien\nà faire pour TortoiseGit ici..." +"the last commit." +msgstr "Aucun fichier n'a été modifié ou ajoutés depuis\nla dernière livraison." -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Aucun fichier changé ou ajouté depuis\nla dernière livraison. Il n'y a rien\nà faire pour TortoiseGit ici..." +msgstr "Aucun fichier n'a été modifié ou ajoutés depuis\nla dernière livraison.\nVoulez-vous voir les fichiers non versionés ?" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Pas de graphe disponible" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Pas d'encodeur d'image trouvé pour %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "Pas de restriction" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Aucune révision trouvée" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Pas de révision précédente." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Aucune différence trouvée" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Pas de corrections orthographiques" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Pas de cache du statut. Seuls les répertoires versionnés sont recouverts, les fichiers ne sont pas recouverts " -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Aucune suggestion du thésaurus" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Aucun répertoire de travail trouvé." @@ -6882,11 +6986,11 @@ msgstr "Aucun répertoire de travail trouvé." msgid "Node size" msgstr "Taille du noeud" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Aucun" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6898,30 +7002,30 @@ msgstr "Livraison &SVN normal" msgid "North European" msgstr "Europe du nord" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Fichiers non versionnés" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Tous les fichiers n'ont pas pu être téléchargés et vérifiés." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Certaines entrées dans le registre système (ou le fichier INI) n'ont pas été effacées." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Mémoire insuffisante pour terminer l'opération." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Pas assez de mémoire!\nEssayer de réduire la taille de la courbe des révisions, soit en factorisant les nœuds, soit en réduisant le zoom." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Aucun patch généré." @@ -6929,7 +7033,7 @@ msgstr "Aucun patch généré." msgid "Note node" msgstr "Note de noeud" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6948,26 +7052,26 @@ msgstr "Note: ce répertoire contient des fichiers n'étant pas sous contrôle d msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Note : cela affecte tous les clients Tortoise, pas seulement TortoiseGit !" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Remarques" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Pas besoin de rebase\n%s identique à %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Rien à rebaser" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Rien à livrer" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Instructions" @@ -6975,7 +7079,7 @@ msgstr "Instructions" msgid "Number Commits" msgstr "Nombre de livraisons" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Nombre de %s" @@ -6988,7 +7092,7 @@ msgstr "Nombre d'auteurs :" msgid "Number of characters required for moved or copied line detection:" msgstr "Nombre de caractères nécessaires pour déplacer ou copier la détection de ligne:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Nombre de caractères à afficher dans la partie abrégée de hachage" @@ -7060,41 +7164,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Echec de l'initialisation d'OLE. Assurez-vous de posséder la bonne version de la bibliothèque OLE." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Couleurs Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Ancien hash" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Ancien message" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Ancien moment d'engagement" @@ -7102,15 +7206,15 @@ msgstr "Ancien moment d'engagement" msgid "Older lines" msgstr "Lines plus vieilles" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "A la demande" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Un ou plus documents auto-sauvegardés ont été trouvés." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Un ou plusieurs fichiers sont en état de conflit." @@ -7122,29 +7226,29 @@ msgstr "Seulement la branche courante" msgid "Only Local Branches" msgstr "Seulement les branches locales" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Fichiers fusionnés seulement" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Uniquement les fichiers enfant" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Seuls les nombres (optionnellement séparés par des virgules)\nsont acceptés !" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Uniquement cet élément" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Ouvrir" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7154,51 +7258,52 @@ msgstr "Ouvrir un document existant\nOuvrir" msgid "Open certificate" msgstr "Ouvrir le certificat" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Ouvrir des fichiers pour la différenciation ou pour appliquer un patch\nOuvrir fichiers" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Ouvrir depuis le presse-papiers" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Charger le fichier image..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Ouvrir le répertoire parent" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "Ouvrir le fichier de patch" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Ouvrir ce document" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Ouvrir avec..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Ouvre l'aide\nAide" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Ouvre l'explorateur de référence." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Ouvre le navigateur de dépôt" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Option" @@ -7207,30 +7312,30 @@ msgid "Options" msgstr "Options" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Taille ori&ginale" +msgid "Ori&ginal size\tS" +msgstr "Taille ori&ginale\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Nom d'origine" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Autres Panneaux de Tâches" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Autres" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Sortir la liste de changements" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Sortir les livraisons" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Plus de mémoire." @@ -7238,7 +7343,7 @@ msgstr "Plus de mémoire." msgid "Output Directory" msgstr "Répertoire de sortie" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7246,20 +7351,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Ecraser la branche si elle existe" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Remplacer" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "Forcer l'écriture des changements dans l'arbre de travail" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "Paramétrage de la p&age" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Page %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7270,15 +7379,15 @@ msgstr "Page %u\nPages %u-%u\n" msgid "Page :" msgstr "Page :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Panneau 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Panneau 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Paramètres" @@ -7286,25 +7395,25 @@ msgstr "Paramètres" msgid "Parameters:" msgstr "Paramètres :" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Parent %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Parent %d n'existe pas" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Parent 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Parent 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "parents(s)" @@ -7316,39 +7425,39 @@ msgstr "Partie de code provenant d'annotations TortoiseSVN" msgid "Password" msgstr "Mot de passe" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Mot de passe :" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Coller" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Coller le message récent..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "Coller la liste des noms de &fichiers" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "Coller le dernier commentaire de &livraison" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "Coller le message &récent..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Outil Coller\nColler" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Coller la liste des noms de fichiers" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Coller le dernier commentaire de livraison" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Colle le chemin SVN depuis le presse-papiers, ayant pour conséquence une opération de déplacement (couper) ou de copie" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Patcher" @@ -7364,32 +7473,32 @@ msgstr "Patcher les éléments &sélectionnés" msgid "Patch As Attachment" msgstr "Patch en pièce jointe" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Patcher tous les fichiers" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Patcher les fichiers sélectionnés" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Fichiers patch (*.diff, *.patch)|*.diff;*.patch|Tous les fichiers (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Application du patch" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Application du patch sur le fichier '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Chemin" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Emplacement trouvé qui correspond mieux au patch." @@ -7397,21 +7506,21 @@ msgstr "Emplacement trouvé qui correspond mieux au patch." msgid "Path:" msgstr "Chemin :" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Chemins" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Outil Crayon\nCrayon" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Poucentage de paternité" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Pourcents" @@ -7419,24 +7528,24 @@ msgstr "Pourcents" msgid "Personalized Menus and Toolbars" msgstr "Barres d'Outils et Menus Personnalisés" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Prendre" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Choisissez le hash de la livraison" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "Choisissez le &hash de la livraison" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Choisissez le commentaire de la livraison" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "Choisissez le co&mmentaire de la livraison" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Prendre %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7446,56 +7555,56 @@ msgstr "Image (Metafile)\nune image" msgid "Picture:" msgstr "Image:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Images (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphes (*.gv)|*.gv|Tous les Fichiers (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Images (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Fichiers (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Graphique en camembert" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Veuillez entrer un script hook à exécuter." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Veuillez entrer un chemin où appliquer le script hook." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Veuillez sélectionner un type de hook." -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Merci de sélectionner une branche" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Merci de sélectionner une branche" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Merci de regarder les livraisons ignorées" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Attente de l'annulation..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Veuillez patienter pendant la récupération des différences..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Veuillez patienter..." @@ -7511,11 +7620,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port :" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Hook post-livraison" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Hook post-livraison" @@ -7523,23 +7632,23 @@ msgstr "Hook post-livraison" msgid "Pre&v Page" msgstr "Page Pré&cédente" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Hook pre-livraison" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Hook pre-livraison" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Préparation de la livraison" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Fixer le bloc de droite" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Fixer ce bloc à gauche" @@ -7551,11 +7660,11 @@ msgstr "Presser la &Nouvelle Touche de Raccourci :" msgid "Press &new shortcut key:" msgstr "Presser la &nouvelle touche de raccourci :" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Prévisualiser" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Prévisualiser le fichier patché" @@ -7567,51 +7676,51 @@ msgstr "Prévisualisation :" msgid "Previous" msgstr "Précédent" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Page Précédente\nPage Précédente" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Révision précédente" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflit Précédent" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Différence précédente" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Différence entre les lignes précédente" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Imprimer" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Imprimer le Document\nIm&primer" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Imprimer le document actif en utilisant les options courants\nImpression rapide" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Imprimer le document actif\nImprimer" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Imprimer dans un Fichier" @@ -7619,7 +7728,7 @@ msgstr "Imprimer dans un Fichier" msgid "Printer :" msgstr "Imprimante :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Fichiers d'Imprimantes (*.prn)|*.prn|Tous les Fichiers (*.*)|*.*||" @@ -7627,11 +7736,11 @@ msgstr "Fichiers d'Imprimantes (*.prn)|*.prn|Tous les Fichiers (*.*)|*.*||" msgid "Printing" msgstr "Impression" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programme" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programmes (*.exe)|*.*|Tous fichiers (*.*)|*.*||" @@ -7639,11 +7748,11 @@ msgstr "Programmes (*.exe)|*.*|Tous fichiers (*.*)|*.*||" msgid "Progress" msgstr "Progression" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Projet" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Propriété" @@ -7651,7 +7760,7 @@ msgstr "Propriété" msgid "Property Page" msgstr "Page des propriétés" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Fournisseur" @@ -7677,21 +7786,21 @@ msgstr "Configuration du Proxy" #. Resource IDs: (1603) msgid "Prune" -msgstr "" +msgstr "Séparer" #. Resource IDs: (1785) msgid "Prune (All remotes)" -msgstr "" +msgstr "Séparer (Tous les distants)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Tirer" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Tirer nécessite que la branche sélectionnée localement soit la branche courante." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Tirer..." @@ -7699,19 +7808,19 @@ msgstr "Tirer..." msgid "Pull/Fetch" msgstr "Tirer/Extraction" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Différence tirée" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Journal tiré" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "&Pousser" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Pousser" @@ -7727,11 +7836,11 @@ msgstr "URL pour pousser:" msgid "Push notes" msgstr "Pousser les notes" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Pousser les éti&quettes" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Pousser..." @@ -7739,26 +7848,26 @@ msgstr "Pousser..." msgid "Putty Key:" msgstr "Clef Puuty :" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Clef privé Putty (*.ppk)|*.ppk|Tous les Fichiers (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "T%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Quitter l'application avec demande de confirmation d'enregistrement\nQuitter" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" -msgstr "Fermer⏎\nFermer TortoiseGitMerge sans sauver les modifications" +msgstr "Fermer\nFermer TortoiseGitMerge sans sauver les modifications" #. Resource IDs: (1633) msgid "QuotePath" @@ -7772,11 +7881,15 @@ msgstr "D&isques mémoire" msgid "R&eset" msgstr "Réinitialis&er" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "&Enlever ce fichier de l'index" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "R&evenir à cette révision" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "REBASE" @@ -7784,7 +7897,7 @@ msgstr "REBASE" msgid "Randomize Sync Dialog startup position" msgstr "Position aléatoire de la fenêtre de dialogue de synchronisation" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7806,7 +7919,7 @@ msgstr "&Distant :" msgid "Re&movable drives" msgstr "Disques a&movibles" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Re&nommer..." @@ -7822,15 +7935,15 @@ msgstr "Tout Réinitiali&ser" msgid "Re&store defaults" msgstr "Re&staurer les valeurs par défaut" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Re&venir en arrière..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Atteignable" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Lisez le 'Guide journalier' avant d'être bloqué..." @@ -7838,21 +7951,21 @@ msgstr "Lisez le 'Guide journalier' avant d'être bloqué..." msgid "Rebase" msgstr "Rebase" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Rebase \"%s\" sur..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Rebase..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Rebase en cours... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Récent" @@ -7864,21 +7977,21 @@ msgstr "Fichier récent" msgid "Recently modified lines" msgstr "Lignes récemment modifiées" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Enregistrement Seul" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Récupérer les documents auto-sauvegardés\nOuvrir les versions auto-sauvegardées à la place des versions explicitement sauvegardées" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Restaurer l'état avant le rebase" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7892,17 +8005,21 @@ msgstr "Parcourir les sous-modules récursivement" msgid "Recursive" msgstr "Récursif" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Refaire la dernière action annulée\nRefaire" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Réduire la fenêtre" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref" @@ -7910,31 +8027,31 @@ msgstr "Ref" msgid "Ref (Click it then go to)" msgstr "Ref (Cliquer ici pour y aller)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Liste de référence" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Parcourir Ref" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "Journal de référence" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Refname" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Rafraîchir" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Rafraîchissement..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Expression régulière du filtre" @@ -7946,7 +8063,7 @@ msgstr "Expression régulière des filtres" msgid "Regex:" msgstr "Expression régulière:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7965,7 +8082,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtre d'expressions régulières:\r\n. : n'importe quel caractère\r\nc+ : correspond au caractère c une ou plusieurs fois\r\nc* : correspond au caractère c zéro ou plusieurs fois\r\n^ : début de la ligne\r\n$ : fin de la ligne\r\n(chaîne){n} : correspond à la chaîne n fois\r\n(abcd) : sous-expression\r\n(abcd) : sous-expression\r\n[aei0-9] : correspond à a,e,i et 0..9\r\n[^aei0-9] : n'importe quoi sauf a,e,i et 0..9\r\n\r\n\\w : correspond à a-z,A-Z,0-9 et _\r\n\\W : n'importe quel caractère non alpha-numérique\r\n\\d : chiffre de 0 à 9\r\n\\s : espace blanc" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Partie du patch rejetée pour '%s'" @@ -7978,7 +8095,7 @@ msgstr "Date et heure relatifs dans le journal" msgid "Reload" msgstr "Recharger" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8012,19 +8129,19 @@ msgstr "Branche de &pistage distante" msgid "Remote Branch" msgstr "Branche distante" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "L'URL distante ne doit pas être vide." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Mise à jour distante" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Le nom distant ne doit pas être vide." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Statut distant" @@ -8036,12 +8153,12 @@ msgstr "Distant :" msgid "Remove" msgstr "Supprimer" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Supprimer %ld éléments" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Supprimer %s" @@ -8050,7 +8167,7 @@ msgstr "Supprimer %s" msgid "Remove &all untracked files (-fx)" msgstr "Retirer &tous les fichiers non pistés (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Supprimer la &branche" @@ -8058,21 +8175,21 @@ msgstr "Supprimer la &branche" msgid "Remove &non-ignored untracked files (-f)" msgstr "Retirer les fichiers &non-ignorés et non pistés (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Enlever tout les commentaires avant de faire le diff, de façon à ce que les commentaires modifiés ne soient pas affichés comme différents" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Retirer de la liste des &ignorés" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Supprimer de la Barre d'outils d'Accès Rapide" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Retirer de la liste des changements" @@ -8084,7 +8201,7 @@ msgstr "Retirer les fichiers ignorés (-fX)" msgid "Remove untracked directories (-d)" msgstr "Retirer les répertoires non pistés (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Supprimer les fichiers non versionés de l'arborescence de travail, ..." @@ -8092,11 +8209,11 @@ msgstr "Supprimer les fichiers non versionés de l'arborescence de travail, ..." msgid "Removed" msgstr "Supprimé" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Retiré de la liste des changements" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8104,7 +8221,7 @@ msgid "" "from the ignore list." msgstr "Les motifs de fichiers\n%s\nont été retirés de la liste des ignorés." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Retire le fichier ou le filtre de fichier de la liste des ignorés" @@ -8112,11 +8229,11 @@ msgstr "Retire le fichier ou le filtre de fichier de la liste des ignorés" msgid "Rena&me..." msgstr "Reno&mmer..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Renommer" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Renommer %s" @@ -8125,20 +8242,20 @@ msgstr "Renommer %s" msgid "Rename - TortoiseGit" msgstr "Renommer - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Renommer \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Renommer / déplacer" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Renomme les fichiers / les répertoires internes du contrôle de version" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8148,7 +8265,7 @@ msgstr "Répéter la dernière action\nRépéter" msgid "Replace &All" msgstr "Rempl&acer Tout" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8162,12 +8279,12 @@ msgstr "Remplacer avec :" msgid "Replace:" msgstr "Remplacer :" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Correspondances remplacées %d" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Remplace" @@ -8191,11 +8308,11 @@ msgstr "Demande de tirage" msgid "Requests a username and a password" msgstr "Requiert un nom d'utilisateur et un mot de passe" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Rés&oudre..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Réinitialiser" @@ -8207,25 +8324,25 @@ msgstr "Tout Réiniti&aliser" msgid "Reset Type" msgstr "Type de réinitialisation" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Réinitialiser \"%s\" vers..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Réinitialiser la branche active" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Réinitialiser les colonnes" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Réinitialiser la branche courante \"%s\" à " -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Résoudre" @@ -8233,126 +8350,122 @@ msgstr "Résoudre" msgid "Resolve Submodule Conflict" msgstr "Résoudre le conflit de sous-module" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Résoudre le conflit en utilisant 'le mien'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Résoudre le conflit en utilisant 'le leur'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Résolu" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Résolu :\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Résoudre les fichiers en conflits" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Redémarrer rebase" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Restaure" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Valeurs par défaut" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Restauration après la livraison" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Restaurer la fenêtre à sa taille normale" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Restauré" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Réessayer" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Nouvel essai dans 2 secondes..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Revenir à l'ancienne version" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Restaurer la livraison" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Restaurer la livraison %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Annuler vers la révision originale" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Annuler vers la révision %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Revenu à l'ancienne version" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Annuler tous vos changements depuis la dernière mise à jour" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Inverse un ajout dans le contrôle de version" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Vérifier le patch avec TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Analyser/appliquer un fichier de diff unifié avec TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Relire/Appliquer un patch unique..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Révision" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Révision %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Révision %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Graphe de révision" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Fichiers de révision" @@ -8368,31 +8481,31 @@ msgstr "Filtre de la courbe des révisions" msgid "Revision graph" msgstr "Graphique de révision " -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Révision(s) revenue(s). Tous les changements sont intégrés dans votre arborescence de travail maintenant." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Révision : " -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Revenir" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Revenir %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text Format (RTF)\nTexte avec formattage des polices et paragraphes" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Vue de droite :" @@ -8400,21 +8513,21 @@ msgstr "Vue de droite :" msgid "Right image" msgstr "Image de droite" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Ligne %d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Ligne %d-%d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Ligne inférieure" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Ligne supérieure" @@ -8422,11 +8535,11 @@ msgstr "Ligne supérieure" msgid "S&elect..." msgstr "Sél&ectionner..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Affic&her les boutons sur une seule ligne" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Affic&her les boutons sur deux lignes" @@ -8434,15 +8547,23 @@ msgstr "Affic&her les boutons sur deux lignes" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Affic&her la barre d'outils d'accès rapide sous le bandeau" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "Ignorer les non sélectionnés" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "Ecraser les fichiers non sélectionnés" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatistiques" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "&Basculer/&Extraire..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8462,7 +8583,7 @@ msgstr "Le server SMTP nécessite une authentification" msgid "SMTP Server:" msgstr "Server SMTP :" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, directement vers le serveur de destination" @@ -8470,11 +8591,11 @@ msgstr "SMTP, directement vers le serveur de destination" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8482,19 +8603,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "Type de livraison SVN" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "DCommit SVN..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "Extraction SVN" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "Rebase SVN" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "Révision SVN" @@ -8506,15 +8627,15 @@ msgstr "&Correction Crlf :" msgid "Safe Crlf:" msgstr "Correction Crlf :" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Le même" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Même temps d'engagement" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8532,124 +8653,128 @@ msgstr "" msgid "Sample text:" msgstr "Texte d'exemple:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Sauvegarder" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Enregistrer &sous..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Enregistrer &sous...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Enregistrer sous" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" -msgstr "Sauver le fichier du bas sous⏎\nIl vous sera demandé où sauver le fichier du bas" +msgstr "Sauver le fichier du bas sous\nIl vous sera demandé où sauver le fichier du bas" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Sauver le fichier" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" -msgstr "Sauver le fichier à gauche sous⏎\nIl vous sera demandé où sauver le fichier à gauche" +msgstr "Sauver le fichier à gauche sous\nIl vous sera demandé où sauver le fichier à gauche" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" "The modifications are saved to\n" "%s" -msgstr "Sauver le fichier à gauche⏎\nLes modifications seront sauvée sous⏎\n %s" +msgstr "Sauver le fichier à gauche\nLes modifications seront sauvée sous\n %s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" -msgstr "Sauver le fichier à droite sous⏎\nIl vous sera demandé où sauver le fichier à droite" +msgstr "Sauver le fichier à droite sous\nIl vous sera demandé où sauver le fichier à droite" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" "The modifications are saved to\n" "%s" -msgstr "Sauver le fichier à droite⏎\nLes modifications seront sauvées sous⏎\n%s" +msgstr "Sauver le fichier à droite\nLes modifications seront sauvées sous\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" -msgstr "Sauver tout⏎\nTous les fichiers seront sauvés" +msgstr "Sauver tout\nTous les fichiers seront sauvés" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" -msgstr "" +msgstr "Sauvegarder et exclure\nVos changements sont sauvegardés et le contenu original sera utilisé" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Sauvegarder et ignorer les blocs marqués\nSeuls vos modifications manuelles sont sauvées, les blocs marqués sont laissés tel quel" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "" +msgstr "Sauvegarder et inclure\nVos changements sont sauvés et les blocs marqués sont inclus" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Sauvegarder sous" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Enregistrer sous..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "Sauver sous⏎\nIl vous sera demandé où sauver le fichier" +msgstr "Sauver sous\nIl vous sera demandé où sauver le fichier" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Enregistrer les changements dans %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Sauver les modifications." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "Sauvegarder le fichier de patch" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Enregis&trer la révision sous..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Enregistrer le document actif sous un nouveau nom\nEnregistrer" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Enregistrer le document actifr\nEnregistrer" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8671,30 +8796,30 @@ msgstr "Enregistrer le diff unifié" msgid "Save unified diff since HEAD" msgstr "Enregister le diff unifié depuis HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "Sauver⏎\nSauver le fichier avec les marqueurs de conflits." +msgstr "Sauver\nSauver le fichier avec les marqueurs de conflits." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" "The modifications are saved to\n" "%s" -msgstr "Sauver⏎\nLes modifications seront sauvées sous⏎\n%s" +msgstr "Sauver\nLes modifications seront sauvées sous\n%s" #. Resource IDs: (108) msgid "Saved Data" msgstr "Données sauvegardées" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "l'enregistrement de la configuration a échoué (clef : \"%s\", valeur : \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Sauvegarde des notes échouée." @@ -8706,11 +8831,11 @@ msgstr "Scanner" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Défiler à Gauche" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Défiler à Droite" @@ -8718,7 +8843,7 @@ msgstr "Défiler à Droite" msgid "Se&ttings..." msgstr "Paramé&tres..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Recherche dans le fichier journa&l..." @@ -8730,20 +8855,20 @@ msgstr "Rechercher vers le ha&ut" msgid "Search for:" msgstr "Rechercher :" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Recherche d'un meilleur chemin pour appliquer le patch…" -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Déplacement dans %1 en erreur" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Sélectionner" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Sélectionner &Tout" @@ -8759,59 +8884,59 @@ msgstr "Sélectionner le menu &contextuel :" msgid "Select &window:" msgstr "Sélectionner la &fenêtre :" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Outil Sélecteur de Couleur\nSélecteur de Couleur" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Sélection fichiers..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Sélectionner un client SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Sélectionnez un bouton." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Sélectionner l'objet sur lequel vous désirer l'aide" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Sélectionner une liste de changements" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Sélectionner l'application de gestion des différences" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Sélectionner un fichier" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Sélectionnez le répertoire à associer avec ce système de suivi de problèmes" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Sélectionnez le répertoire vers lequel réaliser l'exportation.\nIl est possible que vous deviez créer le répertoire avant d'effectuer cette exportation." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Sélectionnez le répertoire où exécuter le script" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Sélectionnez le répertoire où sauvegarder les fichiers sélectionnés" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Sélectionner le fichier du script hook..." @@ -8819,20 +8944,20 @@ msgstr "Sélectionner le fichier du script hook..." msgid "Select items automatically" msgstr "Sélectionner les entrées automatiquement" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Sélectionner l'application de fusion" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Sélectionner la cible de la fusion" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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" -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8844,25 +8969,29 @@ msgid "" "checker used for commit messages." msgstr "Choisir la langue que ce projet utilise. Ces paramètres affectent le vérificateur orthographique utilisé pour les messages de livraison." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "Sélectionner la branche suivie" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Sélectionner l'application de visualisation des différences" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Choisissez quel fichier vous voulez sauver sous" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" -msgstr "Choisissez quel fichier vous voulez sauver sous⏎\nNote: il y a des conflits non résolus!" +msgstr "Choisissez quel fichier vous voulez sauver sous\nNote: il y a des conflits non résolus!" #. Resource IDs: (1067) msgid "Select/deselect &all" msgstr "Sélectionner / désélectionner &tout" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "Historique de la sélection" @@ -8870,7 +8999,7 @@ msgstr "Historique de la sélection" msgid "Send" msgstr "Envoyer" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Envoyer un email" @@ -8878,11 +9007,11 @@ msgstr "Envoyer un email" msgid "Send Mail after create" msgstr "Envoyen le courriel après la création" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Le message n'a pas pu être envoyé." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Envoyer un mail..." @@ -8890,19 +9019,19 @@ msgstr "Envoyer un mail..." msgid "Send Patch" msgstr "Envoyer un patch" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Envoyer un patch par email" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Envoyer des patchs par email" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Envoi du contenu" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Envoi..." @@ -8922,28 +9051,28 @@ msgstr "Régler le nom de l'Au&teur" msgid "Set author &date" msgstr "Définir la date de l'auteur" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Définir la destination comme \"pushremote\" pour la branche locale sélectionnée." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Définir la branche de destination comme \"pushbranch\" pour la branche locale sélectionnée." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Configuration des propriétés..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Configuration" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Configuration - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8951,7 +9080,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Shell étendu" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Le Cache d'Icônes du Shell est reconstruit !" @@ -8963,7 +9092,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Format court des &dates dans les commentaires" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Raccourcir la liste des propriétés" @@ -8975,7 +9104,7 @@ msgstr "Afficher" msgid "Show &Accelerator for:" msgstr "Afficher l'&Accélérateur pour :" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Voir le journal de &référence" @@ -8983,15 +9112,15 @@ msgstr "Voir le journal de &référence" msgid "Show &Unversioned Files" msgstr "Voir les fichiers &non versionnés" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Affiche le projet &entier" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Afficher les &changements" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Voir le journa&l" @@ -8999,15 +9128,19 @@ msgstr "Voir le journa&l" msgid "Show &log..." msgstr "Voir le journa&l..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "V&oir le recouvrement et le menu contextuel uniquement dans l'explorateur" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Afficher Au-dessus du Bandeau" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Afficher Au-dessous du Bandeau" @@ -9015,35 +9148,35 @@ msgstr "Afficher Au-dessous du Bandeau" msgid "Show Environment Variables" msgstr "Voir les variables d'environnement" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Afficher Moins de Boutons" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Afficher les noeuds de révision HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Voir les différences en ligne mot par mot\nDifférence en ligne par mot" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Afficher la différence en ligne\nDifférence en ligne" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Afficher Plus de Boutons" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Afficher la barre d'outils d'accès rapide au-dessus le bandeau" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Afficher la barre d'outils d'accès rapide sous le bandeau" @@ -9051,11 +9184,11 @@ msgstr "Afficher la barre d'outils d'accès rapide sous le bandeau" msgid "Show Screen&Tips on toolbars" msgstr "Afficher Screen&Tips sur les barres d'outils" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Afficher les espaces blanc" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Afficher un aperçu de l'intégralité de la courbe" @@ -9063,7 +9196,7 @@ msgstr "Afficher un aperçu de l'intégralité de la courbe" msgid "Show asterisk log prefix" msgstr "Afficher les astérisques dans les préfixes de journaux" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9071,11 +9204,11 @@ msgstr "" msgid "Show author" msgstr "Afficher l'auteur" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Voir les sections pour lesquelles cet engagement est actif" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Voir les différences en mode diff &unifié" @@ -9095,15 +9228,15 @@ msgstr "Afficher la date" msgid "Show describe in log" msgstr "Afficher la description dans le journal" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "Afficher la description dans la fenêtre du journal" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Voir le dossier de destination" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Afficher les différences" @@ -9115,11 +9248,15 @@ msgstr "Afficher la différence avec la dernière livraison" msgid "Show excluded folders as normal" msgstr "Afficher les dossiers exclus comme normaux" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "Montrer les changements supplémentaires après la fusion" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Afficher les men&us complets après un court délai" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Afficher le nom du fichier" @@ -9135,7 +9272,7 @@ msgstr "Voir les fichiers ignorés" msgid "Show ignore local changes flagged files" msgstr "Montrer les fichiers dont les changements locaux sont ignorés" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Afficher uniquement les commentaires rédigés" @@ -9143,90 +9280,90 @@ msgstr "Afficher uniquement les commentaires rédigés" msgid "Show linenumber&s" msgstr "Voir les numéros de ligne&s" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Voir le journal" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Afficher le journal &avant de renommer/copier" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Voir le journal du %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Voir le journal du sous-module" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Voir le journal de ce dossier" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Voir le journal..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Afficher les fichiers modifiés dans l'arborescence de travail" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Voir le changement suivant de la livraison sélectionnée\nAfficher le suivant" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Montrer le nœud le plus ancien en premier" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Voir ou cacher la barre des lignes de différence\nBasculer la barre des lignes de différence" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Voir ou cacher la barre de localisation\nBasculer la barre de localisation" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Afficher ou cacher la barre d'état\nBasculer la barre d'état" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Voir ou cacher la barre de statut\nBarre de statut" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Voir ou cacher la barre d'outils\nBarre d'outils" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Afficher le numéro de ligne original" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Voir le changement précédent de la livraison sélectionnée\nAfficher le précédent" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Voir les propriétés de la révision" @@ -9234,7 +9371,7 @@ msgstr "Voir les propriétés de la révision" msgid "Show shortcut &keys in ScreenTips" msgstr "Afficher les &touches de raccourcis dans ScreenTips" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9244,7 +9381,7 @@ msgstr "Afficher des caractères spéciaux à la place des espaces et les sauts msgid "Show status of subrepositories in parent folders" msgstr "Montrer le statuts des sous répertoire dans les dossiers parents" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Afficher les symboles sur les étiquettes des ref afin de remplacer une partie des noms de référence" @@ -9256,45 +9393,43 @@ msgstr "Voir les fichiers non &modifiés" msgid "Show un&versioned files" msgstr "Voir les fichiers non &versionnés" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Afficher/Masquer" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Affichage de %1!d! ref(s), %2!d! ref(s) sélectionnées" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Affichage de %ld révision(s), de la révision %s à la révision %s - %ld révision(s) sélectionnées, %ld fichier(s) sélectionnés»\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Afficher une courbe représentant les copies/étiquettes/branches" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Affiche tous les fichiers modifiés depuis la dernière mise à jour, localement et dans le dépôt" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "Affiche tous les fichiers modifiés depuis la dernière livraison" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Voir les informations à propos de TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Afiche le journal de référence" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Affiche le fichier du journal des actions dans l'éditeur de texte par défaut" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Afficher le journal du fichier ou du répertoire sélectionné" @@ -9306,7 +9441,7 @@ msgstr "Si&gner" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "Contributions significatives de: (Voir le dépôt Git pour une liste complète)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Style Silver" @@ -9314,20 +9449,20 @@ msgstr "Style Silver" msgid "Since" msgstr "Depuis" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Taille" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Passer" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Sauter le patch : %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Eviter l'arborescence de travail" @@ -9335,23 +9470,23 @@ msgstr "Eviter l'arborescence de travail" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Eviter l'arborescence de travail (\"Verrouillé\" dans TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Omis" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Ignoré, cible absente " -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Glisser" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Caractère des tabulations intelligentes" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Doux" @@ -9359,13 +9494,13 @@ msgstr "Doux" msgid "Soft: Leave working tree and index untouched" msgstr "Laxiste : Laissez l'arborescence de travail et l'index inchangés" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Certains fichier(s) ont été modifiés à l'extérieur de TortoiseGitMerge.\nVoulez-vous charger les modifications?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9379,7 +9514,7 @@ msgstr "Trier par nombre de livraisons" msgid "Sort tag list in reversed order" msgstr "Ordonner la liste des étiquettes en ordre inverse" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9389,49 +9524,53 @@ msgstr "Spécifie combien d'éléments vous voulez garder dans la boîte de dial msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Séparer lignes" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Séparer la fenêtre activée\nSéparer" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Écraser" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Graphique en barre empilé" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Graphique en ligne empilé" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Démarer (FastFwd)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Démarrer Cherry Pick" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Hook de début de livraison" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Démarrer le Rebase" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Démarrer le mode bifurcation" @@ -9439,7 +9578,7 @@ msgstr "Démarrer le mode bifurcation" msgid "Start registry editor" msgstr "Démarrer l'éditeur de registre" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Démarre un serveur git utilisant le protocole git" @@ -9451,39 +9590,47 @@ msgstr "Réserve" msgid "Stash &Message" msgstr "Réserve" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Appliquer la réserve" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Liste de la réserve" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Placer en réserve" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Enregistrer la réserve" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Opération de sauvegarde en cours..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statique" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistiques" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Statut" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configuration de la Barre d'État" @@ -9495,32 +9642,32 @@ msgstr "Statut et couleurs d'action" msgid "Status cache" msgstr "Cache du statut" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Cache d'état pour un seul répertoire, avec état complet et recouvrement récursif" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Cache d'état conservé dans un processus externe qui détecte les fichiers modifiés, peut afficher le recouvrement récursivement" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Cache du statut pour un seul répertoire, pas de recouvrement récursif" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Arrêter le mode bifurcation" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "Stocke le chemin du fichier à utiliser pour un diff sur un prochain clic droit. Maintenir la touche Ctrl pour supprimer le dernier chemin enregistré." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Stratégie" @@ -9528,15 +9675,15 @@ msgstr "Stratégie" msgid "Strip lines starting with \"#\" in commit message" msgstr "Séparer les lignes commençant par \"#\" dans le commentaire" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Style" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Sujet" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Sujet :" @@ -9544,7 +9691,7 @@ msgstr "Sujet :" msgid "Submodule" msgstr "Sous-module" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "&Mise à jour du sous-module..." @@ -9552,7 +9699,7 @@ msgstr "&Mise à jour du sous-module..." msgid "Submodule Add" msgstr "Ajout du sous-module" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Ajout du sous-module..." @@ -9560,15 +9707,15 @@ msgstr "Ajout du sous-module..." msgid "Submodule Diff" msgstr "Diff du sous-module" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Initialisation du sous-module" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Synchronisation du sous-module" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Mise à jour du sous-module" @@ -9576,12 +9723,12 @@ msgstr "Mise à jour du sous-module" msgid "Submodule Update Options" msgstr "Options de mise à jour du sous-module" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" "Revision %2!s!" -msgstr "Sous-module \"%1!s!\"↩⏎\nRévision %2!s!" +msgstr "Sous-module \"%1!s!\"\r\nRévision %2!s!" #. Resource IDs: (1585) msgid "Submodule of Project: " @@ -9591,15 +9738,15 @@ msgstr "Sous module du Projet:" msgid "Submodules" msgstr "Sous-modules" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Succès" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Permutter" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Passer %s à %s, Révision %s" @@ -9608,43 +9755,43 @@ msgstr "Passer %s à %s, Révision %s" msgid "Switch To" msgstr "Permutter" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Retourne à la partie précédente de fenêtre\nCarreau précédant" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Alterner entre la vue d'une ou deux fenêtres" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Commuter entre la vue simple et double fenêtre\nCommuter entre la vue simple et double fenêtre" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Inverser les vues de droite et de gauche" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Échanger les contenus des vues de gauche et de droite\nÉchanger vues de gauche et de droite" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Changer pour la prochaine fenêtre" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Se déplacer dans l'autre partie de la fenêtre\nProchain carreau" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Changer pour la précédente fenêtre" @@ -9652,19 +9799,19 @@ msgstr "Changer pour la précédente fenêtre" msgid "Switch/Checkout" msgstr "Permuter/Extraire" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Permuter/Extraire vers" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Permuter/Extraire vers ce..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Permuter/Déplacer l'arborescence de travail sur une autre branche / étiquette" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Permuter la comparaison gauche<->droite" @@ -9676,23 +9823,23 @@ msgstr "Rétrécir les noms de référence aux symboles" msgid "Symlink" msgstr "Lien symbolique" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Synchronisation du référentiel distant, tirer, pousser, envoyer par mail les patchs et ainsi de suite" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sync..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Système" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Système en mode offline. Vérifiez Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9702,13 +9849,13 @@ msgstr "Les entrées dans le registre système a été effacé et le fichier INI msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9722,7 +9869,7 @@ msgstr "Substitut de Tabulation" msgid "Tab size:" msgstr "Taille des tabulations :" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Étiquette" @@ -9730,16 +9877,16 @@ msgstr "Étiquette" msgid "Tag (FF)" msgstr "Etiquette (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Information sur l'étiquette" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Étiquettage de l'arborescence de travail sous %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "É&tiquettes" @@ -9747,11 +9894,11 @@ msgstr "É&tiquettes" msgid "Tags:" msgstr "Etiquettes :" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tâches" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Panneau des Tâches" @@ -9763,11 +9910,11 @@ msgstr "Fichiers temporaires (incluant les images Gravatar)" msgid "Test" msgstr "Test" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Tester uniquement" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Fichiers texte (*.txt)|*.txt|Tous les fichiers (*.*)|*.*||" @@ -9775,13 +9922,19 @@ msgstr "Fichiers texte (*.txt)|*.txt|Tous les fichiers (*.*)|*.*||" msgid "Thai" msgstr "Thailandais" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "La configuration distante a été modifiée.\nVoulez-vous enregistrer maintenant ou annuler vos modifications ?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9789,64 +9942,78 @@ msgid "" "Do you really want to delete it?" msgstr "La branche \"%s\" est une branche distante.\n\nVoulez-vous vraiment la supprimer ?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "La taille du marquage ne correspond pas aux lignes ajoutées/supprimées !" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Le commentaire de livraison ne peut pas être vide." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "L'URL du \"credential helper\" \"%s\" existe déjà.\nVoulez-vous l'écraser?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "Le \"credential helper\" a changé.\nVoulez-vous sauvegarder maintenant ou supprimer les changements?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" -msgstr "L'arborescence de travail n'est pas nette.⏎ Voulez-vous sauver les changements ?" +msgstr "L'arborescence de travail n'est pas nette.\nVoulez-vous sauver les changements ?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Le code de gestion des différences s'est arrêté en raison d'un erreur :\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "La ref de source saisie est équivoque.\nVous devez la rendre unique (e.g.en ajoutant \"refs/en-têtes/\" comme préfixe pour le branches ou \"refs/tags/\" pour les tags)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Le fichier %s n'existe pas !" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Le fichier %s n'a pas été trouvé dans le patch !" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Le fichier \"%s\" n'existe pas dans votre arborescence de travail.\nVoulez-vous choisir un autre fichier à diff?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9855,15 +10022,15 @@ msgid "" "Do you want to remove the file?" msgstr "Le fichier\n%s\nest vide.\nVoulez-vous supprimer ce fichier ?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Le fichier est trop volumineux." -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Le fichier est trop volumineux pour être ouvert." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9871,7 +10038,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Le fichier\n%s\nexiste déjà ! Voulez-vous l'écraser ?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9879,14 +10046,14 @@ msgid "" "is not a valid text file!" msgstr "Le fichier\n %s\n n'est pas un fichier texte valide !" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Le répertoire %scontient des fichiers non versionnés et/ou modifiés. Voulez-vous le supprimer malgré tout ?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9895,78 +10062,78 @@ msgid "" "Would you like to create it first?" msgstr "Le répertoire \n%s\n'existe pas.\nVoulez-vous le créer d'abord?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Le script hook a renvoyé une erreur :\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "L'image ne peut pas être affichée." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Le fournisseur du système de suivi des problèmes n'a pas pu être créé. Veuillez vérifier s'il est installé correctement." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Le fournisseur du système de suivi des problèmes n'a pas été capable de valider la chaîne des paramètres" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "La ligne indiquant le nouveau fichier était attendu à la ligne %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Le numéro de ligne doit être entre %d et %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "La branche locale \"%s\" ne correspond pas à une mise à jour de la branche distante \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "Les noms des branches locales et distantes ne doivent pas être vide.\nPoursuivre ?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "Le nom de la branche / étiquette locale est vide. Ceci implique la suppression de la copie distante.\nPoursuivre ?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Le nombre maximum de lignes dans le journal des actions à conserver.\nChaque ligne ajoutée au-dessus de cette limite supprimera la ligne la plus ancienne du fichier." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "L'opération a échoué." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Les paramètres '/path' et '/pathfile' s'excluent mutuellement.\nVous ne devez en définir qu'un des deux." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "Le patch ne s'applique pas correctement à %s et aucune information sur la version n'est donnée.\nL'application du patch est impossible!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9976,7 +10143,7 @@ msgid "" "do not match!" msgstr "Le patch semble périmé ! La ligne\n%s\net la ligne du patch\n%s\nne correspondent pas !" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9987,7 +10154,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Le chemin/URL que vous avez entré semble illégal sous Windows !\nVous pouvez quand même essayer, mais vous aurez peut-être une erreur plus tard.\n\nUn chemin valide sous windows ne doit pas contenir '<<>|\"?*:' ou l'un des noms de périphériques suivant :\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nVoulez-vous continuer malgré tout ?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9998,44 +10165,51 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Le chemin\n%s\nne semble pas correspondre aux chemins du fichier de patch.\nMais TortoiseGitMerge a trouvé le chemin\n%s\nqui correspond mieux. Voulez-vous utiliser le chemin suggéré à la place?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Le processus est encore en cours.\nÊtes-vous sur de vouloir annuler?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "L'expression régulière est invalide!\nMerci de saisir une expression régulière valide." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "L'élément distant \"%s\" existe déjà.\nVoulez-vous l'écraser ?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "La branche distante n'a pas changé.\n\nOuvrir quand même la fenêtre de dialogue Rebase ?" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Le dépôt a été créé avec succès" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Le fichier sélectionné semble contenir un ou plusieurs marquages de conflit à l'intérieur.\nÊtes-vous sûr de marquer le fichier comme résolu ?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" "Merely committing the superproject cannot track or save such changes to the submodule.\n" "Commit the submodule now or ignore dirty changes?" -msgstr "Le sous-module \"%s\" est sale.\nLe simple fait de l'appliquer au super projet ne pourra pas pister ou sauver de tels changements dans le sous module.⏎ On engage le sous module maintenant ou on ignore les changements sales ?" +msgstr "Le sous-module \"%s\" est sale.\nLe simple fait de l'appliquer au super projet ne pourra pas pister ou sauver de tels changements dans le sous module.\nOn engage le sous module maintenant ou on ignore les changements sales ?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10044,7 +10218,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Le dossier d'arrivée\n%s\nest un dossier spécial et n'est pas supposé être la racine d'un dépôt !\nÊtes-vous sur de vouloir initialiser un dépôt Git dans ce dossier ?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10053,26 +10227,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Le dossier cible \n%s\nn'est pas vide!\nêtes-vous sûr de vouloir commencer un \"git repository\" dans ce dossier?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" -msgstr "Le texte est identique, mais les fichiers ne correspondent pas !↩\nLes différences suivantes ont été trouvées:" +msgstr "Le texte est identique, mais les fichiers ne correspondent pas!\r\nLes différences suivantes ont été trouvées:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Le temps en secondes après lequel le filtrage des fichiers sélectionnés s'arrête.\r\nUne valeur plus basse rendra la liste d'autocomplétion disponible plus rapidement,\r\nmais ne parcourrera peut-être pas tous les fichiers." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Les deux URL sélectionnées ne sont pas créées avec la même racine.\nIl n'est pas possible d'afficher les journaux d'historique entre eux !" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10082,34 +10256,34 @@ msgstr "" msgid "Their file:" msgstr "Leur fichier :" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Le leur" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Il y a des changements ou des éléments non versionnés dans un ou plusieurs sous-module..\nCes fichiers ne sont pas inclus pour la livraison. Vous devez livrer ces fichiers séparément." -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Il y a actuellement %d gestionnaires de superposition installés en plus de celui qu'utilise la Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" -msgstr "Il y a plus de vues éditables.⏎\nQuelle vue voulez-vous sauver?" +msgstr "Il y a plus de vues éditables.\nQuelle vue voulez-vous sauver?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Il n'y a pas de fournisseur de système de suivi des problèmes de disponible." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10118,85 +10292,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Il y a encore des conflits non résolus à la ligne %d !\nVous devriez résoudre ces conflits d'abord avant d'enregistrer.\nVoulez-vous enregistrer le fichier avec des conflits encore présents ?\nSi vous cliquez sur Oui, alors vous aurez à résoudre manuellement les conflits dans un autre éditeur !" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Il y a des modifications non sauvegardées !\nVoulez-vous enregistrer vos modifications?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Il n'y a rien à ajouter. Tous les fichiers et dossiers ont été ignorés; soit ils sont sous un contrôle de version, ou le réglage de configuration est sur une ignorance globale. " -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Dictionnaire de synonymes" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Ceci sont des documents sauvegardés plus récemment que ceux actuellement ouvert et qui contiennent des modifications qui ont été faites avant que l'application ne se ferme." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Ce champ est obligatoire et ne peut être vide." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Ce n'est pas une URL valide.\nVeuillez saisir une URL ici." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Ce n'est pas un chemin valide !\nUn chemin valide ne doit pas contenir '<<>|\"?*:' ou l'un des noms de périphériques suivant :\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." -msgstr "" +msgstr "L'opération ne peut pas commencer pendant que la boite du journal charge encore les livraisons." -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Ce programme est lié à l'exportation manquante %s dans le fichier %s. Cette machine peut avoir une version incompatible de %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Ce programme demande le fichier %s, lequel n'a pas été trouvé." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Cette propriété est seulement autorisée sur les répertoires, pas sur les fichiers." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "Ce nom distant est en conflit avec le fetch refspec d'un autre serveur distant\nMerci d'utiliser un autre nom" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Cette tâche nécessite une arborescence de travail propre." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Cela supprimera les enregistrements des commandes que vous avez utilisées dans cette application et restaurera le jeu par défaut de commandes visibles dans les menus et les barres d'outils. Cela n'annulera pas une quelconque personnalisation explicite. Êtes-vous sûr de vouloir continuer ?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Trois comparaisons possibles" @@ -10212,14 +10386,14 @@ msgstr "Organiser hori&zontallement" msgid "To" msgstr "Vers :" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" -msgstr "Pour éviter de chercher les mauvais tags, si ceci n'est pas un serveur officiel,⏎\nil est préférable de désactiver la recherche des tags sur ce serveur.⏎\nDésactiver la recherche des tags ?" +msgstr "Pour éviter de chercher les mauvais tags, si ceci n'est pas un serveur officiel,\nil est préférable de désactiver la recherche des tags sur ce serveur.\nDésactiver la recherche des tags ?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10231,13 +10405,13 @@ msgstr "To clear temporary files, you should ensure that no other TortoiseGit ap msgid "To:" msgstr "À :" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Basculer l'afficher Une/Deux Pages\nBasculer l'afficher Une/Deux Pages" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Basculer les filtres" @@ -10249,11 +10423,11 @@ msgstr "Barre d'Outils" msgid "Toolbar Name" msgstr "Nom de la Barre d'Outils" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Options de la Barre d'outils" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Erreur interne de la barre d'outils. Veuillez contacter le revendeur de votre application." @@ -10269,16 +10443,16 @@ msgstr "Outils" msgid "Tools:" msgstr "Outils :" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10288,20 +10462,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit a détecté que le fichier \"%s\" n'existe pas, mais est marqué comme \"Ajouté\".\nLa fenêtre de livraison ne peut gérer cela.\n\nVoulez-vous l'enlever de l'index?" +"Do you want to restore or remove it from the index?" +msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit a détecté des noms de fichiers similaires. Voulez-vous que les fichiers : %s\nsoient aussi renommés ?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit ne montrera pas les superpositions suivantes: %s" @@ -10310,18 +10484,18 @@ msgstr "TortoiseGit ne montrera pas les superpositions suivantes: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame a été déjà intialisé pour le dépôt \"%s\". Impossible de basculer vers un autre dépôt (\"%s\") lors de son exécution." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10337,7 +10511,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10345,7 +10519,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Un outil différenciateur d'image, qui fait parti de TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10359,16 +10533,16 @@ 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»»pour activer le mode de superposition\n/fit»»pour ajuster la taille des images\n/showinfo»»pour afficher la case des infos sur les images" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10377,18 +10551,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge ne peut pas utiliser ce fichier comme patch. Le nom \"%s\" apparait plus d'une fois." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10427,11 +10601,11 @@ msgstr "Suivre" msgid "Tracked Remote Branch:" msgstr "Branche distante suivie :" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Branche suivie" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Transfert à %s" @@ -10440,39 +10614,35 @@ msgstr "Transfert à %s" msgid "Transparent &color..." msgstr "&Couleur transparente..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "découper à droite" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Essayez un 'Nettoyer'. Si cela ne fonctionne pas vous devrez faire une nouvelle extraction." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Réessayer" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turc" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Ajuster TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Type" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Type:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "L'URL et le répertoire ne peuvent pas être vides." @@ -10496,24 +10666,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Impossible de charger le système de mail." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Impossible de traiter la commande, serveur occupé." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Impossible de lire depuis %1, il est ouvert par quelqu'un d'autre." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Impossible de lire la propriété écriture-seule." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10521,91 +10691,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Impossible de reconstruire le chemin de l'arborescence de travail !\nCela peut se produire si le fichier a été renommé.\nVeuillez lancer la boîte de dialogue de Journal sur ce fichier spécifique et annuler alors les changements\ndepuis la panneau supérieur de la boîte de dialogue de Journal." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Impossible d'écrire la propriété lecture-seule." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Impossible d'écrire dans %1, il est en lecture seule ou ouvert par quelqu'un d'autre." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Annuler sélection" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Annuler" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Annuler %d Actions" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Annuler 1 Action" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Annuler l'ajout..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Annuler la dernière action\nAnnuler" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Annule les dernières modifications\nAnnuler" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Format de fichier non attendu." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Déplier" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Texte non formatté\nTexte sans formattage" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Regroupement des &diff des révisions HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Inconnu" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Profondeur inconnu" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Enveler la marque de ce bloc" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Conflits non résolus!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Sans nom" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Non-versionné" @@ -10613,7 +10787,7 @@ msgstr "Non-versionné" msgid "Unversioned files mark parent folder as modified" msgstr "Les fichiers non versionnés marquent le dossier parent comme modifié" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Rendre %s non-versionné" @@ -10626,23 +10800,23 @@ msgstr "Haut" msgid "Update" msgstr "Mise à jour" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Mettre à jour la référence" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Mise à jour des sous-modules" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Mis à jour" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Mise à jour des objets ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Mise à jour de l'index" @@ -10654,30 +10828,26 @@ msgstr "Utiliser l'Image par &Défaut:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Utiliser la vue panneau unique par défaut p&our les diff de 2 fichiers" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Utiliser l'autre bl&oc de texte" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Utiliser le bloc de texte 'le mien'" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Utiliser le bloc de texte 'le mien' puis 'le leur'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Utiliser le bloc de texte 'le leur'" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Utiliser le bloc de texte 'le leur' puis 'le mien'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Utiliser des blocs" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Utiliser un chemin de composante HTTP" @@ -10698,15 +10868,15 @@ msgstr "Utiliser des &paquets de petite taille (Pour les connexions réseau lent msgid "Use Unified Diff from &clipboard" msgstr "Utiliser les Différen&ces unifiées du presse-papiers" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Utiliser un autre nom ou utiliser l'option \"Force\" pour forcer l'écriture." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Utiliser un autre nom ou utiliser l'option \"Override branch\" option" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10716,7 +10886,7 @@ msgstr "Utiliser tout le contenu de la vue gauche\nUtiliser le fichier gauche" msgid "Use block from left before right" msgstr "Utiliser le bloc de gauche avant celui de droite" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10726,25 +10896,25 @@ msgstr "Utiliser le bloc de la vue gauche avant celui de la vue droite\nUtiliser msgid "Use block from right before left" msgstr "Utiliser le bloc de droite avant celui de gauche" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Utiliser le bloc de la vue droite avant celui de la vue gauche\nUtiliser le bloc de droite avant celui de gauche" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Utiliser les deux blocs de texte (celui-ci en premier)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Utiliser les deux blocs de texte (celui-ci en dernier)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "Utiliser le serveur configuré" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Utiliser le bloc de gauche" @@ -10760,15 +10930,15 @@ msgstr "Utiliser la couleur de la branche locale pour la branche actuelle" msgid "Use recycle bin when reverting" msgstr "Utiliser la corbeille lors d'un retour en arrière" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Utiliser les expressions régulières" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Utiliser le bloc de droite" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Utiliser des espaces" @@ -10776,93 +10946,93 @@ msgstr "Utiliser des espaces" msgid "Use system locale for date/time" msgstr "Utiliser les réglages internationaux du système pour la date/l'heure" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Utiliser le bloc de texte depuis 'le &mien'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Utiliser le bloc de texte depuis 'le &leur'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Utiliser le bloc de texte du 'm&ien' avant 'le leur'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Utiliser le bloc de texte du 'mien' avant 'le leur'\nUtiliser 'mon' bloc de texte puis 'le leur'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Utiliser le bloc de texte depuis 'le mien'\nUtiliser 'mon' bloc de texte" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Utiliser '&leur' bloc de texte avant 'le mien'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Utiliser 'leur' bloc de texte avant le 'mien'\nUtiliser 'leur' bloc de texte puis le 'mien'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Utiliser 'leur' bloc de texte\nUtiliser 'leur' bloc de texte" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Utiliser le bloc de texte de la vue de gauche\nUtiliser le bloc gauche" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Ut&iliser ce bloc de texte" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" "Apply the patch to\n" "%s" -msgstr "Utiliser l'emplacement trouvé.⏎\nAppliquer le patch à⏎\n%s" +msgstr "Utiliser l'emplacement trouvé.\nAppliquer le patch à\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" "Apply the patch to\n" "%s" -msgstr "Utiliser l'emplacement original.⏎\nAppliquer le patch à⏎\n%s" +msgstr "Utiliser l'emplacement original.\nAppliquer le patch à\n%s" #. Resource IDs: (1825, 1826) msgid "Use this" msgstr "Utiliser ceci" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Utiliser la &totalité de ce fichier" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Utiliser ce bloc à gauche" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Utiliser l'autre &fichier entier" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Utilisé pour corriger la tête de la branche courante." @@ -10878,11 +11048,11 @@ msgstr "Informations de l'utilisateur" msgid "User Name:" msgstr "Nom de l'utilisateur :" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Annulé par l'utilisateur" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10892,11 +11062,11 @@ msgstr "Le nom et l'email de l'utilisateur doivent être indiqué avant la livra msgid "User&name:" msgstr "Nom d'&utilisateur:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nom :" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10913,9 +11083,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "Les options de la ligne de commandes valides sont :\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valeur" @@ -10923,24 +11093,24 @@ msgstr "Valeur" msgid "Version" msgstr "Révision" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Révision 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Version 1 (Date de livraison plus récentes)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Révision 2 (Base)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Version 2 (Base) (Date de livraison plus récentes)" @@ -10948,11 +11118,11 @@ msgstr "Version 2 (Base) (Date de livraison plus récentes)" msgid "Version Information" msgstr "Informations de révision" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Révision :" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versionné" @@ -10964,23 +11134,27 @@ msgstr "Vitnamien" msgid "View" msgstr "Vue" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Voir .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Afficher un patch" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Voir le patch>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Voir la révision pour le chemin dans la visionneuse &web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Voir la révision dans l'éditeur alternatif" @@ -10992,11 +11166,11 @@ msgstr "Voir tout&système gitconfig" msgid "Visit our website" msgstr "Visitez notre site Web" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11007,7 +11181,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ATTENTION :\r\nNe changez ces paramètres qui si vous êtes absolument sûrs de ce que vous faites !Pour remettre les valeurs par défaut, supprimez le texte." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Attendre" @@ -11015,7 +11189,7 @@ msgstr "Attendre" msgid "Wait for the script to finish" msgstr "Attendre que le script se termine" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "En attente d'une saisie" @@ -11023,15 +11197,15 @@ msgstr "En attente d'une saisie" msgid "Walk Be&haviour" msgstr "Comportement de parcours" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Avertissement" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Avertissement !" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11039,7 +11213,7 @@ msgid "" "Do you really want to continue?" msgstr "Avertissement : \"%s\" sera supprimé de manière permanente. Il ne pourra pas être restauré !\n\nVoulez-vous vraiment continuer ?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11047,56 +11221,56 @@ msgstr "Web" msgid "Western European" msgstr "Afficher l'&ensemble du projet" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Lorsque activé, tenez la touche SHIFT en faisant un clic-droit pour voir les menus TortoiseGit dans le menu contextuel" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Lors de l'application d'un patch, ignorer les changements d'espace dans les lignes de contexte si nécessaire" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Lors de la fermeture d'une fenêtre d'avancement avec un processus git en cours, demande une confirmation avant de tuer ce processus" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Si activé, TortoiseGit le choix de déplacement dans le menu contextuel sera disponible lors de glissement de dossiers / fichiers" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Si activé, les versions avec de grands nombres viennent d'abord. Cela est du au fait que les dernières versions sont plus utiles." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Si activé, les éléments versionnés listés dans la boîte de dialogue de livraison sont automatiquement sélectionnés." -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Quand le patch ne s'applique pas proprement, se rabattre sur la fusion en 3 temps si le patch enregistre l'identité des blobs sur lequels il est s'appliquer et ces blobs sont disponibles localement." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "Quand l'URL est saisie, le nom distant est automatiquement rempli par \"origin\" si le nom distant est vide, donc vous n'êtes pas obligés de le faire." -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11106,15 +11280,15 @@ msgid "" "authentication and/or encryption." msgstr "Durant l'utilisation d'un service, toutes les données du dépôt sont exposées sans authentification et/ou encryptage." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Changements des caractères d'espacement (tabulation, espaces)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Espacements" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Position de la Fenêtre" @@ -11122,15 +11296,15 @@ msgstr "Position de la Fenêtre" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11174,11 +11348,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "A l'intérieur d'un fichier:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Dans le fichier" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Arborescence de travail" @@ -11186,29 +11360,25 @@ msgstr "Arborescence de travail" msgid "Working Tree Path:" msgstr "Chemin de l'arborescence de travail :" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Modifications du répertoire de travail" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Retour automatique à la ligne" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Retour automatique à la ligne au bord de la fenêtre\nRetour automatique à la ligne" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Oui" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Oui pour tous" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Vous avez déjà la dernière version installée." @@ -11218,51 +11388,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Vous pouvez désactiver des gestionnaires spécifiques de Recouvrement ici.\nLes gestionnaires désactivés n'utiliseront pas de slot de recouvrement et donneront aux autres extensions de l'explorateur une chance d'afficher leurs recouvrements." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Vous ne pouvez coller qu'un bitmap de dimension %d x %d !" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Vous ne pouvez pas créer plus de %d barres d'outils utilisateur !" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Vous ne pouvez mettre cette propriété sur les répertoires, seulement sur les fichiers !\nSi vous voulez mettre cela sur tous les fichiers contenus dans ce répertoire,\nvous devez activer la case à cocher 'récursif'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Vous ne pouvez pas modifier le type de cette référence avec un renommage." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." -msgstr "" +msgstr "Vous avez une ancienne version de Git pour Windows d'installé (https://msysgit.github.io/) qui présente des failles de sécurité.\n\nVous devriez considérer une mise à jour vers 1.9.5+." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Vous avez coché \"inclure les non pistés\".\nCela inclus un appel \"git clean -fd\"l, alors les fichiers ignorés/répertoires seront supprimés sans utiliser la poubelle." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Vous avez modifié les propriétés sans les enregistrer d'abord.\nVoulez-vous les enregistrer maintenant?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11270,67 +11440,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Vous avez sélectionné %d objets afin de voir les différences.\nPour chacun de ces objets, une nouvelle instance de l'affichage de différence sera démarrée.\nVoulez-vous vraiment afficher les différences pour autant d'objets en une fois?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Vous n'avez pas saisi de numéro d'incident !\nÊtes-vous sûr de vouloir livrer sans un numéro d'incident ?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Vous n'avez pas indiqué votre signature !" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Vous avez marqué certain fichier à \"restaurer après livraison\".\nVoulez-vous les restaurer maintenant ? Vous pourriez perdre toute modification de ces fichiers après cette opération." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Vous pouvez définir jusqu'à %d outils." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Vous devez entrer un message de log pour la livraison" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Vous devez redémarrer votre système pour prendre en compte les modifications" -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Vous devez sélecttionner un nom de fichier pour le fichier Zip !" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Vous avez sélectionner un répertoire.\nL'Export est possible seulement vers un fichier (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Vous avez sélectionné un fichier non versionné.\nLe fichier va être ajouté au contrôle de version à la livraison." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Vous devriez rentrer un texte !" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Vous devriez sélectionner une image !" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Vous avez changé le jeu d'icônes %s par %s.\nCe changement ne prendra effet qu'après le redémarrage de votre ordinateur ou l'ouverture d'une nouvelle session !" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11340,7 +11510,7 @@ msgstr "Vos commentaires précédents ont été sauvegardés.\nCliquez ici pour msgid "Your version is:" msgstr "Votre version est :" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Votre version est : %d.%d.%d.%d" @@ -11350,10 +11520,10 @@ msgid "Zip File" msgstr "Fichier Zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Ré&duire" +msgid "Zoo&m out\t-" +msgstr "Zoo&m arrière\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Agrandir" @@ -11365,80 +11535,80 @@ msgstr "Agrand&ir le Grossissement" msgid "Zoom &Out" msgstr "Réduire le Gr&ossissement" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Agrandir le Grossissement\nAgrandir le Grossissement" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Réduire le Grossissement\nRéduire le Grossissement" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Agra&ndir" +msgid "Zoom i&n\t+" +msgstr "Zoom ava&nt\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Agrandir" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Réduire" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zoom adapté" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zoom avec hauteur ajustée" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zoom avec largeur ajustée" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Défaut]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Non assigné]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" -msgstr "\"%s\" contient un référentiel Git. Il ne fonctionnera pas comme un sous module prêt à l'emploi.↩\nVoulez-vous supprimer le fichier .git-entry et ajouter tous les fichiers du dossier parent ou le laisser comme un référentiel indépendant dans un sous répertoire ?" +msgstr "\"%s\" contient un référentiel Git. Il ne fonctionnera pas comme un sous module prêt à l'emploi.\nVoulez-vous supprimer le fichier .git-entry et ajouter tous les fichiers du dossier parent ou le laisser comme un référentiel indépendant dans un sous répertoire ?" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" contient un sous module git. C'est probablement cela qui ne fonctionne plus sur la destination après la copie.\nVoulez-vous supprimer .git-entry et ajouter tous les fichiers au référentiel au-dessus ou ignorer ce possible problème et le garder ?" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" is incorrect." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" n'est pas un dépôt git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11452,7 +11622,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "ajoutir \"cherry picked depuis\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "ajouté" @@ -11460,7 +11630,7 @@ msgstr "ajouté" msgid "added files" msgstr "fichiers ajoutés" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "un fichier non nommé" @@ -11468,14 +11638,19 @@ msgstr "un fichier non nommé" msgid "and support the developers" msgstr "et supportez les développeurs" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "Confirmation de modification" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "auteur" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "auteur (>= 0.5 %)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "based on TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11508,30 +11683,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "livraisons" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "en conflit" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copié depuis\r\n%s - à la révision %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "jour" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "effacé" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11543,7 +11718,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "Configuration de l'email" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11552,16 +11727,16 @@ msgid "" "%s" msgstr "exporté\n%s\nvers\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "externe" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git ne s'est pas terminé proprement (code d'erreur %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignoré" @@ -11569,15 +11744,15 @@ msgstr "ignoré" msgid "include &untracked" msgstr "inclure les &non versionnés" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incomplet" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "Inherit" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "élément conservé localement" @@ -11585,7 +11760,7 @@ msgstr "élément conservé localement" msgid "keep the file lists in English" msgstr "laisser la liste des fichiers en anglais" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11594,7 +11769,7 @@ msgid "" "%s = %ld" msgstr "ligne : %d(+) %d(-) fichiers : %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11609,11 +11784,11 @@ msgstr "ligne : %d(+) %d(-) fichiers : %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n% msgid "master" msgstr "maître" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "fusionné" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "manquant" @@ -11621,7 +11796,7 @@ msgstr "manquant" msgid "missing/deleted/replaced" msgstr "manquant / supprimé / remplacé" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "modifié" @@ -11629,7 +11804,7 @@ msgstr "modifié" msgid "modified/copied" msgstr "modifié / copié" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mois" @@ -11637,40 +11812,44 @@ msgstr "mois" msgid "new branch" msgstr "nouvelle branche" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "non" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "pas de description disponible pour cette commande" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "non versionné" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "aucun" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "non trouvé" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "gênant" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "sur %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "points" @@ -11678,11 +11857,11 @@ msgstr "points" msgid "possible or real conflict/obstructed" msgstr "conflit possible ou réel / bloquant" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestre" @@ -11690,35 +11869,35 @@ msgstr "trimestre" msgid "renamed" msgstr "renommé" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "remplacé" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "Scan du chemin:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "Eviter l'arborescence de travail" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "allé sur\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "prends soin des changements des sous-modules" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "vers %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "vers %s" @@ -11727,35 +11906,35 @@ msgstr "vers %s" msgid "u&nknown changes" msgstr "Changements i&nconnus" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "semaine" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - pour tous les utilisateurs de windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - pour l'utilisateur actuel de windows" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - pour ce dépôt seulement" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - pour l'utilisateur actuel de windows" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - pour ce dépôt seulement" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "année" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "oui" diff --git a/Languages/Tortoise_hu.po b/Languages/Tortoise_hu.po index ca737278d..10c7b759b 100644 --- a/Languages/Tortoise_hu.po +++ b/Languages/Tortoise_hu.po @@ -11,13 +11,14 @@ # Hgrg , 2013 # Hgrg , 2013 # Péter Handbauer , 2014-2015 +# Petrovics Sándor , 2014 # Sven Strickroth , 2013 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/tortoisegit/language/hu/)\n" "MIME-Version: 1.0\n" @@ -26,7 +27,7 @@ msgstr "" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -48,138 +49,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "Megjelenített fejlesztők száma:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB forgalom" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 váratlan objektumot tartalmaz." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 hibás elérési utat tartalmaz." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 rossz sémát tartalmaz." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 rossz formátumú." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 nem található." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! napja" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! napja" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! órája" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! órája" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! perce" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! hónapja" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! hónapja" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! másodperce" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! másodperce" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! hete" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! hete" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! éve" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! éve" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! elem kiválasztva" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! perce" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" -msgstr "" +msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\n%2!d! fájl, %3!d! almodul és %4!d! mappa megjelenítve, összesen %5!d! elem" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nFusson tovább a szkript?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -187,52 +188,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nA fájl nem található.\nEllenőrizd, hogy helyes-e az elérési út és a fájlnév." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig vagy %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d bájt forgalmazva" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB forgalom" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d fájl megváltozott" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d fájl eltávolítva." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d fájl visszaállítva %s verzióra." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d fájl kiválasztva, %d összesen" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "Az első %d legaktívabb fejlesztő, egyenként legalább %d beküldéssel (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -240,78 +241,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld perc %ld másodperc" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld / %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - az alábbi verzióval: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Helyreállított]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s, %s alatt" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, %s-nél" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\(%d) exportja %s-ből" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\%s exportja" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nBiztosan el szeretné távolítani?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -327,6 +328,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "" @@ -355,15 +360,15 @@ msgstr "" msgid "&Add New/Save" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Gombok hozzáadása/eltávolítása" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Hozzáadás..." @@ -403,7 +408,7 @@ msgstr "&Felelős" msgid "&Associate double-click event with:" msgstr "&Dupla kattintás eseményhez rendelés:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Automatikus elrejtés" @@ -419,15 +424,15 @@ msgstr "" msgid "&Backup original file" msgstr "&Biztonsági másolat készítése" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Változások hibáztatása" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "Verziók &hibáztatása" @@ -451,7 +456,7 @@ msgstr "&Ág:" msgid "&Browse Dir" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Tároló böngészése" @@ -487,9 +492,9 @@ msgstr "&Kategória:" msgid "&Choose commands from:" msgstr "Paran&cs kiválasztása:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." -msgstr "" +msgstr "&Tisztítás..." #. Resource IDs: (57632) msgid "&Clear" @@ -511,7 +516,7 @@ msgstr "Ablak(ok) &bezárása" msgid "&Command:" msgstr "&Művelet:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Beküldés..." @@ -519,23 +524,27 @@ msgstr "&Beküldés..." msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Beküldés..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Verziók összehasonlítása" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Másolás" @@ -545,7 +554,7 @@ msgstr "Gomb képének &másolása" #. Resource IDs: (57634) msgid "&Copy\tCtrl+C" -msgstr "&Másolás⇥Ctrl+C" +msgstr "&Másolás\tCtrl+C" #. Resource IDs: (1662) msgid "&Custom" @@ -555,11 +564,11 @@ msgstr "&Saját" msgid "&Default" msgstr "&Alap" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Törlés" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Törlés (helyi példány megtartása)" @@ -567,7 +576,7 @@ msgstr "&Törlés (helyi példány megtartása)" msgid "&Delete Filter" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "" @@ -579,11 +588,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Összehasonlítás" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Összehasonlítás az előző verzióval" @@ -595,7 +604,7 @@ msgstr "" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "" @@ -603,7 +612,7 @@ msgstr "" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Dokkolt" @@ -611,11 +620,15 @@ msgstr "&Dokkolt" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "" @@ -623,11 +636,11 @@ msgstr "" msgid "&Edit" msgstr "&Szerkesztés" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "" @@ -635,7 +648,7 @@ msgstr "" msgid "&Edit Filter" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Konfliktusok szerkesztése" @@ -657,13 +670,13 @@ msgstr "&Proxy szerver engedélyezése" #. Resource IDs: (32976) msgid "&Enable edit" -msgstr "" +msgstr "Szerkeszt&és engedélyezése" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Kijelölés exportálása ide..." @@ -675,27 +688,27 @@ msgstr "&Külső" msgid "&File" msgstr "&Fájl" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Keresés" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" -msgstr "&Keresés⇥Ctrl+F" +msgstr "&Keresés\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" +msgid "&Fit images in window\tF" msgstr "" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Merevlemezek" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Lebegő" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -707,7 +720,7 @@ msgstr "&Megjegyzések betűtípusa:" msgid "&Font:" msgstr "&Betűtípus:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -725,9 +738,9 @@ msgstr "" #. Resource IDs: (220) msgid "&Go to\tCtrl+G" -msgstr "&Ugrás⇥Ctrl+G" +msgstr "&Ugrás\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -739,7 +752,7 @@ msgstr "&Zöld" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Súgó" @@ -747,7 +760,7 @@ msgstr "&Súgó" msgid "&Help Topics" msgstr "&Súgó témák" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Elrejtés" @@ -755,11 +768,11 @@ msgstr "&Elrejtés" msgid "&Icon Set:" msgstr "&Ikon-stílus:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "%d elem k&ihagyása név alapján" @@ -773,14 +786,14 @@ msgid "&Image" msgstr "&Kép" #. Resource IDs: (32790) -msgid "&Image info" +msgid "&Image info\tI" msgstr "" #. Resource IDs: (16505) msgid "&Image only" msgstr "Csak &kép" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importálás..." @@ -792,7 +805,7 @@ msgstr "&Kezdőmappa:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -804,11 +817,11 @@ msgstr "Az &első eltéréshez ugrás betöltéskor" msgid "&Keep CR" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -830,13 +843,13 @@ msgstr "Keresés &korlátozása a módosított sorokra" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Limit:" #. Resource IDs: (1078) msgid "&Line number" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "" @@ -853,7 +866,7 @@ msgstr "&Lista nézet" msgid "&Local Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -867,7 +880,7 @@ msgstr "" #. Resource IDs: (65535) msgid "&Max line length for inline diffs" -msgstr "" +msgstr "A soron belüli eltérések &max sorhossza" #. Resource IDs: (16543) msgid "&Menu animations:" @@ -877,11 +890,11 @@ msgstr "&Menü animációk:" msgid "&Menu contents:" msgstr "&Menü tartalma:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Egyesítés" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Egyesítés..." @@ -931,12 +944,16 @@ msgstr "&Új..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Tovább >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Következő oldal" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Nincs dupla kattintás esemény" @@ -953,11 +970,11 @@ msgstr "" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Egy oldal" @@ -965,21 +982,17 @@ msgstr "&Egy oldal" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Megnyitás" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" -msgstr "&Megnyitás...⇥Ctrl+O" +msgstr "&Megnyitás...\tCtrl+O" #. Resource IDs: (1382) msgid "&Options" @@ -990,18 +1003,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Átfedés engedélyezése" +msgid "&Overlay images\tO" +msgstr "&Átfedés engedélyezése\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Jelszó:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Beillesztés" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1009,7 +1022,7 @@ msgstr "" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Nyomtatási kép" @@ -1017,11 +1030,15 @@ msgstr "&Nyomtatási kép" msgid "&Print..." msgstr "&Nyomtatás..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Nyomtatás...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1029,10 +1046,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Korábbi megjegyzések" @@ -1045,7 +1066,7 @@ msgstr "" msgid "&Red:" msgstr "&Piros" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Ismét" @@ -1061,7 +1082,7 @@ msgstr "&Frissítés" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1069,7 +1090,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1077,7 +1098,7 @@ msgstr "" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Törlés" @@ -1089,7 +1110,7 @@ msgstr "" msgid "&Replace" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Tároló &böngészése" @@ -1097,7 +1118,7 @@ msgstr "Tároló &böngészése" msgid "&Reset" msgstr "&Visszaállítás" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Eszköztár visszaállítása" @@ -1113,23 +1134,27 @@ msgstr "&Felhasználási adatok visszaállítása" msgid "&Reset to Default" msgstr "&Alapbeállítás visszaállítása" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1141,7 +1166,7 @@ msgstr "&SSH kliens:" msgid "&Saturation:" msgstr "Telített&ség:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Mentés" @@ -1149,15 +1174,19 @@ msgstr "&Mentés" msgid "&Save authentication" msgstr "&Felhasználónév és jelszó megjegyzése" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "Grafikon &mentése másként..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "Kiválasztott fájlok listájának &mentése..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Mentés\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1165,7 +1194,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Beállítások" @@ -1185,7 +1214,7 @@ msgstr "&Szövegcímkék mutatása" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "" @@ -1193,7 +1222,7 @@ msgstr "" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1205,7 +1234,7 @@ msgstr "&Indítás" msgid "&Start Group" msgstr "&Csoport indítás" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1225,7 +1254,7 @@ msgstr "&Ikon nézet" msgid "&Tab size:" msgstr "&Tab méret:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Tabulált Dokumentum" @@ -1233,7 +1262,7 @@ msgstr "&Tabulált Dokumentum" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Kiadások" @@ -1269,7 +1298,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Eszköztárak:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1281,7 +1310,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Két oldal" @@ -1289,15 +1322,15 @@ msgstr "&Két oldal" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Visszavonás" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Egyesített diff" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1309,7 +1342,7 @@ msgstr "&Ismeretlen meghajtók" msgid "&Up" msgstr "&Fel" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Elem frissítése a verzióhoz" @@ -1321,11 +1354,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Automatikus útvonal- és kulcsszókiegészítés" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Felhasználónév:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Nézet" @@ -1333,7 +1366,7 @@ msgstr "&Nézet" msgid "&View:" msgstr "&Nézet:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1349,6 +1382,10 @@ msgstr "&Csak teljes szó" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -1357,46 +1394,46 @@ msgstr "" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(nincs változáslistába helyezve)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(nincs sorszám)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(nincs érték)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nem található)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(ismeretlen)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "" @@ -1404,13 +1441,14 @@ msgstr "" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1418,7 +1456,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1434,7 +1472,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1448,101 +1486,101 @@ msgstr "<.....>" #. Resource IDs: (65535) msgid "<<" -msgstr "" +msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" "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 "A TortoiseGit egy héj kiegészítés.⏎\nEz azt jelenti, hogy a Windows explorer-be épül be.⏎\nA TortoiseGit használatához a TortoiseGit parancsokat az explorerben a mappákon jobb egérgombbal kattintva elérhető menüben találhatja meg.⏎\nOlvass el a kézikönyvet!" +msgstr "A TortoiseGit egy héj kiegészítés.\nEz azt jelenti, hogy a Windows explorer-be épül be.\nA TortoiseGit használatához a TortoiseGit parancsokat az explorerben a mappákon jobb egérgombbal kattintva elérhető menüben találhatja meg.\nOlvass el a kézikönyvet!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1550,7 +1588,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<új változáslista>" @@ -1562,71 +1600,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Már létezik azonos nevű branch." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Újabb verzió érhető el. Kérem töltse le a friss verziót!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Lista azokról az útvonalakról, amelyeken mindenképp jelenjenek meg az ikonok, a fenti beállításoktól függetlenül. Soronként egy útvonalat adj meg.\r\nHa egy \"*\" karaktert adsz meg az útvonal végén, akkor a hozzá tartozó összes fájl és almappa is bele lesz véve." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Lista azokról az útvonalakról, amelyeken ne jelenjen meg a TortoiseSVN menü. Soronként egy útvonalat adj meg.\r\nHa egy \"*\" karaktert adsz meg az útvonal végén, akkor a hozzá tartozó összes fájl és almappa is ki lesz zárva.\r\nHa üres a lista, akkor minden útvonalon engedélyezve lesz a menü." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Lista azokról az útvonalakról, amelyeken ne jelenjenek meg ikonok. Soronként egy útvonalat adj meg.\r\nHa egy \"*\" karaktert adsz meg az útvonal végén, akkor a hozzá tartozó összes fájl és almappa is ki lesz zárva.\r\nHa üres a lista, akkor minden útvonalon engedélyezve lesznek az ikonok." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Egy szükséges erőforrás nem elérhető." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "GNU diff fájl (patch fájl) nézegető program.\r\nHa nincs ilyened, használd a Jegyzettömböt." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&Névjegy" @@ -1642,23 +1680,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Megszakítás" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "&Egyesítés megszakítása" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Futó merge megszakítása." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Névjegy" @@ -1678,12 +1716,12 @@ msgstr "A TortoiseGitMerge névjegye" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Hozzáférés %1-hez megtagadva." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Események" @@ -1691,26 +1729,26 @@ msgstr "Események" msgid "Action log" msgstr "Eseménynapló" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Események" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Feladatlista aktiválása" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktív fájlok" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "A Windows leállítása közben nem lehet az ActiveX objektumokat elmenteni!\nElveted %1 változásait?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Hozzáadás" @@ -1718,7 +1756,7 @@ msgstr "Hozzáadás" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "\"%s\" hozzáadása a szótárhoz" @@ -1731,15 +1769,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Kiterjesztésfüggő diff program hozzáadáasa" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Kiterjesztésfüggő egyesítő program hozzáadáasa" @@ -1747,15 +1785,15 @@ msgstr "Kiterjesztésfüggő egyesítő program hozzáadáasa" msgid "Add new files automatically to Git" msgstr "Új fájlok automatikus hozzáadása az Git-hez" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "&Hozzáadás a kizárási listához" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Hozzáadás a Gyorsindító eszköztárhoz" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Hozzáadás..." @@ -1763,11 +1801,11 @@ msgstr "Hozzáadás..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Kiterjeszésfüggő diff/egyesítő program hozzáadása/szerkesztése" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Hozzáadott" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1775,25 +1813,25 @@ msgid "" "to the ignore list." msgstr "%s\nfájlminták hozzáadva\na kizárási listához." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Hozzáadva" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "A kiválaszott fáj(ok) vagy kiterjesztés(ek) hozzáadása a kizárási listához" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Beállítás\nBeállítások" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Speciális" @@ -1801,43 +1839,43 @@ msgstr "Speciális" msgid "Advanced Diff/Merge Settings" msgstr "Speciális diff/egyesítési beállítások" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Speciális diff beállítások" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Speciális egyesítési beállítások" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Összes" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Összes Parancs" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Minden fájl (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Minden fájl (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1845,47 +1883,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Minden módosítás el fog veszni! Biztosan alaphelyzetbe akarod állítani az eszköztárakat és a menüket?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Minden módosítás el fog veszni! Biztosan alaphelyzetbe akarod állítani a gyorsbillentyűket?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Minden módosítás el fog veszni! Biztosan alaphelyzetbe akarod állítani a(z) \"%s\" menüt?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Minden módosítás el fog veszni! Biztosan alaphelyzetbe akarod állítani a(t) \"%s\" eszköztárat?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" -msgstr "" +msgstr "Szerkesztés engedélyezése ehhez a nézethez\nSzerkesztés engedélyezése" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1901,11 +1939,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Mindig a helyi rendszerbeállítást használja a dátum/idő megjelenítéséhez" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1913,12 +1951,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1929,7 +1967,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1942,34 +1980,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Érvényleten fájl azonosítóthal hovatkozott %1-re." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Ismeretlen hiba történt." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Ismeretlen hiba %1 elérése közben." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Ismeretlen sortípus a %d. sorban!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Baloldali blokk hozzáfűzése." -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Jelen blokk hozzáfűzése balra" @@ -1981,11 +2019,11 @@ msgstr "Alkalmazás Keret Menü" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Patch alkalmazása..." @@ -1993,7 +2031,7 @@ msgstr "Patch alkalmazása..." msgid "Apply Patches" msgstr "Folt alkalmazása" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -2001,47 +2039,47 @@ msgstr "" msgid "Apply unified diff" msgstr "Egyesített diff alkalmazása" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" -msgstr "" +msgstr "Tengerkék stílus" #. Resource IDs: (65535) msgid "Arabic" msgstr "arab" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Biztos, hogy a konfliktusos fájlokat feloldottnak jelölöd?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Biztos,hogy visszaállítasz %d elemet? Az összes módosítás elveszik!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" +msgid "Arrange &vertical\tV" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Hozzárendelve a(z) \"%s\" változáslistához" @@ -2050,11 +2088,11 @@ msgstr "Hozzárendelve a(z) \"%s\" változáslistához" msgid "Assigned to:" msgstr "Felelős:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2066,34 +2104,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Jelenlegi verzió: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Jelen pillanatban a branch-ágak csak átnevezhetők." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "A program egy nem támogatott műveletet kísérelt meg." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "A program a %1 fájl vége után kísérelt meg hozzáférni." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "A program %1-be írás közben kísérelt meg olvasni." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "A program %1-ból olvasás közben kísérelt meg írni." @@ -2110,11 +2148,11 @@ msgstr "Hitelesítés" msgid "Authentication data" msgstr "Hitelesítési adatok" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Fejlesztő" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2122,7 +2160,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Szerző:»»»»Stefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Fejlesztők" @@ -2144,11 +2182,11 @@ msgstr "" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Automatikus elrejtés" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Összes automatikus elrejtése" @@ -2156,23 +2194,23 @@ msgstr "Összes automatikus elrejtése" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Ha nincs konfliktus" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Ha nem történt hiba" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Ha nincs egyesítés, hozzáadás vagy törlés" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2186,7 +2224,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatikus" @@ -2196,7 +2234,7 @@ msgstr "&Új verzió keresése hetente egyszer" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Automatikus Tesztelő" #. Resource IDs: (1157) msgid "Average" @@ -2206,19 +2244,19 @@ msgstr "Átlag" msgid "B&rowse..." msgstr "&Tallózás..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Vissza" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Háttér" #. Resource IDs: (65535) msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Oszlopdiagram" @@ -2238,7 +2276,7 @@ msgstr "Alap fájl:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2250,45 +2288,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitkép\negy bitkép" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" -msgstr "" +msgstr "Fekete stílus" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Hibáztatás" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Minden sornak kiírja a legutóbbi módosítóját" @@ -2296,26 +2334,30 @@ msgstr "Minden sornak kiírja a legutóbbi módosítóját" msgid "Blend alpha" msgstr "" -#. Resource IDs: (156, 626) -msgid "Blue Style" +#. Resource IDs: (156) +msgid "Blocks" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (215, 10009) +msgid "Blue Style" +msgstr "Kék stílus" + +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg-t és /logmsgfile-t is megadtál!\nCsak az egyiket lehet megadni." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2327,30 +2369,30 @@ msgstr "&Tallózás..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ág" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2362,11 +2404,11 @@ msgstr "Ág:" msgid "Bro&wse" msgstr "Bön&gészés" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Külső diff program tallózása" @@ -2378,7 +2420,7 @@ msgstr "" msgid "Browse..." msgstr "Tallózás..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Hiba-ID" @@ -2390,13 +2432,13 @@ msgstr "" msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Hiba-ID-k" #. Resource IDs: (65535) msgid "BugTraq" -msgstr "" +msgstr "BugTraq" #. Resource IDs: (327) msgid "Bugtraq Regex Tester - TortoiseGit" @@ -2406,7 +2448,7 @@ msgstr "" msgid "Button Appearance" msgstr "Gomb kinézete" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2422,7 +2464,7 @@ msgstr "&Keresés most" msgid "C&ommands:" msgstr "&Műveletek:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "&Mellékág/kiadás készítsése adott verzióból" @@ -2430,11 +2472,11 @@ msgstr "&Mellékág/kiadás készítsése adott verzióból" msgid "C&urrent Keys:" msgstr "&Jelenlegi billentyűk:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Kivágás" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2450,11 +2492,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Duplakattintás a naplóban összehasonlítja az előző verzióval" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Nem lehet statikus ActiveX objektumot aktiválni." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2463,80 +2505,80 @@ msgid "" "%s" msgstr "%s\nnem másolható ide:\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Nem lehet a bitképet a vágólapra másolni!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Nem lehet új képet létrehozni!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Nem lehet testreszabni a menüket!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Nem lehet a bitképet beilleszteni a vágólapról!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Mégse" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Mégse\nNem lép ki a TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Mégse\nÜres fájl megtartása." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Mégse\nKonfliktusok feloldása először." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Az eltérések nem mutathatóak meg az eltérő sortörések miatt." @@ -2548,7 +2590,7 @@ msgstr "" msgid "Cascaded context menu" msgstr "Jobbklikk-re megjelenő menü" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Nagybetű érzékeny" @@ -2572,33 +2614,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" -msgstr "" +msgstr "Az alkalmazás stílusának módosítása\nStílus módosítása" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Az ablak helyének megváltoztatása" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Az ablak méretének megváltoztatása" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2606,38 +2648,38 @@ msgstr "" msgid "Changed Files" msgstr "Megváltozott fájlok" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Megváltozott fájlok %s, %s és %s, %s között" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Megváltozott fájlok: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "%s változáslista áthelyezve" @@ -2646,15 +2688,15 @@ msgstr "%s változáslista áthelyezve" msgid "Changes made (double-click on file for diff):" msgstr "Változások (kattints duplán a fájlra a részletekért):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" -msgstr "" +msgstr "Az alkalmazás stílusának módosítása" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Ellenőrzés" @@ -2666,31 +2708,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Frissítések keresése..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "&Változások keresése" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Ellenőrizd az elérési utat és/vagy URL-t, amit beírtál." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Ha be van jelölve, a naplófájlokban a rövidebb formában jelenik meg a dátum" @@ -2698,31 +2740,31 @@ msgstr "Ha be van jelölve, a naplófájlokban a rövidebb formában jelenik meg msgid "Check:" msgstr "Kijelölés:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Lekérés" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2730,11 +2772,11 @@ msgstr "" msgid "Chinese" msgstr "kínai" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Tároló választás" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2746,78 +2788,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Tisztítás" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Tisztítás." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "A tisztításnak nem sikerült feldolgoznia az alábbi útvonalakat:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "A tisztítás sikeresen feldolgozta az alábbi útvonalakat:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Törlés" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Tisztító Alkalmazás\nTörlés" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "%ld felhasználónév/jelszó párt, %ld ssl tanúsítványt és %ld felhasználónevet töröl" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "%ld db tárolóhoz tartozó összes megjegyzést töröl" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Eltávolítja az elmentett bejelentkezési információt.\r\nÚjra be kell írnod a felhasználónevet/jelszót a tárolók eléréséhez." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "%ld ablak helyzetét és méretét felejti el" @@ -2826,7 +2868,7 @@ msgstr "%ld ablak helyzetét és méretét felejti el" msgid "Click here to go to the website" msgstr "Kattints ide a weboldalra ugráshoz" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Kattints ide egy korábban beírt megjegyzés kiválasztásához" @@ -2842,17 +2884,17 @@ msgid "" "extension" msgstr "Kattints a \"Speciális\" gombra a kiterjesztésfüggő egyesítő programok megadásához" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" -msgstr "" +msgstr "Kattints ide, a szövegblokk mozgató parancsok megtekintéséhez\nSzövegblokk használat" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Vágólap" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Klónozás" @@ -2860,7 +2902,7 @@ msgstr "Klónozás" msgid "Clone Existing Repository" msgstr "Meglévő tároló klónozása" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Tároló klónozása" @@ -2868,49 +2910,49 @@ msgstr "Tároló klónozása" msgid "Clone into Bare Repo" msgstr "Klónozás csupasz tárolóba" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Klónozás..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Bezárás" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Teljes képernyő bezárása" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Nyomtatási kép bezárása\n&Bezárás" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Ne zárja be automatikusan" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Bezárja az aktív ablakot és megkérdezi, hogy elmentse-e a dokumentumokat" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Összecsukás" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2936,7 +2978,7 @@ msgstr "Színek:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Egyesítés egy kommitba" @@ -2944,11 +2986,11 @@ msgstr "Egyesítés egy kommitba" msgid "Comman&ds:" msgstr "&Parancsok:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Művelet" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Parancssor" @@ -2956,7 +2998,7 @@ msgstr "Parancssor" msgid "Command Line To Execute:" msgstr "Végrehajtandó parancssori utasítás:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Sikertelen művelet." @@ -2964,41 +3006,41 @@ msgstr "Sikertelen művelet." msgid "Commands" msgstr "Parancsok" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Beküldés" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Beküldési Dátum" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Beküldéshez használt név" @@ -3006,7 +3048,7 @@ msgstr "Beküldéshez használt név" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3014,19 +3056,19 @@ msgstr "" msgid "Commit to:" msgstr "Beküldés ide:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Beküldés..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Beküldések fejlesztőnként" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Beküldések időrendben" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Minden %s beküldése" @@ -3035,15 +3077,15 @@ msgstr "Minden %s beküldése" msgid "Commits each week:" msgstr "Beküldések hetente:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Elküldi a tárolóba a változtatásaidat" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Beküldő Email" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3055,52 +3097,52 @@ msgstr "Ha beküldés ablakban adsz hozzá egy mappát a verziókezeléshez,\na msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "&FŐ verziók összehasonlítása" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Két fájl összehasonlítása" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Láthatatlan karakterek figyelembe vétele" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Összehasonlítás az &alap verzióval" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Összehasonlítás az előző verzióval" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Láthatatlan karakterek figyelembe vétele összehasonlításkor\nLáthatatlan karakterek figyelembe vétele" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Összehasonlítja a fájlt a legutolsó beküldött verzióval és megmutatja a változtatásaidat" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "%s és %s összehasonlítása" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Befejezve" @@ -3116,7 +3158,7 @@ msgstr "Forrás beállítása" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3150,11 +3192,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "Futó git folyamat kilövésének megerősítése" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Konfliktus" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Konfliktus fájlok" @@ -3162,15 +3204,15 @@ msgstr "Konfliktus fájlok" msgid "Conflict resolved" msgstr "Konfliktus feloldva" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Konfliktusos" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Konfliktusok" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konfliktusok: %d" @@ -3183,124 +3225,124 @@ msgstr "Helyi menük: " msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Folytatás" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Dokkolt ablak összecsukása" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Szóközök cseréje tabulátorra" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Tabulátorok cseréje szóközre" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Másolás" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Másolva" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Másolás" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "%s másolása ide: %s, Verzió: %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Másolási eszköz\nMásolás" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Minden információ másolása a vágólapra" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Másolás és átnevezés" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Log üzenetek másolása vágólapra" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Log másolása vágólapra" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Útvonalak másolása a vágólapra" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "&Kijelölés másolása a vágólapra" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "A kiválasztott rész másolása a vágólapra\nMásolás" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Másolás a vágólapra" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Másolás: %s új neve" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "%s másolása" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Másolás..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Javítások" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "%s nem adható a kizárási listához!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Nem sikerült új verziót keresni!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3308,76 +3350,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 nem hozható létre, mert a mappa tele van." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Nem sikerült meghatározni a legutóbb beküldött verziót!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Nem érhető el az állapot!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 nem nyitható meg, mert túl sok fájl van megnyitva." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Nem nyitható meg a fájl\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 nem törölhető, mert az a jelenlegi mappa." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "%s nem távolítható el az kizárási listáról" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Nem érhető el a fájl címe!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Nem érhető el a(z) %s verziója a %s fájlnak.\nNem lehetséges a patch-elés!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "A TortoiseGitBlame elindítása nem sikerült" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3385,7 +3427,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3393,7 +3435,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3401,11 +3443,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "A nyomtatás nem sikerült." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3413,11 +3455,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Szálat nem lehet indítani!" @@ -3425,7 +3467,7 @@ msgstr "Szálat nem lehet indítani!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3438,15 +3480,15 @@ msgstr "" msgid "Create .gitignore file" msgstr ".gitignore fájl létrehozása" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Branch létrehozása" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Új ág létrehozása a választott verzió alapján..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Új ág..." @@ -3458,29 +3500,29 @@ msgstr "Változáslista készítése" msgid "Create New Branch" msgstr "Új ág létrehozása" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3489,49 +3531,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" -msgstr "" +msgstr "Patch fájl létrehozása" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Új tároló &létrehozása itt..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Létrehoz egy patch fájlt a két fájl eltérései alapján\nPatch fájl létrehozása" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Létrehoz egy tároló-adatbázist a jelenlegi helyen" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Egy egyesített diff fájlt készít a módosításaid alapján" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3543,7 +3585,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Kivágás" @@ -3551,7 +3593,7 @@ msgstr "&Kivágás" msgid "Current" msgstr "Jelenlegi" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Aktuális ág" @@ -3559,7 +3601,7 @@ msgstr "Aktuális ág" msgid "Current Branch:" msgstr "Aktuális ág:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3571,7 +3613,7 @@ msgstr "" msgid "Current version is:" msgstr "Jelenlegi verzió:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Jelenlegi verzió: %s" @@ -3584,7 +3626,7 @@ msgstr "&Testreszabás..." msgid "Custom" msgstr "Egyéni" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Testreszabás" @@ -3592,19 +3634,19 @@ msgstr "Testreszabás" msgid "Customize Keyboard" msgstr "Gyorsbillentyűk testreszabása" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "A Gyorsindító eszköztár testreszabása" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "A Gyorsindító eszköztár testreszabása..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3618,88 +3660,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Dátum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Alapértelmezett" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Alapértelmezett menü" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Alapértelmezett alkalmazás menü. Amikor nincs dokumentum megnyitva akkor jelenik meg." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "UTF-8 az alapértelmezett kódolás" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Törlés" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "%d elem törlése és k&izárása név alapján" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Törlés és &hozzáadás a kizárási listához" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "%d &elem törlése és kizárása kiterjesztés alapján" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Branch törlése" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Ág/címke törlése" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Távoli branch törlése" @@ -3707,34 +3753,34 @@ msgstr "Távoli branch törlése" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Almodul törlése" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Törölje a létező branch-ágat vagy használjon másik nevet." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Törölt" @@ -3742,36 +3788,36 @@ msgstr "Törölt" msgid "Deleted merge conflict" msgstr "Törölt ellentmondásos rész" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Kiválasztott fájl(ok) vagy kiterjesztés(ek) törlése és hozzáadása a kizárási listához" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Törli a fájlokat/mappákat a verziókezelésből" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Törli a fájlokat/mappákat a verziókezelésből, de a fájl megmarad" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Törli a teljes eseménynaplót" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Törlés" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Gyorstárazott adatok törlése" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Fájl törlése" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3781,7 +3827,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Mélység" #. Resource IDs: (65535) msgid "Describe" @@ -3791,7 +3837,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Leírás" @@ -3799,7 +3845,7 @@ msgstr "Leírás" msgid "Description:" msgstr "Leírás:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Változáslista kijelölésének törlése" @@ -3807,33 +3853,33 @@ msgstr "Változáslista kijelölésének törlése" msgid "Destination" msgstr "Cél" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "A célmeghajtó megtelt." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Az elmozgatott blokkok keresése és megjelenítése" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3847,11 +3893,15 @@ msgstr "Ablakok helyzete és mérete" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Két beküldés összehasonlítása" @@ -3883,7 +3933,7 @@ msgstr "Diff fájl:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3895,12 +3945,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3913,19 +3963,19 @@ msgstr "Különbségek" msgid "Diffing" msgstr "Összehasonlítás" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3937,26 +3987,26 @@ msgstr "Mappa:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "%1 elérése közben megtelt a lemez." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Kivétel továbbítása: %1" @@ -3965,44 +4015,52 @@ msgstr "Kivétel továbbítása: %1" msgid "Display &buttons in this order" msgstr "&Gombok megjelenítése ebben a sorrendben" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Segítséget ad a gombokhoz, menükhöz és ablakokhoz\nSúgó" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Segítséget ad a jelenlegi feladathoz vagy parancshoz\nSúgó" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Segítséget ad a súgó használatához\nSúgó" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Megjelenít információt a programról, a verziószámot és szerzői jogi megjegyzést\nNévjegy" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4015,54 +4073,71 @@ msgstr "Ne mutassa jobbklikk-menüt az alábbi útvonalakon:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Biztosan törölni szeretnéd a(z) \"%s\" eszköztárat?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Biztos áthelyezed ezt a fájlt vagy mappát?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Biztosan el akarja \"%s\"-t távolítani?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4070,7 +4145,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4078,21 +4153,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" -msgstr "" +msgstr "Szeretné betölteni a megváltozott fájlokat?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4100,21 +4175,21 @@ msgid "" "as resolved?" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Szeretnéd ezeket az automatikusan mentett dokumentumokat helyreállítani?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Biztos hogy újratöltöd a dokumentumot?\nAz összes változtatásod el fog veszni!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4122,28 +4197,28 @@ msgstr "" msgid "Document :" msgstr "Dokumentum :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4153,11 +4228,11 @@ msgstr "" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Ne mutassa többet ezt az üzenetet" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Kész" @@ -4169,7 +4244,7 @@ msgstr "Le" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Lebegő menü megjelenítéséhez húzza el" @@ -4197,6 +4272,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Kizárt útvonalak:" @@ -4205,7 +4284,7 @@ msgstr "&Kizárt útvonalak:" msgid "E&xit" msgstr "&Kilépés" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Exportálás..." @@ -4215,7 +4294,7 @@ msgstr "Kül&ső" #. Resource IDs: (303) msgid "EOL" -msgstr "" +msgstr "EOL" #. Resource IDs: (5064) msgid "EUC-KR" @@ -4225,11 +4304,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Szerkesztés" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4245,23 +4324,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Nyomógomb Kép szeresztése" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Jegyzetek szerkesztése" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Fejlesztő szerkesztése" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Kiterjesztésfüggő diff program szerkesztése" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Kiterjesztésfüggő egyesítő program szerkesztése" @@ -4273,11 +4352,11 @@ msgstr "A globális .git/config szerkesztése" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Megjegyzés szerkesztése" @@ -4297,25 +4376,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "A proxy IP- vagy webcíme" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Ellipszis eszközök\nEllipszis" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4323,9 +4402,9 @@ msgstr "" msgid "Empty" msgstr "Üres" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" -msgstr "" +msgstr "Szerkesztés engedélyezése" #. Resource IDs: (1510) msgid "Enable EditorConfig" @@ -4339,7 +4418,7 @@ msgstr "" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4348,47 +4427,51 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" -msgstr "" +msgstr "Engedélyezett rátét kezelők" #. Resource IDs: (65535) msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Egy hardware I/O hiba történt %1 elérése közben." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Zárolási hiba történt %1 elérése közben." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Megosztási hiba történt %1 elésrése közben." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Helytelen paraméter." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Ismeretlen hiba %1 olvasása közben." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Ismeretlen hiba %1 írása közben." @@ -4401,11 +4484,11 @@ msgstr "" msgid "End" msgstr "Vége" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" -msgstr "" +msgstr "Sorvég stílusa" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Teljes képernyős méret" @@ -4413,23 +4496,23 @@ msgstr "Teljes képernyős méret" msgid "Enter Log Message" msgstr "Írd be a megjegyzést" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Írd be az URL-t:" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Írj be egy GUID-t." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Írj be egy pénznemet." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Írd be egy időt és/vagy dátumot." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Írj be egy dátumot." @@ -4437,90 +4520,90 @@ msgstr "Írj be egy dátumot." msgid "Enter a name for the changelist:" msgstr "Adj meg egy nevet a változáslistának:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Írj be egy számot %1 és %2. között." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Írj be egy számot." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Írj be egy pozitív egész számot." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Írj be egy időt." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Írj be be egy egész számot %1 és %2 között." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Írj be be egy egész számot 0 és 255 között." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Írj be be egy egész számot." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Alul adja meg a test fájl tartalmát:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Írd be a &megjegyzést:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Ne adj meg %1 karakternél többet." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Alul adja meg a (regex) reguláris kifejezést:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Mindent letöröl\nMindet töröl" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Kiválasztottat töröl\nTöröl" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Hiba" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Hiba az Ikonadatbázis újraépítésekor!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Hiba történt a(z) %s regisztációs kulcs írása/olvasása közben\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4530,28 +4613,28 @@ msgstr "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information (*.pdf)|*.pdf msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Létező" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Kilépés" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Kibontás (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Dokkolt ablak kibontása" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Mappa megnyitása" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportálás" @@ -4559,36 +4642,36 @@ msgstr "Exportálás" msgid "Export Zip File" msgstr "Mentés zip fájlként" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Mappa exportálása:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Nem verziókezelt fájlokat is exportálja" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "%s exportálása" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportálás..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Kiterjesztés" @@ -4604,7 +4687,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Külső" @@ -4612,101 +4695,101 @@ msgstr "Külső" msgid "External Program:" msgstr "Külső program:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Visszaállítás sikertelen" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Kapcsolodás nem lehetséges.\nKapcsolat megszakadhatott." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Nem sikerült az ActiveX objektum konvertálása." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Nem sikerült az üres dokumentumot létrehozni." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Nem sikerült az objektumot létrehozni. Ellenőrizd, hogy a program jelen van-e a rendszerleíró adatbázisban." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Nem sikerült a súgót elindítani" -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Nem sikerült a szervert elindítani." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Nem sikerült a dokumentumot betölteni." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Nem sikerült a szerver-művelet." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Nem sikerült a dokumentumot kimenteni." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Nem sikerült a(z) \"%s\" változáslista létrehozása/törlése." -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Nem sikerült elindítani a hibakövető COM-szolgáltatóját: \"%s\".\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Sikertelen!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4714,62 +4797,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Fájl lekérése..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Fájl %s verziójának lekérése:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Fájl" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Fájlváltozások minden %s" @@ -4778,27 +4861,27 @@ msgstr "Fájlváltozások minden %s" msgid "File changes each week:" msgstr "Fájlváltozások hetente:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Fájl diff-ek" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "A fájllista üres" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Fájl patch-ek" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4810,7 +4893,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Fájlméret:\t\t%s (%s)\nSzélesség:\t\t%ld pixel\nMagasság:\t\t%ld pixel\nVízszintes felbontás:\t%.1f dpi\nFüggőleges felbontás:\t%.1f dpi\nSzínmélység:\t\t%d bit\nNagyítás:\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4830,7 +4913,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Fájlméret:\t\t%s (%s)\nSzélesség:\t\t%ld pixel\nMagasság:\t\t%ld pixel\nVízszintes felbontás:\t%.1f dpi\nFüggőleges felbontás:\t%.1f dpi\nSzínmélység:\t\t%d bit\nNagyítás:\t\t%d%%\n\nFájlméret:\t\t%s (%s)\nSzélesség:\t\t%ld pixel\nMagasság:\t\t%ld pixel\nVízszintes felbontás:\t%.1f dpi\nFüggőleges felbontás:\t%.1f dpi\nSzínmélység:\t\t%d bit\nNagyítás:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4842,7 +4925,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Fájlméret:\t\t%s (%s)\nSzélesség:\t\t%ld pixel\nMagasság:\t\t%ld pixel\nVízszintes felbontás:\t%.1f dpi\nFüggőleges felbontás:\t%.1f dpi\nSzínmélység:\t\t%d bit\nNagyítás:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4862,7 +4945,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Fájlméret:\t\t%s (%s)\nSzélesség:\t\t%ld pixel\nMagasság:\t\t%ld pixel\nVízszintes felbontás:\t%.1f dpi\nFüggőleges felbontás:\t%.1f dpi\nSzínmélység:\t\t%d bit\nNagyítás:\t\t\t%d%%\n\nFájlméret:\t\t%s (%s)\nSzélesség:\t\t%ld pixel\nMagasság:\t\t%ld pixel\nVízszintes felbontás:\t%.1f dpi\nFüggőleges felbontás:\t%.1f dpi\nSzínmélység:\t\t%d bit\nNagyítás:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Fájlnév" @@ -4870,17 +4953,17 @@ msgstr "Fájlnév" msgid "Files" msgstr "Fájlok" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Kitöltési eszköz\nKitöltés" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Útvonalak kiszűrése" @@ -4892,11 +4975,11 @@ msgstr "" msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Keresés" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4906,17 +4989,17 @@ msgstr "Megkeresi a megadott szöveget\nKeres" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4924,23 +5007,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Befejezve!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "" @@ -4949,18 +5032,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Hajlékonylemez (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Mappa" @@ -4972,38 +5055,34 @@ msgstr "" msgid "Font" msgstr "Betűtípus" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "A Súgóhoz nyomj F1-et. Vízszintes görgetéshez használd a Ctrl+egérgörgőt." -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "A teljes előzményhez vedd ki a pipát a \"Másolásnál / átnevezésnél megáll\" mezőből" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Kényszerítés" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5021,20 +5100,20 @@ msgstr "" msgid "Format Patch" msgstr "Folt formázása" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Előre" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5042,7 +5121,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Automatikus szavak:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5064,11 +5143,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5076,7 +5155,7 @@ msgstr "" msgid "From:" msgstr "Ettől:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Teljes képernyő" @@ -5084,7 +5163,7 @@ msgstr "Teljes képernyő" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Rekurzívan minden fájlt/almappát" @@ -5092,7 +5171,7 @@ msgstr "Rekurzívan minden fájlt/almappát" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5100,24 +5179,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "A GDI+ inicializálása sikertelen!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "A GDI+ nem tudott létrehozni egy bitkép objektumot. Valószínűleg nincs elég memória." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Információ összegyűjtése, kis türemlet..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5147,43 +5226,43 @@ msgstr "Általános::Helyi menü" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Általános::Ablakok 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Általános::Ablakok 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Általános::Ablakok 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Összefésülési naplók" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "%s fájl lekérése" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "%s fájl %s verziójának lekérése" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Információ lekérése..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Szükséges információ letöltése..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Egyesített diff lekérése" @@ -5195,23 +5274,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Copy és fájlok hozzáadása" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git minden fájl exportálása" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5219,35 +5298,35 @@ msgstr "" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5259,31 +5338,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5304,7 +5383,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5316,47 +5395,47 @@ msgstr "" msgid "Go to line" msgstr "Sorhoz ugrás" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Ugrás a következő konfliktushoz\nKövetkező konfliktus" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Ugrás a következő eltéréshez\nKövetkező eltérés" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" -msgstr "" +msgstr "Ugrás a következő soron belüli eltérésre\nKövetkező soron belüli eltérés" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Ugrás az előző konfliktushoz\nElőző konfliktus" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Ugrs az előző eltéréshez\nElőző eltérés" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" -msgstr "" +msgstr "Ugrás az előző soron belüli eltérésre\nElőző soron belüli eltérés" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" -msgstr "" +msgstr "Ugrás sorra" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Gráf" @@ -5372,11 +5451,11 @@ msgstr "Szürke" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Változáslisták csoportosítása" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5392,7 +5471,7 @@ msgstr "FŐ" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5404,7 +5483,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Súgó" @@ -5426,13 +5505,13 @@ msgstr "Hex" #. Resource IDs: (1660) msgid "Hide Menus for unversioned paths" -msgstr "" +msgstr "Menü elrejtése a nem verziókezelt útvonalaknál" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Dokkolt ablak elrejtése" @@ -5440,25 +5519,25 @@ msgstr "Dokkolt ablak elrejtése" msgid "Hide the script while running" msgstr "Szkript elrejtése futás közben" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" -msgstr "" +msgstr "Patch fájllista elrejtés/mutatás" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Elrejti/megjeleníti a patch fájlok listáját\nElrejti/megjeleníti a patch fájlok listáját" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5468,7 +5547,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Tipp: helyzetérzékeny menüben, váltson a 'Parancsok' oldalra és húzza az eszköztár gombokat a menü ablakba." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Kezdőoldal" @@ -5484,7 +5563,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Hook szkriptek::Hibakövető integrálása" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Hook típusa" @@ -5498,9 +5577,9 @@ msgstr "&Engedélyezett útvonalak:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "Azonosító" @@ -5508,55 +5587,56 @@ msgstr "Azonosító" msgid "ID:220:V C +G" msgstr "" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5564,15 +5644,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "" @@ -5596,7 +5676,7 @@ msgstr "" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32809:V C +F" @@ -5604,7 +5684,7 @@ msgstr "ID:32809:V C +F" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32814:V C +L" @@ -5612,7 +5692,7 @@ msgstr "ID:32814:V C +L" msgid "ID:32883:V C +A" msgstr "" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "" @@ -5620,16 +5700,16 @@ msgstr "" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5640,17 +5720,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5662,7 +5742,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "" @@ -5726,7 +5806,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Ikonok" @@ -5736,9 +5816,9 @@ msgstr "Ikonok::Stílusok" #. Resource IDs: (338) msgid "Icon Overlays::Overlay Handlers" -msgstr "" +msgstr "Ikonok::Rátét kezelők" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5748,52 +5828,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Ha be van jelölve, nem jelennek meg az ikonok és a helyi menü a \"Mentés másként...\" és a \"Megnyitás\" ablakokban" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Ha be van jelölve és duplakattintunk napló listájában\r\negy verzióra, összehasonlítja azt az előző verzióval." -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Ha ba van jelölve, akkor a beküldés ablak hiba és/vagy sikertelen\r\nbeküldés esetén újra megnyílik, megőrzive a beállításokat." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Ha engedélyezve van, a TortoiseGit hetente egyszer ellenőrzi, hogy elérhető-e frissebb verzió" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Ha be van jelölve, akkor a nem verziókezelt mappákban lévő fájlok is megjelennek\r\naz állapotjelzőben. Állapotjelző található például a \"Beküldés\" ablakban." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5806,16 +5886,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Kihagyás" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "%d fájl kizárása &kiterjesztés alapján" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "" @@ -5827,15 +5907,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Láthatatlan karakterek eltérésének figyelmen kívül hagyása" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5843,11 +5923,11 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Kisbetű-&nagybetű változások figyelmen kívül hagyása" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "" +msgstr "Módosítások mellőzése\nA külső változások mellőzése." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5861,11 +5941,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Sorvég&ek figyelmen kívül hagyása (ajánlott)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5873,29 +5953,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Láthatatlan karakterek eltérésének figyelmen kívül hagyása" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Figyelmen kívül hagyott" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Minden láthataltan karakter figyelmen kívülhagyása az összehasonlításnál\nNubdeb láthataltan karakter figyelmen kívülhagyása" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5913,24 +5993,24 @@ msgstr "&Kép és szöveg" msgid "Images" msgstr "Képek" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Fájlokat és a közvetlen almappákat" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importálás" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "%s importálása ide: %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5939,16 +6019,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "%s importálása" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5972,26 +6052,26 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Csak az alábbi intervallumot vegye figyelembe:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Rossz fájlnév." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Kezdeti importálás" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" -msgstr "" +msgstr "Soron belüli diff" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" -msgstr "" +msgstr "Soron belüli diff szavanként" #. Resource IDs: (65535) msgid "Inline differences" @@ -6001,25 +6081,25 @@ msgstr "Soron belüli eltérések" msgid "Input" msgstr "Bemenet" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "A vágólap tartalmának beillesztése\nBeillesztés" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Nincs elég memória a művelet elvégzéséhez." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Belső programhiba." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Rossz pénznem." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6027,7 +6107,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6036,7 +6116,7 @@ msgstr "Nem lehet úgy átnevezni egy fájlt, hogy csupán kisbetű/nagybetű-be #. Resource IDs: (1074) msgid "J&ump to first conflict when loading" -msgstr "" +msgstr "&Ugrás az első konfliktusra betöltésekor" #. Resource IDs: (65535) msgid "Japanese" @@ -6050,7 +6130,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6058,11 +6138,11 @@ msgstr "" msgid "Keep changelists" msgstr "Változáslisták megtartása" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6076,7 +6156,7 @@ msgstr "Billentyűzet" msgid "Keyboard shortcuts:" msgstr "Gyorsbillentyűk:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Billentyűk" @@ -6118,21 +6198,41 @@ msgstr "Sor 8" #. Resource IDs: (65535) msgid "Language:" -msgstr "" +msgstr "Nyelv:" -#. Resource IDs: (85) -msgid "Last Author" +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" msgstr "" -#. Resource IDs: (68) -msgid "Last Commit" +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" msgstr "" -#. Resource IDs: (86) -msgid "Last Modified" +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) +msgid "Last Author" +msgstr "" + +#. Resource IDs: (1076) +msgid "Last Commit" +msgstr "" + +#. Resource IDs: (1364) +msgid "Last Modified" +msgstr "" + +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Utoljára módosítva:" @@ -6140,7 +6240,11 @@ msgstr "Utoljára módosítva:" msgid "Last known &good:" msgstr "Utolsó &jó állapot:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6148,17 +6252,17 @@ msgstr "" msgid "Least active author:" msgstr "Legkevésbé aktív fejlesztő:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Bal oldali nézet:" @@ -6166,11 +6270,11 @@ msgstr "Bal oldali nézet:" msgid "Left image" msgstr "Bal oldali kép" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Vonaldiagram" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6184,12 +6288,12 @@ msgstr "Aktuális sor" msgid "Line differences" msgstr "Soreltérések" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "" @@ -6202,26 +6306,26 @@ msgstr "" msgid "Line:" msgstr "Sor:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Sor: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Kilistázza a súgótémákat\nSúgótémák" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6239,23 +6343,23 @@ msgstr "Képek betöltése" msgid "Load Putty &Key" msgstr "Putty &kulcs betöltése" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "" +msgstr "Módosítások betöltése\nA nézetek az új tartalommal frissülnek." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6263,13 +6367,13 @@ msgstr "" msgid "Local Branch" msgstr "Helyi ág" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Helyi állapot" @@ -6277,7 +6381,7 @@ msgstr "Helyi állapot" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6287,7 +6391,7 @@ msgstr "" msgid "Locator Bar" msgstr "Navigációs sáv" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Napló" @@ -6327,12 +6431,12 @@ msgstr "Megjegyzések (\"Változási napló\" ablakban)" msgid "Login:" msgstr "Bejelentkezés:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Legrégebbi verzió: %ld - Legújabb verzió: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6343,26 +6447,22 @@ msgstr "Legrégebbi verzió: %ld - Legújabb verzió: %ld - FŐ verzió: %ld" msgid "Lum" msgstr "Fény." -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" -msgstr "" +msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Levelező rendszer alkalmazáskiterjesztés (.DLL) érvénytelen." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6375,47 +6475,47 @@ msgstr "Keze&lés" msgid "Manage" msgstr "Kezelés" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Feloldottnak jelölés" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Megjelölés összehasonlításhoz" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Kis- és &nagybetű különbözik" @@ -6439,7 +6539,7 @@ msgstr "A &menük elején a legutóbb használt műveletek jelenjenek meg" msgid "Menu" msgstr "Menü" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Menüsor" @@ -6447,7 +6547,7 @@ msgstr "Menüsor" msgid "Menu s&hadows" msgstr "Menü &árnyékok" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Egyesítés" @@ -6455,34 +6555,34 @@ msgstr "Egyesítés" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Visszaintegrálás" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Egyesítve" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6490,22 +6590,22 @@ msgstr "" msgid "Merging" msgstr "Egyesítés" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Egyesítés ettől: %s, verzió %s, eddig: %s, verzó %s, ebbe: %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Az egyesítéshez különböző verzió vagy URL kell a \"Ettől:\" és \"Eddig:\" mezőkbe" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Verziók egyesítése %s, %s ezzel: %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Megjegyzés" @@ -6517,7 +6617,7 @@ msgstr "" msgid "Message part &expression:" msgstr "" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Megjegyzések" @@ -6525,11 +6625,11 @@ msgstr "Megjegyzések" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Saját" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Szalag - Kis méret" @@ -6541,7 +6641,11 @@ msgstr "" msgid "Misc" msgstr "Egyéb" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Vegyes" @@ -6549,35 +6653,35 @@ msgstr "Vegyes" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Módosítás dátuma" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Módosított" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "További" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "További gombok" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "További parancsok..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "További..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "További..." @@ -6597,41 +6701,41 @@ msgstr "&Lefelé mozgat" msgid "Move &Up" msgstr "&Felfelé mozgat" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Elem lefelé mozgatása" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Elem felfelé mozgatása" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Áthelyezés és átnevezés" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Változáslistába helyezés" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Áthelyezés/átnevezés" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Áthelyezés: %s új neve" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Visszaállítás előtt a lomtárba helyezi a módosított fájlokat." -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "%s áthelyezése" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Áthelyezés..." @@ -6639,11 +6743,11 @@ msgstr "Áthelyezés..." msgid "My file:" msgstr "Saját fájl:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "" @@ -6653,23 +6757,23 @@ msgstr "Név:" #. Resource IDs: (156) msgid "Navigate" -msgstr "" +msgstr "Navigálás" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" -msgstr "" +msgstr "Ugrás a nézet egy adott sorára\nUgrás sorra" #. Resource IDs: (17004) msgid "Navigation Pane Options" msgstr "Navigációs sáv beállításai" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Navigációs sáv beállításai..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Alábontott" @@ -6681,7 +6785,7 @@ msgstr "Hálózat" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Új" @@ -6690,43 +6794,43 @@ msgid "New &name:" msgstr "Új &név:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Új ág\\címke" +msgid "New Branch/Tag" +msgstr "Új ág/címke" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Új menü" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "%s új neve" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Új név:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6734,33 +6838,29 @@ msgstr "" msgid "Next" msgstr "Következő" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Következő oldal\nKövetkező oldal" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" -msgstr "" +msgstr "Következő konfliktus" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" -msgstr "" +msgstr "Következő eltérés" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" -msgstr "" - -#. Resource IDs: (73) -msgid "No" -msgstr "Nem" +msgstr "Következő soron belüli eltérés" #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6772,102 +6872,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nem adott meg értéket a parancshoz!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Nincsenek eltérések!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Nincs elérhető hibaüzenet." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nem történt hiba." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Nincsenek módosított fájlok vagy mappák. Így a TortoiseGit számára nincs mit visszaállítani." -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Nincs megjelenítendő fájl.\nVáltoztasd a lenti beállításokat a nem verziókezelt, kihagyott és/vagy nem változott fájlok megjelenítéséhez.\nA távoli változások megjelenítéséhez kattinst a \"Tároló ellenőrzése\" gombra." +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Nincsek módosított vagy hozzáadott fájlok az⏎\nutolsó commit óta. A TortoiseGit nem tud⏎\nsemmit tenni..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Nincsek változtatott vagy hozzáadott fájlok az⏎\nutolsó commit óta. A TortoiseGit nem tud⏎\nsemmit tenni...\nSzeretné megjeleníteni a verziókövetésen kivüli fájlokat?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Nincs elérhető grafikon" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "%s nem talált képkódolót." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Nincs helyesírás-ellenőrzés" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Nem gyorsítótárazza az állapotokat. Csak a verziókezelt mappák kapnak ikont, a fájlok nem." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Nincs szinonima" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6875,11 +6980,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Semelyik" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normál" @@ -6891,30 +6996,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nem lett az összes bejegyzés (vagy INI fájl) eltávolítva." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Nincs elég memória a művelet befejezéséhez." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Nincs elég memória!\nPróbáld meg csökkenteni a grafikon méretét, vagy a grafikon\nelemeinek összecsukásával, vagy a grafikon kicsinyítésével." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6922,7 +7027,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6941,26 +7046,26 @@ msgstr "Megjegyzés: a mappa nem verziókezelt elemeket (is) tartalmaz" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Megjegyzés" @@ -6968,7 +7073,7 @@ msgstr "Megjegyzés" msgid "Number Commits" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "%s szám" @@ -6981,7 +7086,7 @@ msgstr "Fejlesztők száma:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7053,41 +7158,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" -msgstr "" +msgstr "Office 2007 színek" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7095,15 +7200,15 @@ msgstr "" msgid "Older lines" msgstr "Régebbi sorok" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Egy vagy több fájlban konfliktusok találhatóak." @@ -7115,29 +7220,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Csak a fájlokat" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Csak (vesszővel elválasztott) számok\nmegengedettek!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Csak ezt a fájlt/mappát" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Megnyitás" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7147,51 +7252,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Megnyitás vágólapról" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Képfájl megnyitása..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Szülőmappa megnyitása" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Megnyitás ezzel..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Súgó megnyitása\nSúgó témakörök" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opció" @@ -7200,30 +7306,30 @@ msgid "Options" msgstr "Lehetőségek" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "&Eredeti méret" +msgid "Ori&ginal size\tS" +msgstr "&Eredeti méret\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Egyéb teendők nézete" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Többiek" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Nincs elég memória." @@ -7231,7 +7337,7 @@ msgstr "Nincs elég memória." msgid "Output Directory" msgstr "Célmappa" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7239,20 +7345,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "%u. oldal" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7263,15 +7373,15 @@ msgstr "%u. oldal\nOldalak: %u-%u.\n" msgid "Page :" msgstr "Oldal :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Paraméterek" @@ -7279,25 +7389,25 @@ msgstr "Paraméterek" msgid "Parameters:" msgstr "Paraméterek:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7309,39 +7419,39 @@ msgstr "" msgid "Password" msgstr "" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Jelszó:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" +msgstr "Beillesztés" + +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2751) +msgid "Paste &last commit message" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Beillesztési eszköz\nBeillesztés" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Fájlnév lista beillesztése" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "SVN úrvonal beillesztése a vágólapról egy mozgatás (kivágás) vagy másolás művelet eredményeként" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7357,32 +7467,32 @@ msgstr "Alkalmazá&s a kiválasztott elemre" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Alkalmazás minden fájlra" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Kiválasztott fájlokra alkalmazás" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Patch alkalmazása..." -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Útvonal" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "" @@ -7390,21 +7500,21 @@ msgstr "" msgid "Path:" msgstr "Elérési út:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Útvonalak" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Ceruza eszköz\nCeruza" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Szerzőség százaléka" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Százalékok" @@ -7412,24 +7522,24 @@ msgstr "Százalékok" msgid "Personalized Menus and Toolbars" msgstr "Személyre szabott menük és eszköztárak" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7439,56 +7549,56 @@ msgstr "Kép (metafile)\negy kép" msgid "Picture:" msgstr "Kép:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Kördiagram" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Add meg a futtatandó hook szkriptet!" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Add meg a szkript futási mappáját!" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Válaszd ki a hook típusát!" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Várj, megszakítás folyamatban..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Várj, amíg befejeződik a különbség-keresés..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Kérlek várj..." @@ -7504,11 +7614,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port :" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Beküldés utáni hook" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7516,23 +7626,23 @@ msgstr "" msgid "Pre&v Page" msgstr "&Előző oldal" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Beküldés előtti hook" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "" @@ -7544,11 +7654,11 @@ msgstr "&Nyomd meg az új gyorsbillentyűt:" msgid "Press &new shortcut key:" msgstr "&Nyomd meg az új gyorsbillentyűt:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Előnézet" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Patch-elt fájl előnézete" @@ -7560,51 +7670,51 @@ msgstr "Előnézet: " msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Előző oldal\nElőző oldal" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" -msgstr "" +msgstr "Előző konfliktus" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" -msgstr "" +msgstr "Előző eltérés" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" -msgstr "" +msgstr "Előző soron belüli eltérés" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Nyomtatás" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Dokumentum nyomtatása\n&Nyomtatás" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Nyomtatás fájlba" @@ -7612,7 +7722,7 @@ msgstr "Nyomtatás fájlba" msgid "Printer :" msgstr "Nyomtató :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Nyomtatási fájlok (*.prn)|*.prn|Minden fájl (*.*)|*.*||" @@ -7620,11 +7730,11 @@ msgstr "Nyomtatási fájlok (*.prn)|*.prn|Minden fájl (*.*)|*.*||" msgid "Printing" msgstr "Nyomtatás" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programok (*.exe)|*.exe|Minden fájl (*.*)|*.*||" @@ -7632,11 +7742,11 @@ msgstr "Programok (*.exe)|*.exe|Minden fájl (*.*)|*.*||" msgid "Progress" msgstr "Folyamatban" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Tulajdonság" @@ -7644,7 +7754,7 @@ msgstr "Tulajdonság" msgid "Property Page" msgstr "Tulajdonságok" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Szolgáltató" @@ -7676,15 +7786,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7692,19 +7802,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "" @@ -7720,11 +7830,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7732,22 +7842,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Kilép az alkalmazásból és megkérdezi, hogy elmentse-e a dokumentumokat\nKilépés" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7765,11 +7875,15 @@ msgstr "R&AM meghajtók" msgid "R&eset" msgstr "Alaph&elyzet" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "&Visszaállítás erre a verzióra" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7777,7 +7891,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7799,7 +7913,7 @@ msgstr "" msgid "Re&movable drives" msgstr "&Cserélhető meghajtók" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "&Átnevezés..." @@ -7815,15 +7929,15 @@ msgstr "Mindent alaphely&zetbe állít" msgid "Re&store defaults" msgstr "&Alapértelmezett" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Visszaállítás..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Olvasd el a \"Hétköznapi használat\" fejezetet a súgóban, mielőtt elakadnál..." @@ -7831,21 +7945,21 @@ msgstr "Olvasd el a \"Hétköznapi használat\" fejezetet a súgóban, mielőtt msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Legutóbbi" @@ -7857,21 +7971,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Nemrég módosított sorok" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Egyesítés nélkül" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7885,17 +7999,21 @@ msgstr "" msgid "Recursive" msgstr "Rekurzívan" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Megismétli az előzőleg visszavont műveletet\nIsmét" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Tálcára zsugorítja a programot" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7903,31 +8021,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Frissítés" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Frissítés folyamatban..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7939,7 +8057,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7958,7 +8076,7 @@ msgid "" "\\s : whitespaces" msgstr "RegEx szűrő:\r\n. : bármely karakter\r\nc+ : c karakter 1 vagy többször\r\nc* : c karakter 0 vagy többször\r\n^ : sor eleje\r\n$ : sor vége\r\n(szöveg){n} : szöveg n darabszor\r\n(abcd) : rész-kifejezés\r\n[aei0-9] : a,e,i és 0..9 karakterek\r\n[^aei0-9] : minden karakter, kivéve a,e,i és 0..9\r\n\r\n\\w : a-z,A-Z,0-9 és _ karakterek\r\n\\W : bármely nem alfenumerikus karakter\r\n\\d : számjegyek, 0-9\r\n\\s : láthatatlan karakterek (pl. szóköz, tabulátor, sortörés)" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "" @@ -7971,7 +8089,7 @@ msgstr "" msgid "Reload" msgstr "Újratöltés" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8005,19 +8123,19 @@ msgstr "" msgid "Remote Branch" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Távoli állapot" @@ -8029,12 +8147,12 @@ msgstr "" msgid "Remove" msgstr "Törlés" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "%ld elem törlése" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "%s törlése" @@ -8043,7 +8161,7 @@ msgstr "%s törlése" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8051,21 +8169,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "El&távolítás a kizárási listáról" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Eltávolítás a Gyorsindító eszköztárról" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Eltávolítás a változáslistáról" @@ -8077,7 +8195,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8085,11 +8203,11 @@ msgstr "" msgid "Removed" msgstr "Törölve" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Változáslistáról eltávolítva" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8097,7 +8215,7 @@ msgid "" "from the ignore list." msgstr "%s\nfájlmintá(k) eltávolítva\na kizárási listáról." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Eltávolít egy fájlt vagy egy kiterjesztést a kizárt elemek listájából" @@ -8105,11 +8223,11 @@ msgstr "Eltávolít egy fájlt vagy egy kiterjesztést a kizárt elemek listáj msgid "Rena&me..." msgstr "&Átnevezés..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Átnevezés" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "%s átnevezése" @@ -8118,20 +8236,20 @@ msgstr "%s átnevezése" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Átnevezés/áthelyezés" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Átnevez fájlokat/mappákat a verziókezelésen belül" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8141,7 +8259,7 @@ msgstr "Az utolsó utasítás megismétlése\nIsmétlés" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8155,12 +8273,12 @@ msgstr "" msgid "Replace:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Lecserélve" @@ -8184,11 +8302,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Felhasználónevet és jelszót igényel" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "&Visszaállítás" @@ -8200,25 +8318,25 @@ msgstr "Mindent &alaphelyzetbe állít" msgid "Reset Type" msgstr "&Visszaállítás" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Oszlopok visszaállítása" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Feloldás" @@ -8226,126 +8344,122 @@ msgstr "Feloldás" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Feloldás a saját verzió alapján" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Feloldás a másik verzió alapján" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Feloldva" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Feloldva:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Konfliktusok feloldása" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Alapértelmezett" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Előző méret" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Visszaállítva" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Ismét" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Visszaállítás" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Visszaállítás a %s verzióra" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Visszaállítva" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Minden az utolsó frissítés óta végzett módosítást visszaállít" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Visszavonja a verziókezeléshez hozzáadást" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Verzió" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "%d verzió" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "%s verzió" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Verzió grafikon" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8361,31 +8475,31 @@ msgstr "Verzió grafikon szűrő" msgid "Revision graph" msgstr "Verzió grafikon" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\nformázott szöveg" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Jobb oldali nézet:" @@ -8393,21 +8507,21 @@ msgstr "Jobb oldali nézet:" msgid "Right image" msgstr "Jobb oldali kép" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "%d / %d sor" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "%d-%d / %d sor" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "" @@ -8415,11 +8529,11 @@ msgstr "" msgid "S&elect..." msgstr "&Kiválasztás..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Gombok megjelenítése egy sorban" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Gombok megjelenítése két sorban" @@ -8427,15 +8541,23 @@ msgstr "&Gombok megjelenítése két sorban" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Gyorsindító eszköztár elhelyezése a szalag alatt" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatisztika" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8455,7 +8577,7 @@ msgstr "Az SMTP szerver azonosítást kér" msgid "SMTP Server:" msgstr "SMTP szerver:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8463,31 +8585,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8499,15 +8621,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8525,35 +8647,39 @@ msgstr "" msgid "Sample text:" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Mentés" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Mentés m&ásként..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Mentés m&ásként...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Mentés másként" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Fájl mentése" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8561,13 +8687,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8575,74 +8701,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Mentés mind\nMindkét fájl elmentve" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" -msgstr "" +msgstr "Mentés másként" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Mentés másként..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "" +msgstr "Mentés másként\nMegkérdezzük Önt, a fájl mentési helyéről" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Elmented %1 változásait?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Módosítások mentése." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Verzió mentése &ide..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8664,13 +8790,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8682,28 +8808,28 @@ msgstr "" msgid "Saved Data" msgstr "Elmentett adatok" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Ellenőríz" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Görgetés balra" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Görgetés jobbra" @@ -8711,7 +8837,7 @@ msgstr "Görgetés jobbra" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "&Megjegyzések keresése..." @@ -8723,20 +8849,20 @@ msgstr "" msgid "Search for:" msgstr "Keresés:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Megfelelőbb útvonal keresése..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Keresés megált %1-nél" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Mindent &kijelöl" @@ -8752,59 +8878,59 @@ msgstr "Helyzetérzékeny menü vála&sztása:" msgid "Select &window:" msgstr "Válassz &ablakot:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Szín választó eszköz\nSzín kiválasztása" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Válassz fájlt..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Válassz SSH klienst" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Válassz egy gombot." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Válassza ki az elemet amelyről a Súgót kéri" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Változáslista kijelölése" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Válssz diff programot" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Válassz mappát, amelyet ehhez a hibakövetőhöz szeretnél rendelni" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Válaszd ki a mappát, amelybe exportálni szeretnél.\nLehet, hogy szükséged lesz egy új mappa létrehozására." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Válaszd ki a mappát amin a szkriptet futtatni szeretnéd" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Válassz mappát ahová a kiválasztott fájlokat menteni szeretnéd" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Válaszd ki hook szkript fájlt" @@ -8812,20 +8938,20 @@ msgstr "Válaszd ki hook szkript fájlt" msgid "Select items automatically" msgstr "Elemek kiválasztása automatikusan" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Válassz egyesítő programot" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Válaszd ki az egyesítés célpontját" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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" -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8837,15 +8963,19 @@ msgid "" "checker used for commit messages." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Válssz diff fájl megjelenítőt" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8855,7 +8985,7 @@ msgstr "" msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8863,7 +8993,7 @@ msgstr "" msgid "Send" msgstr "Küldés" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Email küldése" @@ -8871,11 +9001,11 @@ msgstr "Email küldése" msgid "Send Mail after create" msgstr "Email küldése létrehozás után" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Nem sikerült a levelet küldeni." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Mail küldése..." @@ -8883,19 +9013,19 @@ msgstr "Mail küldése..." msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Tartalom küldése" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Küldés..." @@ -8915,28 +9045,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Beállítások szerkesztése..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Beállítások" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Beállítások - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Windows shell" @@ -8944,7 +9074,7 @@ msgstr "Windows shell" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Az ikonadatbázis sikeresen újraépült!" @@ -8956,7 +9086,7 @@ msgstr "" msgid "Short &date/time format in log messages" msgstr "&Rövid dátumformátum a naplóban" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Tulajdonság-lista rövidítése" @@ -8968,7 +9098,7 @@ msgstr "Megtekintés" msgid "Show &Accelerator for:" msgstr "Gyorsbillentyű &megjelenítése ehhez:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8976,15 +9106,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "&Változások mutatása" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "&Változási napló" @@ -8992,15 +9122,19 @@ msgstr "&Változási napló" msgid "Show &log..." msgstr "&Változási napló..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "&Ikonok és helyi menü csak az intézőben" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Megjelenítés a szalag felett" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Megjelenítés a szalag alatt" @@ -9008,35 +9142,35 @@ msgstr "Megjelenítés a szalag alatt" msgid "Show Environment Variables" msgstr "Környezeti változók megjelenítése" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Kevesebb gomb megjelenítése" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "FŐ verzió megjelenítése" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Soron belüli eltérések mutatása szavanként\nSoron belüli eltérések mutatása szavanként" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" -msgstr "" +msgstr "Soron belüli eltérések mutatása\nSoron belüli diff" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Több gomb megjelenítése" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Gyorsindító eszköztár elhelyezése a szalag felett" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Gyorsindító eszköztár elhelyezése a szalag alatt" @@ -9044,11 +9178,11 @@ msgstr "Gyorsindító eszköztár elhelyezése a szalag alatt" msgid "Show Screen&Tips on toolbars" msgstr "&Tippek megjelenítése az eszköztárakon" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" -msgstr "" +msgstr "Láthatatlan karakter megjelenítése" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Áttekintés a teljes grafikonról" @@ -9056,7 +9190,7 @@ msgstr "Áttekintés a teljes grafikonról" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9064,11 +9198,11 @@ msgstr "" msgid "Show author" msgstr "Szerző megjelenítése" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Változások mutatása &egyesített diffként" @@ -9088,15 +9222,15 @@ msgstr "Dátum megjelenítése" msgid "Show describe in log" msgstr "Mutasd a leírást a naplóban" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Mutasd a célmappát" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9108,11 +9242,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "Kizárt mappák megjelenítése \"normál\"-ként" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "&Teljes menü megjelenítése egy rövid késleltetés után" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Fájlnév megjelenítése" @@ -9128,7 +9266,7 @@ msgstr "&Kizárt fájlok mutatása" msgid "Show ignore local changes flagged files" msgstr "Mutasd a helyi változások kihagyására megjelölt fájlokat" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9136,90 +9274,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Sorszámo&k mutatása" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Napló megtekintése" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Mutasd a %s naplóját" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Mutasd az almodul naplóját" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Mutasd a mappa naplóját" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Napló megtekintése..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "A legrégibb változat legyen legfelül" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Aktuális sor megjelenítése/elrejtése\nAktuális sor megjelenítése/elrejtése" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Navigáviós sáv megjelenítése/elrejtése\nNavigáviós sáv megjelenítése/elrejtése" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Állapotsor megjelenítése/elrejtése\nÁllapotsor megjelenítése/elrejtése" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Eszköztár megjelenítése/elrejtése\nEszköztár megjelenítése/elrejtése" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Tulajdonságok megtekintése" @@ -9227,17 +9365,17 @@ msgstr "Tulajdonságok megtekintése" msgid "Show shortcut &keys in ScreenTips" msgstr "&Gyorsbillentyűk mutatása a tippekben" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" -msgstr "" +msgstr "A láthatatlan karakterek és az új sor jelek megjelenítése speciális karakterekkel\nLáthatatlan karakter megjelenítése" #. Resource IDs: (1314) msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9249,45 +9387,43 @@ msgstr "&Változatlan fájlok mutatása" msgid "Show un&versioned files" msgstr "&Nem verziókezelt fájlok mutatása" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Megjelenítés/Elrejtés" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Grafikus megjelenítése a másolásoknak/mellékágaknak/kiadásoknak" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Az összes megváltozott fájl mutatása az utolsó frissítés óta" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Információ megjelenítése a TortoiseGit-el kapcsolatban" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Megjeleníti az eseménynaplót az alapértelmezett szövegszerkesztőben." -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9299,28 +9435,28 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" -msgstr "" +msgstr "Ezüst stílus" #. Resource IDs: (1532) msgid "Since" msgstr "Óta" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Méret" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Kihagyás" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9328,23 +9464,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Kihagyva" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Hiányzó cél kihagyva" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9352,13 +9488,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9372,7 +9508,7 @@ msgstr "Rendezés beküldések száma szerint" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9382,49 +9518,53 @@ msgstr "Megadja, hogy a korábbi megjegyzések ablakban hány megjegyzés legyen msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Sortördelés" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Aktív ablak felosztása panelekre\nFelosztás" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Halmozott oszlopdiagram" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Halmozott vonaldiagram" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Alap" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Beküldés-kezdeti hook" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" @@ -9432,7 +9572,7 @@ msgstr "" msgid "Start registry editor" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9444,39 +9584,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statikus" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statisztika" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Állapot" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Státusz sor beállítása" @@ -9488,32 +9636,32 @@ msgstr "Állapotok és műveletek színei" msgid "Status cache" msgstr "Állapotok gyorsítótározása" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Csak az adott mappa állapotának gyorsítótárazása, az állapotok nem jelenhetnek meg rekurzívan." -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9521,15 +9669,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" -msgstr "" +msgstr "Stílus" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Tárgy" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Tárgy:" @@ -9537,7 +9685,7 @@ msgstr "Tárgy:" msgid "Submodule" msgstr "Almodul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9545,7 +9693,7 @@ msgstr "" msgid "Submodule Add" msgstr "Almodul hozzáadás" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9553,15 +9701,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9569,7 +9717,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9584,15 +9732,15 @@ msgstr "" msgid "Submodules" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Váltás" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "%s átváltása erre: %s, Verzió %s" @@ -9601,43 +9749,43 @@ msgstr "%s átváltása erre: %s, Verzió %s" msgid "Switch To" msgstr "Váltás" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Az előző ablakpanelre vált\nElőző panel" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Egy- és kétpaneles mód közötti váltás\nEgy- és kétpaneles mód közötti váltás" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Megcseréli a bal és a jobb oldal tartalmát\nBal és jobb oldal felcserélése" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "A következő dokumentumablakra ugrk" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "A következő ablakpanelre vált\nKövetkező panel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Az előző dokumentumablakra ugrk" @@ -9645,21 +9793,21 @@ msgstr "Az előző dokumentumablakra ugrk" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Felcseréli az összehasonlítás bal <-> jobb oldalát" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9669,23 +9817,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Szinkronizálás..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9695,13 +9843,13 @@ msgstr "A regisztrációs adatbázis bejegyzések és az INI fájl (ha volt) tö msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9715,7 +9863,7 @@ msgstr "Tab karakter helyettesítő" msgid "Tab size:" msgstr "Tab méret:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "" @@ -9723,16 +9871,16 @@ msgstr "" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Címkék" @@ -9740,11 +9888,11 @@ msgstr "Címkék" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Feladatok" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Feladatlista" @@ -9756,11 +9904,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Teszt" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9768,13 +9916,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9782,64 +9936,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "A darab mérete nem egyezik meg a hozzáadott/törölt sorok számával!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "A diffelés leállt egy hiba miatt:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "%s fájl nem létezik!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "%s fájl nem található a patch fájlban!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9848,15 +10016,15 @@ msgid "" "Do you want to remove the file?" msgstr "A(z) %s\nfájl üres.\nSzeretnéd törölni?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "A fájl túl nagy" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "A fájl túl nagy a megnyitáshoz." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9864,7 +10032,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "A(z) %s\nfájl már létezik! Felülírod?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9872,14 +10040,14 @@ msgid "" "is not a valid text file!" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "A(z) %s\nmappa nem verziókezelt fájl(oka)t és/vagy mappá(ka)t tartalmaz. Biztosan törlöd?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9888,78 +10056,78 @@ msgid "" "Would you like to create it first?" msgstr "A(z) %s\nmappa nem létezik.\nLétre akarod hozni?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "A hook szkript hibát jelzett:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "A képet nem lehet megjeleníteni." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Nem sikerült a hibakövető-szolgáltatót létrehozni. Ellenőrizd, hogy helyesen fel van-e telepítve!" -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "A hibakövető-szolgáltató nem tudta ellenőrizni a paramétereket" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "A sor, amely az új fájlt jelöli, a(z) %d. sorban kellene lennie!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Legfeljebb ennyi sort tart meg az eseménynapló.\nHa ennél több sor kerül bele, a legrégebbi bejegyzéset törölve lesznek!" -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "A művelet sikertelen." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "A \"/path\" és \"/pathfile\" paraméterek együtt nem használhatóak.\nCsak az egyiket add meg." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9969,7 +10137,7 @@ msgid "" "do not match!" msgstr "A patch réginek tűnik!\nA fájl %s. sora\nés a patch %s. sora\nnem egyezik meg!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9980,7 +10148,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Az útvonal/URL hibásnak tűnik Windows alatt!\nMegpróbálhatod, de valószínűleg hibát fogsz kapni később.\n\nEgy útvonal nem tartalmazhatja az alábbi karaktereket: <<>|\"?*: és nem lehetnek az alábbi eszköznevek:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\nBiztosan folytatod?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9991,36 +10159,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "A tároló sikeresen létrejött." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "A kiválasztott fájlban még van(nak) konfliktus(ok).\nBiztos hogy feloldottnak jelölöd?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10028,7 +10203,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10037,7 +10212,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10046,26 +10221,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Legfeljebb ennyi másodpercet tölt el a program a fájlok elemzésével.\r\nKisebb érték esetén hamarabb elérhetővé válik a szókiegészítés funkció,\r\nde lehetséges, hogy nem vizsgál meg minden fájlt." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "A két kiválasztott URL nem azonos gyökérből származik,\nígy a naplójuk megtekintése nem lehetséges!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10075,34 +10250,34 @@ msgstr "" msgid "Their file:" msgstr "Másik fájl:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Másik" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Nincs elérhető hibakövető-szolgáltató!" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10111,85 +10286,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Még vannak feloldatlan konfliktusok a(z) %d. sorban!\nEzeket célszerű feloldani a mentés előt.\nBiztos, hogy elmented a fájlt a konfliktusokkal együtt?\nHa az Igenre kattintasz, akkor a feloldást kézzel, egy másik programmal kell megtenned!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Néhány változás még nincs elmentve!\nMented a változásokat?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Szinonima szótár" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Az URL nem érvényes.\nEgy valódi URL-t adj meg." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Az útvonal érvénytelen!\nEgy útvonal nem tartalmazhatja az alábbi karaktereket: <<>|\"?*: és az alábbi eszközneveket:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Ezt a programot a hiányzó %s exporthoz van csatoltva a(z) %s fájlban. A számítógépen valószínűleg %s-nek egy inkompatibilis verziója található." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "A programnak a(z) %s fájlra van szüksége, amely nem található ezen a rendszeren." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Ezt a tulajdonságot csak a mappákhoz lehet használni, fájlokhoz nem." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Az alkalmazásban használt minden művelet nyoma elfog tűnni, és a menükben és az eszköztárakban a látható műveletek is alaphelyzetbe kerülnek. A testreszabott beállítások nem fognak elveszni. Folytatod?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10205,14 +10380,14 @@ msgstr "" msgid "To" msgstr "" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10224,13 +10399,13 @@ msgstr "" msgid "To:" msgstr "Eddig:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Váltás egy- és kétoldalas nézet között\nVáltás egy- és kétoldalas nézet között" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10242,11 +10417,11 @@ msgstr "Eszköztár" msgid "Toolbar Name" msgstr "Eszköztár neve" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Eszköztár beállításai" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Belső hiba az eszköztárban. Lépj kapcsolatba a program terjesztőjével." @@ -10262,16 +10437,16 @@ msgstr "Eszközök" msgid "Tools:" msgstr "Eszközök:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10281,20 +10456,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" @@ -10303,18 +10478,18 @@ msgstr "" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10330,7 +10505,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10338,7 +10513,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10352,16 +10527,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10370,18 +10545,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10420,11 +10595,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Sebesség: %s" @@ -10433,39 +10608,35 @@ msgstr "Sebesség: %s" msgid "Transparent &color..." msgstr "&Átlátszó szín..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" -msgstr "" +msgstr "Vágás jobbra" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Próbáld meg a \"Tisztítás\"-t! Ha nem működik, le kell kérned egy új munkapéldányt." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Próbáld újra" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Típus" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Típus:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10489,24 +10660,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Nem tölthető be a levelezőrendszer támogatás." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Parancsot nem sikerült végrehajtani mert foglalt a szerver." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Nem olvasható a %1 fájl, már más megnyitotta." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Nem lehet olvasni a csak írható tulajdonságot." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10514,91 +10685,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Nem lehet írni a csak olvasható tulajdonságot." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Nem írható a %1 fájl, már már megnyitotta vagy írásvédett." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Kijelölést megszüntet" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" -msgstr "" +msgstr "Visszavonás" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "%d művelet visszavonása" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Egy művelet visszavonása" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." -msgstr "" +msgstr "Hozzáadás visszavonása..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Visszavonja az utolsó műveletet\nVisszavonás" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" -msgstr "" +msgstr "Az utolsó módosítás visszavonása\nVisszavonás" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Váratlan fájlformátum." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Formázatlan szöveg\nszöveg, mindenféle formázás nélkül" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "FŐ verziók &egyesített diffje" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Ismeretlen mélység" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Névtelen" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Nem verziókezelt" @@ -10606,7 +10781,7 @@ msgstr "Nem verziókezelt" msgid "Unversioned files mark parent folder as modified" msgstr "Ha a mappa tartalmaz nem verziókezelt fájlokat, módosítottnak látszik" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "%s kivétele a verziókezelésből" @@ -10619,23 +10794,23 @@ msgstr "Fel" msgid "Update" msgstr "Frissítés" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Frissítve" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "ActiveX objektumok frissítése" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10647,29 +10822,25 @@ msgstr "&Alapértelmezett kép használata: " msgid "Use &one-pane view as default for 2-file diff" msgstr "&Egypaneles nézet az alapértelmezett" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Másik &szövegblokk használata" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" -msgstr "" +msgstr "'Saját' szövegblokk használata" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" -msgstr "" +msgstr "A 'Saját' majd a 'Másik' szövegblokk használata" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" -msgstr "" +msgstr "'Másik' szövegblokk használata" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" -msgstr "" - -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "" +msgstr "A 'Másik' majd a 'Saját' szövegblokk használata" #. Resource IDs: (1761) msgid "Use HTTP path component" @@ -10677,7 +10848,7 @@ msgstr "" #. Resource IDs: (1066) msgid "Use Ribbons" -msgstr "" +msgstr "Menüszalag használata" #. Resource IDs: (1500) msgid "Use Task Dialog" @@ -10691,15 +10862,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "&Egyesített diff használata a vágólapról" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10709,7 +10880,7 @@ msgstr "A bal oldali fájl tartalmát használja\nBal oldali fájl használata" msgid "Use block from left before right" msgstr "Bal oldali szövegblokk használata a jobb oldali előtt" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10719,27 +10890,27 @@ msgstr "A bal oldali nézetben található szövegblokk használata a jobb oldal msgid "Use block from right before left" msgstr "Jobb oldali szövegblokk használata a bal oldali előtt" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "A jobb oldali nézetben található szövegblokk használata a bal oldali nézetben található előtt\nJobb oldali szövegblokk használata a bal oldali előtt" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Mindkét szövegmezőt használja (ezt a mezőt először)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Mindkét szövegmezőt használja (ezt a mezőt utoljára)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" -msgstr "" +msgstr "Bal oldali blokk használata" #. Resource IDs: (32856) msgid "Use left file" @@ -10753,15 +10924,15 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Lomtár használata visszaállításkor" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Regex használata" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" -msgstr "" +msgstr "Jobb oldali blokk használata" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "" @@ -10769,61 +10940,61 @@ msgstr "" msgid "Use system locale for date/time" msgstr "Rendszerbeállítás használata dátumhoz/időhőz" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "\"&Saját\" szövegblokk használata" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "\"&Másik\" szövegblokk használata" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "\"S&aját\" szövegblokk használata a \"másik\" előtt" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "\"Saját\" szövegblokk használata a \"másik\" előtt\nElőször a \"saját\" szövegblokk használata, utána a \"másik\"" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "\"Saját\" szövegblokk használata\n\"Saját\" szövegblokk használata" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "&\"Másik\" szövegblokk használata a \"saját\" előtt" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "\"Másik\" szövegblokk használata a \"saját\" előtt\nElőször a \"másik\" szövegblokk használata, utána a \"saját\"" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "\"Másik\" szövegblokk használata\n \"Másik\" szövegblokk használata" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Bal oldali szövegblokk használata\nBal oldali szövegblokk használata" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "&Ezt a szövegblokkot használja" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10831,7 +11002,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10843,19 +11014,19 @@ msgstr "" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Ezt az egész &fájlt használja" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" -msgstr "" +msgstr "Ennek a blokknak a használata bal oldalon" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Az egész másik fájl&t használja" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10871,11 +11042,11 @@ msgstr "" msgid "User Name:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Felhasználói megszakítás" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10885,11 +11056,11 @@ msgstr "" msgid "User&name:" msgstr "Felhasználó&név:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Felhasználónév:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10908,7 +11079,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Érték" @@ -10916,24 +11087,24 @@ msgstr "Érték" msgid "Version" msgstr "Verzió" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Verzió %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10941,11 +11112,11 @@ msgstr "" msgid "Version Information" msgstr "Verzió információ" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Verzió:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Verziókezelt" @@ -10955,25 +11126,29 @@ msgstr "" #. Resource IDs: (156) msgid "View" -msgstr "" +msgstr "Nézet" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Fájl/mappa megtekintése a &webes megjelenítőben" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "" @@ -10985,11 +11160,11 @@ msgstr "" msgid "Visit our website" msgstr "Látogasd meg a honlapunkat" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10998,9 +11173,9 @@ msgid "" "WARNING:\r\n" "Only change these settings if you are absolutely sure what you are doing!\r\n" "To set the values to their default, delete the value text." -msgstr "" +msgstr "FIGYELMEZTETÉS:\nCsak akkor változtassa meg ezeket a beállításokat, ha teljesen biztos abban amit csinál!\nAz alapérték visszaállításához, törölje a szöveget az érték mezőből." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Várakozás" @@ -11008,7 +11183,7 @@ msgstr "Várakozás" msgid "Wait for the script to finish" msgstr "Várja meg, amíg a szkript lefut" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11016,15 +11191,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Figyelem" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Figyelem!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11032,7 +11207,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "" @@ -11040,56 +11215,56 @@ msgstr "" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Ha be van jelölve, a beküldés ablakban automatikusan ki lesznek jelölve a verziókezelt fájlok" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11099,15 +11274,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Láthatatlan karakterek" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Az ablak helyzete" @@ -11115,15 +11290,15 @@ msgstr "Az ablak helyzete" msgid "Windows" msgstr "Ablakok" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11167,11 +11342,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11179,29 +11354,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" -msgstr "" +msgstr "Hosszú sorok tördelése" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" -msgstr "" +msgstr "Hosszú sorok tördelése a nézet jobb szegélyéhez\nHosszú sorok tördelése" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Igen" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Igen, mindet" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "A legfrissebb verzió van feltelepítve" @@ -11211,51 +11382,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Csak (%d x %d) méretű bitképet lehet beilleszteni!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Legfeljebb %d eszköztárat hozhatsz létre!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Ezt a tulajdonságot csak fájlokra lehet alkalmazni, mappákra nem!\nHa mappában található fájlokra szeretnéd alkalmazni,\nakkor jelöld be a \"rekurzívan\" jelölőnégyzetet." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Módosítottad a tulajdonságokat, de nem mentetted őket.\nEl akarod menteni őket most?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11263,67 +11434,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "%d elemet választott ki a változások megtekintésére.\nValamennyi elemhez a változáskövető új példánya fog megnyílni.\nBiztosan szeretné az összeset egyszerre megtekinteni?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Nem írtál be az ügy-számot!\nÜgy-szám nélkül akarod beküldeni a változásokat?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Legfeljebb %d eszközt definiálhatsz." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Üzenet megadása kötelező" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "A beállítások érvénybe léptetéséhez újra kell indítani a számítógépet." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Egy nem verziókezelt fájlt választottál.\nA beküldéskor ez a fájl is verziókezelés alá lesz véve." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Írj be egy szöveget!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Válassz ki egy képet!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Megváltoztattad az ikonokat %s stílusúról %s stílusúra.\nA változás érvénybe léptetéséhez újra kell indítani a számítógépet, vagy ki és be kell jelentkezni!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11333,7 +11504,7 @@ msgstr "Az előzőleg beírt megjegyzések el lettek mentve.\nKattints ide, ha msgid "Your version is:" msgstr "A te verziód:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "A te verziód: %d.%d.%d.%d" @@ -11343,10 +11514,10 @@ msgid "Zip File" msgstr "Zip fájl" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Kicsinyítés" +msgid "Zoo&m out\t-" +msgstr "&Kicsinyítés\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Nagyítás" @@ -11358,80 +11529,80 @@ msgstr "&Nagyítás" msgid "Zoom &Out" msgstr "&Kicsinyítés" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Tényleges méret" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Nagyítás\nNagyítás" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Kicsinyítés\nKicsinyítés" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "&Nagyítás" +msgid "Zoom i&n\t+" +msgstr "&Nagyítás\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Nagyítás" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Kicsinyítés" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Legjobb kitöltés" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Legjobb kitöltés (magasság szerint)" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Legjobb kitöltés (szélesség szerint)" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Alapértelmezett]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Nincs felelőse]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" érvénytelen." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11445,7 +11616,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "hozzáadva" @@ -11453,7 +11624,7 @@ msgstr "hozzáadva" msgid "added files" msgstr "hozzáadva" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "egy névtelen fájl" @@ -11461,14 +11632,19 @@ msgstr "egy névtelen fájl" msgid "and support the developers" msgstr "és támogasd a fejlesztőket" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "fejlesztő" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11501,30 +11677,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "beküldések" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "konfliktusos" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "másolva innen:\r\n%s - %ld verzió" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "nap" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "törölve" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11536,7 +11712,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11545,16 +11721,16 @@ msgid "" "%s" msgstr "%s\nexportálva ide:\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "külső" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "kizárva" @@ -11562,15 +11738,15 @@ msgstr "kizárva" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "befejezetlen" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "elemet helyben megtartja" @@ -11578,7 +11754,7 @@ msgstr "elemet helyben megtartja" msgid "keep the file lists in English" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11587,7 +11763,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11602,11 +11778,11 @@ msgstr "" msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "egyesítve" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "hiányzik" @@ -11614,7 +11790,7 @@ msgstr "hiányzik" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "módosítva" @@ -11622,7 +11798,7 @@ msgstr "módosítva" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "hónap" @@ -11630,40 +11806,44 @@ msgstr "hónap" msgid "new branch" msgstr "új ág" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nem" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "ennek a parancsnak nincs leírása" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "nem verziókezelt" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normál" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "akadályozva" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "%1-en" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "képpontok" @@ -11671,11 +11851,11 @@ msgstr "képpontok" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "negyedév" @@ -11683,35 +11863,35 @@ msgstr "negyedév" msgid "renamed" msgstr "átnevezve" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "lecserléve" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "Útvonal ellenőrzése:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "átváltva:\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "%1-hez" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "%s-be" @@ -11720,35 +11900,35 @@ msgstr "%s-be" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "hét" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "év" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "igen" @@ -11758,4 +11938,4 @@ msgstr "{BugTraq}" #. Resource IDs: (65535) msgid "|" -msgstr "" +msgstr "|" diff --git a/Languages/Tortoise_id.po b/Languages/Tortoise_id.po index c982b1955..f7adb792e 100644 --- a/Languages/Tortoise_id.po +++ b/Languages/Tortoise_id.po @@ -6,19 +6,21 @@ # Translators: # andreas88 , 2011 # Chandra Utama , 2011-2012 +# Chandra Utama , 2011-2012 # Yauri , 2013 # Endra Granasamsa , 2011,2013 # Heri Zhang , 2011 # Lübbe TortoiseSVN , 2011 # omixen , 2011 +# Sven Strickroth , 2015 # uring , 2011 # Yauri , 2013 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/tortoisegit/language/id/)\n" "MIME-Version: 1.0\n" @@ -27,7 +29,7 @@ msgstr "" "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -49,138 +51,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# Pengarang ditampilkan secara terpisah:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "" +msgstr "%.2f MiB berhasil dipindahkan" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 mengandung obyek yang tidak diharapkan" -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 mengandung path yang tidak benar." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 mengandung skema yang tidak benar." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 mempunyai format yang buruk." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 tidak ditemukan." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! hari yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! hari yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! jam yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! jam yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! menit yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! bulan yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! bulan yang lalu" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! detik yang lalu" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! detik yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! minggu yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! minggu yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! tahun yang lalu" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! tahun yang lalu" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! menit yang lalu" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" -msgstr "" +msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nLanjutkan menjalankan script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -188,52 +190,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nTidak dapat menemukan file ini.\nSilahkan verifikasi path dan nama file." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes telah ditransfer" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "%I64d KiB ditransfer" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d files terpilih, %d total file" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d pengarang paling aktif dengan paling sedikit %d commits setiap (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -241,78 +243,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nklik untuk beralih alpha\nklik dua kali untuk beralih alpha secara otomatis" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld menit and %ld detik" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld dari %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - pada revisi: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s : [Dipulihkan]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s dalam %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, pada %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Ekspor (%d) dari %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Ekspor dari %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" -msgstr "%s⏎\n%s" +msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nAnda tetap ingin menghapusnya?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -328,6 +330,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Batalkan" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "" @@ -356,15 +362,15 @@ msgstr "" msgid "&Add New/Save" msgstr "&Tambah Baru/Simpan" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Tambah atau Hapus Tombol" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Tambah..." @@ -404,7 +410,7 @@ msgstr "&Tugaskan" msgid "&Associate double-click event with:" msgstr "&Hubungkan event double-klik dengan:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Sembunyi Otomatis" @@ -420,15 +426,15 @@ msgstr "" msgid "&Backup original file" msgstr "&Cadangkan berkas asli" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Salahkan perubahan" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Salahkan revisi" @@ -438,21 +444,21 @@ msgstr "&Biru:" #. Resource IDs: (65535) msgid "&Border:" -msgstr "" +msgstr "&Perbatasan" #. Resource IDs: (1512) msgid "&Branch" -msgstr "" +msgstr "Ca&bang" #. Resource IDs: (4566) msgid "&Branch:" -msgstr "" +msgstr "Ca&bang:" #. Resource IDs: (1382) msgid "&Browse Dir" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Jelajahi repositori" @@ -488,7 +494,7 @@ msgstr "&Kategori:" msgid "&Choose commands from:" msgstr "&Pilih perintah dari:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Membersihkan..." @@ -512,31 +518,35 @@ msgstr "&Tutup Jendela" msgid "&Command:" msgstr "&Perintah:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" -msgstr "" +msgstr "&Komit" #. Resource IDs: (355) msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Commit..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Bandingkan revisi" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Salin" @@ -556,11 +566,11 @@ msgstr "&Custom" msgid "&Default" msgstr "&Default" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Hapus" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Hapus (pertahankan lokal)" @@ -568,7 +578,7 @@ msgstr "&Hapus (pertahankan lokal)" msgid "&Delete Filter" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "" @@ -580,11 +590,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Beda" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Beda dengan versi sebelumnya" @@ -596,7 +606,7 @@ msgstr "" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "" @@ -604,7 +614,7 @@ msgstr "" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Pengaitan" @@ -612,11 +622,15 @@ msgstr "&Pengaitan" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "" @@ -624,11 +638,11 @@ msgstr "" msgid "&Edit" msgstr "&Edit" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "" @@ -636,7 +650,7 @@ msgstr "" msgid "&Edit Filter" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Edit konflik" @@ -661,10 +675,10 @@ msgid "&Enable edit" msgstr "" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Ekspor yang dipilih ke..." @@ -676,27 +690,27 @@ msgstr "&Eksternal" msgid "&File" msgstr "&File" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Cari" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Fit gambar di jendela" +msgid "&Fit images in window\tF" +msgstr "&Fit gambar di jendela\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Pemacu tetap" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Mengapung" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -708,7 +722,7 @@ msgstr "&Font untuk pesan log:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -728,7 +742,7 @@ msgstr "" msgid "&Go to\tCtrl+G" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -740,7 +754,7 @@ msgstr "&Hijau:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Bantuan" @@ -748,7 +762,7 @@ msgstr "&Bantuan" msgid "&Help Topics" msgstr "&Topik Bantuan" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Sembunyikan" @@ -756,11 +770,11 @@ msgstr "&Sembunyikan" msgid "&Icon Set:" msgstr "&Set Ikon:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Abaikan %d item menurut nama" @@ -774,14 +788,14 @@ msgid "&Image" msgstr "&Gambar" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informasi gambar" +msgid "&Image info\tI" +msgstr "&Informasi gambar\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Gambar saja" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Impor..." @@ -793,7 +807,7 @@ msgstr "&Direktori awal:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -805,11 +819,11 @@ msgstr "&Lompat ke perbedaan pertama saat pengambilan" msgid "&Keep CR" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -831,13 +845,13 @@ msgstr "&Batasi pencarian ke baris yang diubah" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Batas:" #. Resource IDs: (1078) msgid "&Line number" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "" @@ -854,7 +868,7 @@ msgstr "&Tampilan Daftar" msgid "&Local Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -878,11 +892,11 @@ msgstr "&Animasi Menu:" msgid "&Menu contents:" msgstr "&Isi menu:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Gabung" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Gabung..." @@ -932,12 +946,16 @@ msgstr "&Baru..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Berikutnya >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Halaman Berikutnya" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Tanpa event double-klik" @@ -954,11 +972,11 @@ msgstr "" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Satu Halaman" @@ -966,19 +984,15 @@ msgstr "&Satu Halaman" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Buka" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -991,18 +1005,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Gambar lapisan" +msgid "&Overlay images\tO" +msgstr "&Gambar lapisan\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Password:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Paste" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1010,7 +1024,7 @@ msgstr "" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Print Preview" @@ -1018,11 +1032,15 @@ msgstr "&Print Preview" msgid "&Print..." msgstr "&Print..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Print...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1030,10 +1048,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Pesan Terkini" @@ -1046,7 +1068,7 @@ msgstr "" msgid "&Red:" msgstr "&Merah:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Redo" @@ -1062,7 +1084,7 @@ msgstr "&Refresh" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1070,7 +1092,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1078,7 +1100,7 @@ msgstr "" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Hapus" @@ -1090,7 +1112,7 @@ msgstr "" msgid "&Replace" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Penjelajah-repo" @@ -1098,7 +1120,7 @@ msgstr "&Penjelajah-repo" msgid "&Reset" msgstr "&Reset" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Reset Toolbar" @@ -1114,23 +1136,27 @@ msgstr "&Reset data penggunaan saya" msgid "&Reset to Default" msgstr "&Reset ke Default" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1142,7 +1168,7 @@ msgstr "&Klien SSH:" msgid "&Saturation:" msgstr "&Saturasi" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Simpan" @@ -1150,15 +1176,19 @@ msgstr "&Simpan" msgid "&Save authentication" msgstr "&Simpan otentikasi" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Simpan grafik sebagai..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Simpan list file terpilih ke..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Simpan\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1166,7 +1196,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Pengaturan" @@ -1186,7 +1216,7 @@ msgstr "&Tampilkan label teks" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "" @@ -1194,7 +1224,7 @@ msgstr "" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1206,7 +1236,7 @@ msgstr "" msgid "&Start Group" msgstr "&Grup Awal" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1226,7 +1256,7 @@ msgstr "&Tampilan Simbol" msgid "&Tab size:" msgstr "&Ukuran Tab:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Dokumen Bertab" @@ -1234,7 +1264,7 @@ msgstr "&Dokumen Bertab" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Tag" @@ -1270,7 +1300,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Toolbars:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1282,7 +1312,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dua Halaman" @@ -1290,15 +1324,15 @@ msgstr "&Dua Halaman" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Undo" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Unified diff" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1310,7 +1344,7 @@ msgstr "&Drive tak dikenal" msgid "&Up" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Update item ke revisi" @@ -1322,11 +1356,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Gunakan pelengkapan otomatis untuk path berkas dan kata kunci" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Nama pengguna:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Lihat" @@ -1334,7 +1368,7 @@ msgstr "&Lihat" msgid "&View:" msgstr "&Lihat:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1350,6 +1384,10 @@ msgstr "&Seluruh kata" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -1358,46 +1396,46 @@ msgstr "" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(tidak ada list perubahan)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(tanpa nomor baris)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(tanpa nilai)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(tidak ditemukan)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(tak diketahui)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "" @@ -1405,13 +1443,14 @@ msgstr "" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1419,7 +1458,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1435,7 +1474,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1449,33 +1488,33 @@ msgstr "<.....>" #. Resource IDs: (65535) msgid "<<" -msgstr "" +msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1484,66 +1523,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit adalah ekstensi shell.\nItu berarti TortoiseGit terintegrasi pada Windows explorer.\nUntuk menggunakan TortoiseGit silahkan buka explorer dengan klik kanan pada folder yang anda inginkan untuk menampilkan menu dimana anda akan menemukan seluruh perintah TortoiseGit.\nDan baca instruksi!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1551,7 +1590,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1563,71 +1602,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Daftar path yang dipisahkan oleh baris baru di mana tiada konteks menu ditampilkan.\nJika Anda menambahkan karakter '*' di akhir path, maka semua berkas dan subdir di dalam path itu disertakan juga.\nDaftar kosong akan mengizinkan lapisan pada semua path." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Sumber yang dibutuhkan tidak tersedia." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Program peninjau untuk berkas-berkas GNU diff (berkas tambalan)\r\nJika Anda tidak mempunyainya gunakan NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "A&bout" @@ -1643,23 +1682,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Batalkan" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "Batalkan &Gabung" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Tentang" @@ -1679,12 +1718,12 @@ msgstr "" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Akses ke %1 ditolak." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Action" @@ -1692,26 +1731,26 @@ msgstr "Action" msgid "Action log" msgstr "Action log" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Aksi" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Aktifkan Daftar Tugas" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Berkas Aktif" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Objek ActiveX tidak dapat disimpan saat keluar Windows!\nBuang semua perubahan pada %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Tambah" @@ -1719,7 +1758,7 @@ msgstr "Tambah" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Tambah '%s' ke kamus" @@ -1732,15 +1771,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Tambah ekstensi khusus program diff" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Tambah ekstensi khusus program merge" @@ -1748,15 +1787,15 @@ msgstr "Tambah ekstensi khusus program merge" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Tambah ke &ignore list" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Tambahkan ke Bilah Alat Akses Cepat" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Tambah..." @@ -1764,11 +1803,11 @@ msgstr "Tambah..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Tambah/Edit Ekstensi Spesifik Program Diff/Merge" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Ditambahkan" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1776,25 +1815,25 @@ msgid "" "to the ignore list." msgstr "Menambah pola berkas\n%s\nke daftar abaikan." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Menambahkan" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Menambah berkas pilihan atau topeng berkas ke daftar 'abaikan'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Sesuaikan seting\nSeting" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Lanjutan" @@ -1802,43 +1841,43 @@ msgstr "Lanjutan" msgid "Advanced Diff/Merge Settings" msgstr "Seting Lanjutan Diff/Merge" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Seting diff lanjutan" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Seting merge lanjutan" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Semua" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Semua Perintah" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Semua Berkas (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Semua Berkas (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1846,47 +1885,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Semua perubahan Anda akan hilang! Apakah Anda ingin untuk menset ulang semua bilah alat dan menu?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Semua perubahan Anda akan hilang! Apakah Anda ingin untuk menset ulang semua penugasan papan ketik?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Semua perubahan Anda akan hilang! Apakah Anda ingin untuk menset ulang menu '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Semua perubahan Anda akan hilang! Apakah Anda ingin untuk menset ulang bilah alat '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1902,11 +1941,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Selalu gunakan pengaturan lokal sistem untuk menampilkan waktu dan tanggal" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1914,12 +1953,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1930,7 +1969,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1943,34 +1982,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Sebuah kendali berkas yang tidak benar dikaitkan dengan %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Kesalahan tidak dikenal terjadi." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Kesalahan tidak dikenal terjadi saat mengakses %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Tipe baris tidak dikenal ditemukan dalam baris %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "" @@ -1982,11 +2021,11 @@ msgstr "Menu Bingkai Aplikasi" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Terapkan Patch..." @@ -1994,7 +2033,7 @@ msgstr "Terapkan Patch..." msgid "Apply Patches" msgstr "Terapkan Patch" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -2002,7 +2041,7 @@ msgstr "" msgid "Apply unified diff" msgstr "Terapkan unified diff" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "" @@ -2010,39 +2049,39 @@ msgstr "" msgid "Arabic" msgstr "" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Anda yakin ingin menandai berkas berkonflik sebagai terselesaikan?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Apakah anda yakin ingin me-revert %d item? Anda akan kehilangan semua perubahan sejak update terakhir!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "&Atur vertikal" +msgid "Arrange &vertical\tV" +msgstr "Atur &vertikal\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Ditugaskan ke daftar perubahan '%s'" @@ -2051,11 +2090,11 @@ msgstr "Ditugaskan ke daftar perubahan '%s'" msgid "Assigned to:" msgstr "Ditugaskan ke:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2067,34 +2106,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Pada revisi: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Percobaan operasi yang tidak didukung." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Percobaan dibuat untuk mengakses %1 melampaui akhirnya." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Percobaan untuk membaca dari penulisan %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Percobaan dibuat untuk menulis ke pembacaan %1." @@ -2111,11 +2150,11 @@ msgstr "Otentikasi" msgid "Authentication data" msgstr "Data otentikasi" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Pengarang" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2123,7 +2162,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Pengarang:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Pengarang" @@ -2143,37 +2182,37 @@ msgstr "" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "" +msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Sembunyi Otomatis" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Sembunyikan Otomatis Semua" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Otomatis-tutup jika tidak ada konflik" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Otomatis-tutup jika tidak ada kesalahan" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Otomatis-tutup jika tidak ada penggabungan, penambahan atau penghapusan." -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2187,7 +2226,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Otomatis" @@ -2197,7 +2236,7 @@ msgstr "Otomatis mengecek versi terbaru setiap minggu" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Penguji Teks-Otomatis" #. Resource IDs: (1157) msgid "Average" @@ -2207,19 +2246,19 @@ msgstr "Rata-rata" msgid "B&rowse..." msgstr "B&rowse..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Kembali" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Tampilan Belakang" #. Resource IDs: (65535) msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Bilah Grafik" @@ -2239,7 +2278,7 @@ msgstr "Basis berkas:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2251,45 +2290,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\nsebuah bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Salahkan" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Menyalahkan setiap baris dari berkas pada pembuat" @@ -2297,26 +2336,30 @@ msgstr "Menyalahkan setiap baris dari berkas pada pembuat" msgid "Blend alpha" msgstr "Campuran alpha" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg dan /logmsgfile sama-sama ditentukan!\nHanya salah satu yang boleh ditentukan." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Kedua path ke file patch dan path target haruslah path absolut!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2328,30 +2371,30 @@ msgstr "&Jelajah..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Cabang" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2363,11 +2406,11 @@ msgstr "Cabang:" msgid "Bro&wse" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Browse untuk program diff eksternal" @@ -2379,25 +2422,25 @@ msgstr "" msgid "Browse..." msgstr "Browse..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "&Tanda ID-Bug:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-IDs" #. Resource IDs: (65535) msgid "BugTraq" -msgstr "" +msgstr "BugTraq" #. Resource IDs: (327) msgid "Bugtraq Regex Tester - TortoiseGit" @@ -2407,7 +2450,7 @@ msgstr "" msgid "Button Appearance" msgstr "Penampilan Tombol" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2423,7 +2466,7 @@ msgstr "&Periksa sekarang" msgid "C&ommands:" msgstr "&Perintah:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "&Buat cabang/tag dari revisi" @@ -2431,17 +2474,17 @@ msgstr "&Buat cabang/tag dari revisi" msgid "C&urrent Keys:" msgstr "&Kunci Sekarang:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Potong" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" #. Resource IDs: (65535) msgid "CC:" -msgstr "" +msgstr "CC:" #. Resource IDs: (1741) msgid "Calculate" @@ -2451,11 +2494,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Dapat mengeklik ganda dalam daftar log untuk membandingkan dengan revisi sebelumnya" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Tidak dapat mengaktifkan sebuah objek ActiveX statis" -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2464,80 +2507,80 @@ msgid "" "%s" msgstr "Tidak dapat mengkopi\n%s\nke\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Tidak dapat menyalin gambar bitmap ke papan jepit!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Tidak dapat membuat gambar baru!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Menu tidak dapat diubah!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Tidak dapat menempelkan gambar bitmap dari papan jepit!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Batal" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Batal\nJangan alihkan pandangan" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Batal\nSimpan berkas kosong" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Batal\nSelesaikan konflik terlebih dulu." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Tidak bisa menampilkan diff karena ketidakkonsistenan baris baru dalam berkas." @@ -2549,9 +2592,9 @@ msgstr "&Berbanjar" msgid "Cascaded context menu" msgstr "Menu konteks dijajarkan" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Kasus-sensitif" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2573,33 +2616,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Ubah posisi jendela" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Ubah ukuran jendela" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2607,38 +2650,38 @@ msgstr "" msgid "Changed Files" msgstr "Berkas yang Diubah" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Perubahan file antara %s, %s dan %s, %s " -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Berkas yang diubah: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Daftar perubahan %s dipindahkan" @@ -2647,15 +2690,15 @@ msgstr "Daftar perubahan %s dipindahkan" msgid "Changes made (double-click on file for diff):" msgstr "Perubahan dibuat (klik-ganda pada berkas untuk diff):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Posisi karakter yang akan ditampilkan dalam commit teksbox:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Pilih" @@ -2667,31 +2710,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Periksa Pemutakhiran..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Periksa modi&fikasi" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Periksa path dan/atau URL yang sudah anda masukan." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Periksa untuk menggunakan tampilan format tanggal dan waktu pendek dalam pesan log" @@ -2699,31 +2742,31 @@ msgstr "Periksa untuk menggunakan tampilan format tanggal dan waktu pendek dalam msgid "Check:" msgstr "Pilih:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Checkout" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2731,11 +2774,11 @@ msgstr "" msgid "Chinese" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2747,78 +2790,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Membersihkan" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Membersihkan." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Pembersihan gagal untuk memroses path berikut:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Pembersihan berhasil memroses path berikut:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Bersihkan" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Alat Pembersih\nBersihkan" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Bersihkan %ld nama pengguna/kata sandi, %ld sertifikat ssl dan %ld nama pengguna" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Bersihkan log di tembolok dari %ld repositori" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Membersihkan otentikasi yang disimpan.\r\nAnda harus memasukkan nama pengguna/kata sandi Anda lagi untuk semua repositori." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Membersihkan besar dan posisi yang disimpan dari %ld dialog" @@ -2827,7 +2870,7 @@ msgstr "Membersihkan besar dan posisi yang disimpan dari %ld dialog" msgid "Click here to go to the website" msgstr "Klik disini untuk pergi ke situs web" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Klik disini untuk memilih pesan terakhir yang diketik " @@ -2843,17 +2886,17 @@ msgid "" "extension" msgstr "Klik pada \"Lanjutan\" untuk menetapkan program merge alternatif yang didasarkan pada ekstensi berkas" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Clipboard" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2861,7 +2904,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Klon Repository Yang Ada" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "" @@ -2869,49 +2912,49 @@ msgstr "" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Klon..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Tutup" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Tutup Layar Penuh" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Tutup Pratilik Cetak\n&Tutup" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Tutup secara manual" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Tutup jendela aktif dan tanya untuk menyimpan dokumen" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2937,7 +2980,7 @@ msgstr "Warna:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2945,11 +2988,11 @@ msgstr "" msgid "Comman&ds:" msgstr "Peri&ntah:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Perintah" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Baris Perintah" @@ -2957,7 +3000,7 @@ msgstr "Baris Perintah" msgid "Command Line To Execute:" msgstr "Baris Perintah Untuk Dijalankan:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Perintah gagal." @@ -2965,41 +3008,41 @@ msgstr "Perintah gagal." msgid "Commands" msgstr "Perintah-Perintah" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Komit" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "" @@ -3007,7 +3050,7 @@ msgstr "" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3015,19 +3058,19 @@ msgstr "" msgid "Commit to:" msgstr "Komit ke:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Komit..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Mengkomit dengan pembuat" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Mengkomit dengan tanggal" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Mengkomit setiap %s" @@ -3036,15 +3079,15 @@ msgstr "Mengkomit setiap %s" msgid "Commits each week:" msgstr "Mengkomit setiap minggu:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Mengkomit perubahan anda ke repositori" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3056,52 +3099,52 @@ msgstr "Mengkomit folder tak berversi tidak akan menambahkan item-item anaknya s msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Bandingkan revisi &HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Membandingkan dua berkas" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Bandingkan spasi putih" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Bandingkan dengan b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Bandingkan dengan revisi sebelumnya" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Membandingkan semua spasi putih ketika diffing \nBandingkan spasi putih" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Membandingkan berkas dengan revisi terakhir dikomit untuk melihat perubahan yang sudah Anda buat" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Membandingkan %s dengan %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Selesai" @@ -3117,7 +3160,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3151,11 +3194,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "" @@ -3163,15 +3206,15 @@ msgstr "" msgid "Conflict resolved" msgstr "Konflik terselesaikan" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Konflik" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konflik: %d" @@ -3184,124 +3227,124 @@ msgstr "Menu-Menu Konteks:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Lanjutkan" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Susutkan jendela terkait" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Cop&y" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Dicopy" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Salin" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Salin %s ke %s, Revisi %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Alat Salin\nSalin" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copy semua informasi ke clipboard" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Salin dan ganti nama" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copy path ke clipboard" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Salin pilihan ke &papan jepit" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copy pilihan dan simpan pada Clipboard\nCopy" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copy ke clipboard" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copy: Nama baru untuk %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Menyalin %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Mengcopy..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Koreksi" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Tidak bisa menambah %s ke daftar abaikan!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Tidak bisa memeriksa versi lebih baru!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3309,76 +3352,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Tidak dapat membuat %1 karena direktori sudah penuh." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Tidak dapat menentukan revisi terkomit terakhir!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Tidak bisa mendapatkan status!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Tidak dapat membuka %1 karena terlalu banyak berkas dibuka." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Tidak bisa membuka berkas\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Tidak dapat menghapus %1 karena itu adalah direktori sekarang." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Tidak bisa menghapus %s dari daftar abaikan" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Tidak bisa mengambil URL dari berkas!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3386,7 +3429,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3394,7 +3437,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3402,11 +3445,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Tidak bisa memulai pekerjaan mencetak." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3414,11 +3457,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Tidak bisa memulai thread!" @@ -3426,7 +3469,7 @@ msgstr "Tidak bisa memulai thread!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3439,15 +3482,15 @@ msgstr "Buat &Library" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "" @@ -3459,29 +3502,29 @@ msgstr "Buat Daftar Perubahan" msgid "Create New Branch" msgstr "Buat Cabang Baru" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3490,49 +3533,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Membuat berkas tambalan dari perbedaan pada dua berkas tersebut\nMembuat berkas tambalan" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Membuat database repositori di lokasi saat ini" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Membuat berkas unified diff dengan semua perubahan yang anda buat" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3544,7 +3587,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Cu&t" @@ -3552,7 +3595,7 @@ msgstr "Cu&t" msgid "Current" msgstr "Sekarang" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Cabang Saat Ini" @@ -3560,7 +3603,7 @@ msgstr "Cabang Saat Ini" msgid "Current Branch:" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3572,7 +3615,7 @@ msgstr "" msgid "Current version is:" msgstr "Versi sekarang:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Versi sekarang: %s" @@ -3585,7 +3628,7 @@ msgstr "Kus&tomisasi..." msgid "Custom" msgstr "Kustom" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Kustomisasi" @@ -3593,19 +3636,19 @@ msgstr "Kustomisasi" msgid "Customize Keyboard" msgstr "Kustomisasi Keyboard" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Kustomisasi Bilah Alat Akses Cepat" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Kustomisasi Bilah Alat Akses Cepat..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3619,88 +3662,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Tanggal" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Default" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menu Default" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Menu aplikasi bawaan. Tampak jika tidak ada dokumen yang terbuka." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Bawaannya adalah pengkodean UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Hapus" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Hapus dan &abaikan %d item menurut nama" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Hapus dan abaikan %d item berdasarkan &ekstensi" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3708,34 +3755,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Hapus\nBerkas telah dihapus" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Dihapus" @@ -3743,36 +3790,36 @@ msgstr "Dihapus" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Hapus dan tambah berkas pilihan atau topeng berkas ke daftar 'abaikan'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Hapus berkas log tindakan" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Menghapus" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Menghapus data yang di tembolok" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Menghapus berkas" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3782,7 +3829,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Kedalaman" #. Resource IDs: (65535) msgid "Describe" @@ -3792,7 +3839,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Deskripsi" @@ -3800,7 +3847,7 @@ msgstr "Deskripsi" msgid "Description:" msgstr "Deskripsi:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Hapus pilihan daftar perubahan" @@ -3808,33 +3855,33 @@ msgstr "Hapus pilihan daftar perubahan" msgid "Destination" msgstr "Tujuan" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Drive tujuan penuh." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detek dan sorot blok yang berubah" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3848,11 +3895,15 @@ msgstr "Ukuran dan posisi dialog" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Opsi Diff" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3884,7 +3935,7 @@ msgstr "Berkas diff:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3896,12 +3947,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3914,19 +3965,19 @@ msgstr "Perbedaan antara" msgid "Diffing" msgstr "Melakukan diff" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3938,26 +3989,26 @@ msgstr "Direktori:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disk penuh saat mengakses %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Kekecualian dispatch: %1" @@ -3966,44 +4017,52 @@ msgstr "Kekecualian dispatch: %1" msgid "Display &buttons in this order" msgstr "Tampilkan tom&bol dengan urutan ini" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Menampilkan bantuan untuk tombol yang diklik, menu dan jendela\nBantuan" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Menampilkan bantuan untuk tugas atau perintah saat ini\nBantuan" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Menampilkan instruksi tentang bagaimana menggunakan bantuan\nBantuan" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Menampilkan informasi program, angka versi dan hak cipta\nTentang" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4016,54 +4075,71 @@ msgstr "Jangan tampilkan menu konteks untuk path berikut:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Anda benar-benar ingin menghapus bilah alat '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Apakah anda yakin ingin memindahkan berkas atau folder ini?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4071,7 +4147,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4079,21 +4155,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Apakah Anda ingin memuat file yang telah berubah?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4101,21 +4177,21 @@ msgid "" "as resolved?" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Apakah Anda ingin mengembalikan dokumen yang tersimpan secara otomatis ini?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Anda ingin mengambil ulang dokumen untuk merujuk perubahan seting?\nCatatan: anda akan kehilangan semua perubahan yang anda buat!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4123,28 +4199,28 @@ msgstr "" msgid "Document :" msgstr "Dokumen :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Jangan mengembalikan dokumen yang tersimpan otomatis\nGunakan versi dokumen yang sudah tersimpan sebelumnya" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4154,11 +4230,11 @@ msgstr "Jangan simpan\nMemuat ulang tampilan tanpa menyimpan modifikasi" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Jangan tampilkan pesan ini lagi" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "" @@ -4170,7 +4246,7 @@ msgstr "Bawah" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Geret untuk membuat menu ini mengapung" @@ -4198,6 +4274,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "Ke&cualikan path:" @@ -4206,7 +4286,7 @@ msgstr "Ke&cualikan path:" msgid "E&xit" msgstr "&Keluar" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&kspor..." @@ -4216,7 +4296,7 @@ msgstr "" #. Resource IDs: (303) msgid "EOL" -msgstr "" +msgstr "EOL" #. Resource IDs: (5064) msgid "EUC-KR" @@ -4226,11 +4306,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Edit" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4246,23 +4326,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Edit Gambar Tombol" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Edit pembuat" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Edit ekstensi spesifik program diff" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Edit ekstensi spesifik program merge" @@ -4274,11 +4354,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Edit pesan log" @@ -4298,25 +4378,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Baik nama ataupun IP dari server proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Peralatan Elips\nElips" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4324,7 +4404,7 @@ msgstr "" msgid "Empty" msgstr "Kosong" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "" @@ -4340,7 +4420,7 @@ msgstr "" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4349,10 +4429,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Aktifkan Penanganan Lapisan" @@ -4361,35 +4445,35 @@ msgstr "Aktifkan Penanganan Lapisan" msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Menjumpai kesalahan I/O perangkat keras saat mengakses %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Menjumpai pelanggaran penguncian saat mengakses %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Menjumpai pelanggaran pembagian/sharing saat mengakses %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Menjumpai argumen yang tidak tepat" -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Menjumpai kesalahan tak diharapkan saat membaca %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Kesalahan terjadi saat menulis %1." @@ -4402,11 +4486,11 @@ msgstr "" msgid "End" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Lebarkan jendele ke ukuran penuh" @@ -4414,23 +4498,23 @@ msgstr "Lebarkan jendele ke ukuran penuh" msgid "Enter Log Message" msgstr "Masukkan Pesan Log" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Masukkan URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Masukkan GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Masukkan mata uang." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Masukkan tanggal dan/atau jam." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Masukkan tanggal." @@ -4438,90 +4522,90 @@ msgstr "Masukkan tanggal." msgid "Enter a name for the changelist:" msgstr "Masukkan sebuah nama untuk changelist:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Masukkan angka antara %1 dan %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Masukkan angka." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Masukkan integer positif." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Masukkan waktu." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Masukkan integer antara %1 dan %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Masukkan integer antara 0 dan 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Masukkan integer." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Masukkan isi berkas untuk menguji di bawah ini:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Masukkan &pesan log:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Masukkan tidak lebih dari %1 karakter." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Masukkan string regex di bawah ini:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Hapus seluruhnya\nHapus Semua" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Hapus pilihan\nHapus" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Salah" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Kesalahan pembangunan ulang Cache Ikon Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Kesalah saat membaca/menulis registry key %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4531,28 +4615,28 @@ msgstr "Berkas eksekusi (*.exe)|*.exe|Perintah (*.com)|*.com|Informasi (*.pdf)|* msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Sudah ada" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Keluar" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Mengembangkan (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Kembangkan jendela terkait" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Eksplorasi ke" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Ekspor" @@ -4560,36 +4644,36 @@ msgstr "Ekspor" msgid "Export Zip File" msgstr "Ekspor File Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Ekspor direktori:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Ekspor berkas tidak berversi juga" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Mengekspor %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Mengekspor" -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Ekstensi" @@ -4605,7 +4689,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Eksternal" @@ -4613,101 +4697,101 @@ msgstr "Eksternal" msgid "External Program:" msgstr "Program Eksternal:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Pudar" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Pembalikan gagal" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." -msgstr "Koneksi gagal.⏎\nKemungkinan link rusak." +msgstr "Koneksi gagal.\nKemungkinan link rusak." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Gagal mengkonversi objek ActiveX" -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Gagal untuk membuat dokumen kosong" -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Gagal untuk membuat objek. Pastikan aplikasi tesebut dimasukkan ke registri sistem." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Gagal untuk menjalankan bantuan." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Peluncuran aplikasi peladen gagal." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Gagal untuk membuka dokumen." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Pelaksanaan operasi peladen gagal." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Gagal untuk menyimpan dokumen" -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Gagal mengeset/menghapus daftar perubahan '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Gagal!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4715,62 +4799,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Fetch" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Mengambil berkas..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Mengambil revisi %s dari berkas:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Berkas" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Perubahan berkas setiap %s" @@ -4779,27 +4863,27 @@ msgstr "Perubahan berkas setiap %s" msgid "File changes each week:" msgstr "Perubahan berkas setiap minggu:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Diffs berkas" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Berkas kosong." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Daftar berkas kosong" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Tambalan berkas" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4811,7 +4895,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Ukuran berkas:\t\t%s (%s)\nLebar:\t\t\t%ld piksel\nTinggi:\t\t\t%ld piksel\nResolusi Horizontal:\t%.1f dpi\nResolusi Vertikal:\t%.1f dpi\nKedalaman:\t\t\t%d bit\nPerbesaran:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4831,7 +4915,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Ukuran berkas:\t\t%s (%s)\nLebar:\t\t\t%ld piksel\nTinggi:\t\t\t%ld piksel\nResolusi Horisontal :\t%.1f dpi\nResolusi Vertikal:\t%.1f dpi\nKedalaman:\t\t\t%d bit\nPerbesaran:\t\t\t%d%%\n\nUkuran Berkas:\t\t%s (%s)\nLebar:\t\t\t%ld piksel\nTinggi:\t\t\t%ld piksel\nResolusi Horisontal:\t%.1f dpi\nResolusi Vertikal:\t%.1f dpi\nKedalaman:\t\t\t%d bit\nPerbesaran:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4843,7 +4927,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Ukuran berkas:\t\t\t%s (%s)\nLebar:\t\t\t%ld pixel\nTinggi:\t\t\t%ld pixel\nResolusi Horisontal:\t%.1f dpi\nResolusi Vertikal:\t\t%.1f dpi\nKedalaman:\t\t\t%d bit\nPerbesaran:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4863,7 +4947,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Ukuran berkas:\t\t\t%s (%s)\nLebar:\t\t\t%ld piksel\nPanjang:\t\t\t%ld piksel\nResolusi Horisontal:\t%.1f dpi\nResolusi Vertikal:\t\t%.1f dpi\nKedalaman:\t\t\t%d bit\nPerbesaran:\t\t\t%d%%\n\nUkuran berkas:\t\t\t%s (%s)\nLebar:\t\t\t%ld piksel\nTinggi:\t\t\t%ld piksel\nResolusi Horisontal:\t%.1f dpi\nResolusi Vertikal:\t\t%.1f dpi\nKedalaman:\t\t\t%d bit\nPerbesaran:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nama file" @@ -4871,17 +4955,17 @@ msgstr "Nama file" msgid "Files" msgstr "Berkas-berkas" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Alat Pemenuh\nPenuhi" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Saring berdasarkan" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Saring path" @@ -4893,11 +4977,11 @@ msgstr "" msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Cari" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4907,17 +4991,17 @@ msgstr "Cari teks yang ditetapkan\nCari" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4925,23 +5009,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Selesai!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Parent Pertama" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Parent Pertama Saja" @@ -4950,18 +5034,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Floppy drives (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Folder" @@ -4973,38 +5057,34 @@ msgstr "" msgid "Font" msgstr "Huruf" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Untuk Bantuan, tekan F1. Gulung secara horisonal dengan Ctrl-Scrollwheel" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Untuk sejarah lengkap jangan pilih 'Berhenti pada salin/ganti nama'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Memaksa" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5022,20 +5102,20 @@ msgstr "" msgid "Format Patch" msgstr "Format Patch" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Teruskan" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5043,7 +5123,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Menemukan kata-kata otomatis:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5065,11 +5145,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5077,7 +5157,7 @@ msgstr "" msgid "From:" msgstr "Dari:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Layar Penuh" @@ -5085,7 +5165,7 @@ msgstr "Layar Penuh" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Rekursif penuh" @@ -5093,32 +5173,32 @@ msgstr "Rekursif penuh" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" -msgstr "" +msgstr "G&ravatar" #. Resource IDs: (5061) msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ tidak bisa dinisialisasi!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ tidak bisa membuat obyek bitmap. Mungkin anda tidak mempunyai cukup memori." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Mengumpulkan informasi. Silakan tunggu..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5148,43 +5228,43 @@ msgstr "Umum::Menu Konteks" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Umum::Dialog 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Umum::Dialog 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Umum::Dialog 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Dapatkan log penggabungan" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Mendapatkan file %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Mendapatkan file %s, revisi %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Mendapatkan informasi..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Mendapatkan informasi yang diperlukan..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Mendapatkan unfied diff" @@ -5196,23 +5276,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Salin dan tambahkan file ke WC ini" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Ekspor seluruh item disini" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5220,35 +5300,35 @@ msgstr "" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5260,31 +5340,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5305,7 +5385,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5317,47 +5397,47 @@ msgstr "" msgid "Go to line" msgstr "Pergi ke baris" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Pergi ke konflik berikutnya\nKonflik berikutnya" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Pergi ke perbedaan berikutnya\nPerbedaan berikutnya" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Pergi ke konflik sebelumnya\nKonflik sebelumnya" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Pergi ke perbedaan sebelumnya\nPerbedaan sebelumnya" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Grafik" @@ -5373,11 +5453,11 @@ msgstr "Abu-Abu" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Kelompok daftar perubahan" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5393,7 +5473,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5405,7 +5485,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Bantuan" @@ -5429,11 +5509,11 @@ msgstr "Heks" msgid "Hide Menus for unversioned paths" msgstr "Sembunyikan Menu untuk path-path yang tidak berversi" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Sembunyikan jendela terkait" @@ -5441,25 +5521,25 @@ msgstr "Sembunyikan jendela terkait" msgid "Hide the script while running" msgstr "Sembunyikan naskah saat dijalankan" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Sembunyikan/Tampilkan daftar berkas tambalan\nMenyembunyikan atau menampilkan daftar berkas tambalan" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5469,7 +5549,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Petunjuk: pilih menu konteks, ganti halaman ke 'Perintah' dan geret tombol bilah alat ke jendela menu." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Rumah" @@ -5485,7 +5565,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Naskah Hook::Integrasi Pelacak Isu" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tipe Hook" @@ -5499,9 +5579,9 @@ msgstr "Sertaka&n path:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5509,55 +5589,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5565,15 +5646,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "" @@ -5597,7 +5678,7 @@ msgstr "" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5605,7 +5686,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5613,7 +5694,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "" @@ -5621,16 +5702,16 @@ msgstr "" msgid "ID:32976:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5641,17 +5722,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5663,7 +5744,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5727,7 +5808,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Lapisan Ikon" @@ -5739,7 +5820,7 @@ msgstr "Lapisan Ikon::Set Ikon" msgid "Icon Overlays::Overlay Handlers" msgstr "Lapisan Ikon::Penangan Hamparan" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5749,52 +5830,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ikon/Desain/Kode:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Jika diaktifkan, mencegah munculnya lapisan dan menu konteks dalam dialog 'simpan sebagai...' atau 'buka'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Jika tercawang, mengeklik ganda pada suatu revisi pada daftar log akan membandingkannya dengan revisi sebelumnya" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Jika di-set, berkas di dalam folder tidak berversi bisa ditampilkan dalam kontrol status\r\nKontrol status digunakan misalnya dalam dialog komit." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5807,16 +5888,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Abaikan" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Abaikan %d item berdasarkan &ekstensi" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "" @@ -5828,15 +5909,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Abaikan semua perubahan spasi putih" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5844,7 +5925,7 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Abaikan perubahan &huruf" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5862,11 +5943,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Abaikan a&khir baris (direkomendasikan)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5874,29 +5955,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Abaikan perubahan spasi putih" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Abaikan" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Mengabaikan semua perubahan spasi putih ketika diffing\nMengabaikan semua perubahan spasi putih" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5914,24 +5995,24 @@ msgstr "Gambar &dan teks" msgid "Images" msgstr "Gambar-Gambar" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Anak yang langsung, termasuk folder-folder" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Impor" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Import %s ke %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5940,16 +6021,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Mengimpor file %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5973,24 +6054,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Ikutkan hanya rentang revisi berikut:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nama berkas tidak benar." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Impor inisial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "" @@ -6002,25 +6083,25 @@ msgstr "Perbedaan dalam-baris" msgid "Input" msgstr "Input" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Sisipkan isi Clipboard\nPaste" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Memori tidak cukup untuk melakukan operasi." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Kesalahan aplikasi internal." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Mata Uang tidak Sahih." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6028,7 +6109,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6051,7 +6132,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6059,11 +6140,11 @@ msgstr "" msgid "Keep changelists" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6077,7 +6158,7 @@ msgstr "Papan ketik" msgid "Keyboard shortcuts:" msgstr "Pintasan Papan Ketik" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Kunci-kunci" @@ -6119,21 +6200,41 @@ msgstr "BARIS8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Bahasa:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "" @@ -6141,7 +6242,11 @@ msgstr "" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6149,17 +6254,17 @@ msgstr "" msgid "Least active author:" msgstr "Pembuat paling tidak aktif:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Tampilan Kiri:" @@ -6167,11 +6272,11 @@ msgstr "Tampilan Kiri:" msgid "Left image" msgstr "Gambar kiri" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Grafik Baris" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6185,12 +6290,12 @@ msgstr "Tampilkan batang diff" msgid "Line differences" msgstr "Perbedaan baris" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "" @@ -6203,26 +6308,26 @@ msgstr "" msgid "Line:" msgstr "Baris:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Baris: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Daftar Topik Bantuan\nTopik Bantuan" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6240,23 +6345,23 @@ msgstr "Ambil Gambar" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6264,13 +6369,13 @@ msgstr "" msgid "Local Branch" msgstr "Cabang Lokal" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Status lokal" @@ -6278,7 +6383,7 @@ msgstr "Status lokal" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6288,7 +6393,7 @@ msgstr "" msgid "Locator Bar" msgstr "Bilah Lokator" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Log" @@ -6328,12 +6433,12 @@ msgstr "Pesan-pesan log (Tampilkan dialog log)" msgid "Login:" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6344,26 +6449,22 @@ msgstr "" msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" -msgstr "" +msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL sistem Mail tidak benar." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6376,47 +6477,47 @@ msgstr "" msgid "Manage" msgstr "" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Tandai diselesaikan" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Tandai untuk perbandingan" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Huru&f sama" @@ -6440,7 +6541,7 @@ msgstr "Me&nu menampilkan perintah-perintah yang baru saja digunakan terlebih da msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Bilah Menu" @@ -6448,7 +6549,7 @@ msgstr "Bilah Menu" msgid "Menu s&hadows" msgstr "Ba&yangan menu" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Gabung" @@ -6456,34 +6557,34 @@ msgstr "Gabung" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Gabung Reintegrasi" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Digabung" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6491,22 +6592,22 @@ msgstr "" msgid "Merging" msgstr "Menggabung" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Menggabung revisi berbeda yang dibutuhkan atau URL berbeda dalam 'Dari:' dan 'Ke:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Pesan" @@ -6516,9 +6617,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "&Ekspresi bagian pesan:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Pesan" @@ -6526,23 +6627,27 @@ msgstr "Pesan" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Saya" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Kecilkan Pita" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Minimal jumlah karakter untuk pesan komit:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Lain-lain" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Dicampur" @@ -6550,35 +6655,35 @@ msgstr "Dicampur" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Tanggal perubahan" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Diubah" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Lebih" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Tombol-tombol Lebih" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Perintah-Perintah Lebih..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Warna lengkap..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Lebih..." @@ -6598,41 +6703,41 @@ msgstr "Pin&dahkan ke Bawah" msgid "Move &Up" msgstr "Pindahkan ke &Atas" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Pindahkan Item Ke Bawah" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Pindahkan Item Ke Atas" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Pindahkan dan ganti nama" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Pindahkan ke daftar perubahan" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Pindah/Ganti nama" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Pindahkan: Nama baru untuk %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Pindahkan berkas-berkas yang berubah ke tampungan daur ulang sebelum membalik" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Memindahkan %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Memindahkan..." @@ -6640,11 +6745,11 @@ msgstr "Memindahkan..." msgid "My file:" msgstr "Berkas saya:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "" @@ -6656,7 +6761,7 @@ msgstr "" msgid "Navigate" msgstr "" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6666,11 +6771,11 @@ msgstr "" msgid "Navigation Pane Options" msgstr "Pilihan Jendela Navigasi" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Pilihan Jendela Navigasi..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Berulang" @@ -6682,7 +6787,7 @@ msgstr "Jaringan" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Baru" @@ -6691,43 +6796,43 @@ msgid "New &name:" msgstr "&Nama baru:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nama Cabang\\Tag" +msgid "New Branch/Tag" +msgstr "Nama Cabang/Tag" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Menu Baru" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nama baru untuk %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nama baru:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6735,33 +6840,29 @@ msgstr "" msgid "Next" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Halaman Berikutnya\nHalaman Berikutnya" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "" -#. Resource IDs: (73) -msgid "No" -msgstr "Tidak" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6773,102 +6874,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Tidak ada nilai perintah ditetapkan!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Tidak ada perbedaan ditemukan!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Tidak ada pesan kesalahan tersedia." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Tidak ada kesalahan terjadi." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Tidak ada file atau folder yang termodifikasi. Tidak ada yang bisa dikembalikan oleh TortoiseGit!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Tidak ada berkas yang dapat ditunjukkan dengan pengaturan saat ini.\nPeriksa satu atau lebih pengaturan di bawah untuk melihat berkas-berkas yang tidak diversi, diabaikan dan/atau tidak berubah.\nUntuk melihat perubahan jauh, klik 'Periksa Repositori'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Tidak ada file yang diubah atau ditambahkan sejak\ncommit terakhir. Tidak ada\nyang bisa dilakukan TortoiseGit disini..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Tidak ada file yang diubah atau ditambahkan sejak\ncommit terakhir. Tidak ada\nyang bisa dilakukan TortoiseGit disini...\nApakah anda ingin melihat file unversioned?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Tidak ada grafik tersedia" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Tidak ada enkoder gambar ditemukan untuk %s" -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Tidak ada koreksi ejaan" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Tidak ada tembolok status. Hanya folder berversi yang memperoleh lapisan, berkas tidak mendapatkan lapisan" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Tidak ada saran kamus" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6876,11 +6982,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Tidak ada" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6892,30 +6998,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Tidak semua entri registri sistem (atau berkas INI) dihapus." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Memori tidak cukup untuk menyelesaikan operasi." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Memori tidak cukup!\nSilakan coba kurangi ukuran grafik revisi dengan\nmenutup node atau mengurangi faktor pembesaran." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6923,7 +7029,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6942,26 +7048,26 @@ msgstr "Catatan: folder tersebut mengandung item tak berversi" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Pemberitahuan" @@ -6969,7 +7075,7 @@ msgstr "Pemberitahuan" msgid "Number Commits" msgstr "Jumlah Commit" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Jumlah %s" @@ -6982,7 +7088,7 @@ msgstr "Jumlah pembuat:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7054,41 +7160,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" -msgstr "" +msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" -msgstr "" +msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" -msgstr "" +msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7096,15 +7202,15 @@ msgstr "" msgid "Older lines" msgstr "Baris lebih tua" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Satu atau lebih dokumen simpan-otomatis ditemukan." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Satu atau lebih berkas dalam keadaan konflik." @@ -7116,29 +7222,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Hanya anak berkas" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Hanya angka (secara opsional dipisahkan oleh koma)\nyang diijinkan!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Hanya benda ini" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Buka" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7148,51 +7254,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Buka dari clipboard" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Buka berkas gambar..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Buka folder leluhur" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Buka dengan..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Membuka Bantuan\nTopik Bantuan" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Pilihan" @@ -7201,30 +7308,30 @@ msgid "Options" msgstr "Pilihan-pilihan" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "ukuran &original" +msgid "Ori&ginal size\tS" +msgstr "ukuran &original\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Jendela-Jendela Tugas Lain" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Lainnya" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Kekurangan memori." @@ -7232,7 +7339,7 @@ msgstr "Kekurangan memori." msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7240,20 +7347,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Halaman %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7264,15 +7375,15 @@ msgstr "Halaman %u\nHalaman %u-%u\n" msgid "Page :" msgstr "Halaman :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parameter-parameter" @@ -7280,25 +7391,25 @@ msgstr "Parameter-parameter" msgid "Parameters:" msgstr "Parameter:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7310,39 +7421,39 @@ msgstr "" msgid "Password" msgstr "" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Kata sandi:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Alat Tempel\nTempel" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Tempel daftar nama berkas" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Menempelkan path svn dari clipboard, sehingga operasi bergerak (potong) atau menyalin" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7358,32 +7469,32 @@ msgstr "Patch berka&s terpilih" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Patch semua berkas" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Patch berkas terpilih" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Menambal" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Path" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Path menemukan adanya persamaan pada patch yang lebih baik." @@ -7391,21 +7502,21 @@ msgstr "Path menemukan adanya persamaan pada patch yang lebih baik." msgid "Path:" msgstr "Jalur:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Path" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Alat Pensil\nPensil" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Persentase kepemilikan" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Persentase" @@ -7413,24 +7524,24 @@ msgstr "Persentase" msgid "Personalized Menus and Toolbars" msgstr "Personalisasi Menu dan Batang Alat" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7440,56 +7551,56 @@ msgstr "Gambar (Metafile)\nsebuah gambar" msgid "Picture:" msgstr "Gambar:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Grafik Pie" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Silahkan masukkan naskah hook untuk dijalankan." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Silahkam masukkan path ke mana untuk menerapkan naskah hook." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Silahkan pilih tipe hook" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Harap menunggu sementara membatalkan..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Harap menunggu sementara perbedaan diperoleh..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Harap menunggu..." @@ -7505,11 +7616,11 @@ msgstr "Port :" msgid "Port:" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Hook Setelah-Komit" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7517,23 +7628,23 @@ msgstr "" msgid "Pre&v Page" msgstr "Halaman &Sebelumnya" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Hook Pre-Komit" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "" @@ -7545,11 +7656,11 @@ msgstr "Teka&n Kunci Pintasan Baru" msgid "Press &new shortcut key:" msgstr "Teka&n kunci pintasan baru:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Pratilik" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Tinjau dului berkas tambalan" @@ -7561,51 +7672,51 @@ msgstr "Pratilik:" msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Halaman Sebelumnya\nHalaman Sebelumnya" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Cetak" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Cetak Dokumen\nCe&tak" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Cetak ke Berkas" @@ -7613,7 +7724,7 @@ msgstr "Cetak ke Berkas" msgid "Printer :" msgstr "Pencetak :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Berkas-berkas Printer (*.prn)|*.prn|Semua berkas (*.*)|*.*||" @@ -7621,11 +7732,11 @@ msgstr "Berkas-berkas Printer (*.prn)|*.prn|Semua berkas (*.*)|*.*||" msgid "Printing" msgstr "Pencetakan" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Program (*.exe)|*.exe|Semua Berkas (*.*)|*.*||" @@ -7633,11 +7744,11 @@ msgstr "Program (*.exe)|*.exe|Semua Berkas (*.*)|*.*||" msgid "Progress" msgstr "Progres" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Properti" @@ -7645,17 +7756,17 @@ msgstr "Properti" msgid "Property Page" msgstr "Halaman Properti" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Penyedia" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Penyedia para&meter" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Penyedia uuid win&32" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7677,15 +7788,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Pull" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7693,19 +7804,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Push" @@ -7721,11 +7832,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7733,22 +7844,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Keluar dari aplikasi; tanya untuk menyimpan dokumen\nKeluar" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7766,11 +7877,15 @@ msgstr "Pemacu R&AM" msgid "R&eset" msgstr "S&et ulang" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "Pulihkan k&e revisi ini" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7778,7 +7893,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7800,7 +7915,7 @@ msgstr "" msgid "Re&movable drives" msgstr "Pe&macu dapat dilepas" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Ganti &nama..." @@ -7816,15 +7931,15 @@ msgstr "&Set ulang semua" msgid "Re&store defaults" msgstr "&Kembalikan bawaan" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Pu&lihkan..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Baca 'Bimbingan Penggunaan Harian' sebelum anda macet..." @@ -7832,21 +7947,21 @@ msgstr "Baca 'Bimbingan Penggunaan Harian' sebelum anda macet..." msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Baru saja" @@ -7858,21 +7973,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Baris-baris yang baru saja diubah" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Catat Saja" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Memulihkan dokumen-dokumen simpan-otomatis\nBuka versi simpan-otomatis selain versi tertentu yang disimpan" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7886,17 +8001,21 @@ msgstr "" msgid "Recursive" msgstr "Rekursif" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Redo aksi yang tidak dikerjakan sebelumnya\nRedo" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Kurangi jendela menjadi ikon" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7904,31 +8023,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Segarkan" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7940,7 +8059,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7959,7 +8078,7 @@ msgid "" "\\s : whitespaces" msgstr "Saringan ekspresi regular:\r\n. : karakter apa saja\r\nc+ : pencocokan karakter c sekali atau lebih\r\nc* : pencocokan karakter c nol kali atau lebih\r\n^ : awal baris\r\n$ : akhir baris\r\n(string){n} : pencocokan string n kali\r\n(abcd) : subekspresi\r\n[aei0-9] : pencocokan a,e,i dan 0..9\r\n[^aei0-9] : apapun kecuali a,e,i dan 0..9\r\n\r\n\\w : pencocokan a-z,A-Z,0-9 dan _\r\n\\W : semua karakter non-alfanumerik\r\n\\d : angka 0-9\r\n\\s : spasi putih" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Menolak sebagian patch pada %s" @@ -7972,7 +8091,7 @@ msgstr "" msgid "Reload" msgstr "Ambil lagi" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8006,19 +8125,19 @@ msgstr "" msgid "Remote Branch" msgstr "Remote Branch" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Status remote" @@ -8030,12 +8149,12 @@ msgstr "Remote:" msgid "Remove" msgstr "Hapus" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Copot %ld item" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Copot %s" @@ -8044,7 +8163,7 @@ msgstr "Copot %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8052,21 +8171,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Hapus dari daftar aba&ikan" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Hilangkan dari Bilah Batang Akses Cepat" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Hapus dari daftar perubahan" @@ -8078,7 +8197,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8086,11 +8205,11 @@ msgstr "" msgid "Removed" msgstr "Dihapus" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Dihapus dari daftar perubahan" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8098,7 +8217,7 @@ msgid "" "from the ignore list." msgstr "Pola berkas dihapus\n%s\ndari daftar abaikan." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Menghapus berkas atau topeng berkas dari item daftar abaikan" @@ -8106,11 +8225,11 @@ msgstr "Menghapus berkas atau topeng berkas dari item daftar abaikan" msgid "Rena&me..." msgstr "Ganti na&ma..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Ganti nama" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Ganti nama %s" @@ -8119,20 +8238,20 @@ msgstr "Ganti nama %s" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Ganti-nama/singkirkan" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8142,7 +8261,7 @@ msgstr "Ulangi aksi terakhir\nUlangi" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8156,12 +8275,12 @@ msgstr "" msgid "Replace:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Mengganti" @@ -8185,11 +8304,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Meminta nama pengguna dan kata sandi" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Reset" @@ -8201,25 +8320,25 @@ msgstr "Set Ulang Semu&a" msgid "Reset Type" msgstr "Reset Type" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Set ulang kolom" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Selesaikan" @@ -8227,126 +8346,122 @@ msgstr "Selesaikan" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Selesaikan konflik menggunakan 'saya'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Selesaikan konflik menggunakan 'mereka'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Diselesaikan" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Diselesaikan:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Menyelesaikan berkas berkonflik" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Kembalikan Standar" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Kembalikan jendela ke ukuran normal" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Dikembalikan" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Coba lagi" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Balik" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Dibalik" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Balik semua perubahan yang anda buat sejak pemutakhiran terakhir" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Balik sebuah penambahan ke kontrol versi" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisi" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisi %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisi %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Grafik revisi" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8362,31 +8477,31 @@ msgstr "Saringan Grafik Revisi" msgid "Revision graph" msgstr "Grafik Revisi" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Teks Kaya (RTF)\nteks dengan penyusunan huruf dan paragraf" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Tampilan Kanan:" @@ -8394,21 +8509,21 @@ msgstr "Tampilan Kanan:" msgid "Right image" msgstr "Gambar kanan" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Baris %d dari %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Baris %d-%d dari %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Baris Di Bawah" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Baris Di Atas" @@ -8416,11 +8531,11 @@ msgstr "Baris Di Atas" msgid "S&elect..." msgstr "&Pilih" -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Ta&mpilkan Tombol-Tombol pada Satu Baris" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Ta&mpilkan Tombol Tombol pada Dua Baris" @@ -8428,25 +8543,33 @@ msgstr "Ta&mpilkan Tombol Tombol pada Dua Baris" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Ta&mpilkan Bilah Batang Akses Cepat dibawah Pita" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "&Statistik" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8456,7 +8579,7 @@ msgstr "SMTP Server membutuhkan otentikasi" msgid "SMTP Server:" msgstr "SMTP Server:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8464,31 +8587,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8500,15 +8623,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8524,37 +8647,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Teks contoh:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Simpan seb&agai" -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Simpan seb&agai...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Simpan Sebagai" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8562,13 +8689,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8576,74 +8703,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Simpan sebagai..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Simpan pada\nAnda ditanya dimana akan menyimpan berkas" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Simpan perubahan ke %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Simpan modifikasi" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Simpan revisi &ke..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8665,13 +8792,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Simpan\nSimpan berkas dengan penanda-penanda konflik." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8683,28 +8810,28 @@ msgstr "Simpan\nModifikasi disimpan pada\n%s" msgid "Saved Data" msgstr "Data Disimpan" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Mencari" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Gulung Kiri" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Gulung Kanan" @@ -8712,7 +8839,7 @@ msgstr "Gulung Kanan" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Cari pesan &log..." @@ -8724,20 +8851,20 @@ msgstr "" msgid "Search for:" msgstr "Mencari:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Mencari path yang lebih baik untuk menerapkan tambalan..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Pencarian gagal pada %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Pilih Semu&a" @@ -8753,59 +8880,59 @@ msgstr "Pilih menu &konteks:" msgid "Select &window:" msgstr "Pilih &jendela:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Pilih Alat Warna\nPilih Warna" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Pilih Berkas..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Pilih klien SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Pilih sebuah tombol." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Pilih obyek yang ingin memperoleh Bantuan" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Pilih daftar perubahan" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Pilih aplikasi diff" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Pilih folder yang berkaitan dengan pencatat isu ini." -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Pilih folder untuk ekspor.\nAnda mungkin perlu membuat folder baru sebelum melakukan ekspor ini." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Pilih folder untuk menjalan naskah" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Pilih folder untuk tempat penyimpanan berkas-berkas yang terpilih" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Pilih berkas naskah hook" @@ -8813,20 +8940,20 @@ msgstr "Pilih berkas naskah hook" msgid "Select items automatically" msgstr "Pilih item-item secara otomatis" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Pilih aplikasi merge" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Pilih target penggabungan" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "Pilih tindak-tanduk dari dialog progres di akhir operasi." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8836,17 +8963,21 @@ msgstr "Pilih seluruh dokumen\nPilih Semua" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Pilih bahasa yang akan digunakan dalam proyek ini. Pengaturan ini berpengaruh pada pemeriksaan kata yang digunakan pada pesan-pesan commit," + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Pilih peninjau untuk berkas-diff" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8856,7 +8987,7 @@ msgstr "" msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8864,7 +8995,7 @@ msgstr "" msgid "Send" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "" @@ -8872,11 +9003,11 @@ msgstr "" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Kirim Mail gagal untuk mengirimkan pesan." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "" @@ -8884,19 +9015,19 @@ msgstr "" msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Mengirimkan konten" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "" @@ -8916,28 +9047,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Seting properti..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Seting" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Pengaturan - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8945,7 +9076,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Cache Ikon Shell sudah dibangun ulang!" @@ -8957,7 +9088,7 @@ msgstr "" msgid "Short &date/time format in log messages" msgstr "Format pendek tanggal/&jam dalam pesan log" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Perpendek daftar properti" @@ -8969,7 +9100,7 @@ msgstr "Tampilkan" msgid "Show &Accelerator for:" msgstr "Tampilkan &Akselerator untuk:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8977,15 +9108,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Tampilkan &perubahan-perubahan..." -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Tampilkan &log" @@ -8993,15 +9124,19 @@ msgstr "Tampilkan &log" msgid "Show &log..." msgstr "Tampilkan &log..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Tampilkan lapisan dan menu k&onteks hanya dalam penjelajah" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Tampilkan Di Atas Pita" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Tampilkan Di Bawah Pita" @@ -9009,35 +9144,35 @@ msgstr "Tampilkan Di Bawah Pita" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Tampilkan Lebih Sedikit Tombol" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Tampilkan noda-noda revisi HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Tampilkan Diff-Inline kata demi kata\nDiff Inline per kata" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Tampilkan Lebih Banyak Tombol" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Tampilkan Bilah Alat Akses Cepat Di Atas Pita" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Tampilkan Bilah Alat Akses Cepat Di Bawah Pita" @@ -9045,11 +9180,11 @@ msgstr "Tampilkan Bilah Alat Akses Cepat Di Bawah Pita" msgid "Show Screen&Tips on toolbars" msgstr "&Tampilkan Tips Petunjuk pada bilah alat" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Tampilkan ikhtisar graf keseluruhan" @@ -9057,7 +9192,7 @@ msgstr "Tampilkan ikhtisar graf keseluruhan" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9065,11 +9200,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Tampilkan perbedaan sebagai &unified diff" @@ -9089,15 +9224,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9109,11 +9244,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "Tampilkan secara normal folder yang dikecualikan " +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Tampilkan menu pen&uh setelah jeda pendek" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9129,7 +9268,7 @@ msgstr "Tampilkan file yang ditolak" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9137,90 +9276,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Tampilkan nomor bari&s" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Tampilkan noda tertua di atas" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Tampilkan atau sembunyikan bilah diff baris\nHidup matikan LineDiffBar" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Tampilkan atau sembunyikan bilah Lokator\nHidup matikan LocatorBar" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Tampilkan atau sembunyikan status bar\nToggle StatusBar" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Tampilkan atau sembunyikan toolbar\nToogle Toolbar" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Tampilkan properti-properti revisi" @@ -9228,7 +9367,7 @@ msgstr "Tampilkan properti-properti revisi" msgid "Show shortcut &keys in ScreenTips" msgstr "Tampilkan &kunci pintas di Tips Layar" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9238,7 +9377,7 @@ msgstr "" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9250,45 +9389,43 @@ msgstr "Tampilkan file yang tidak termodifikasi" msgid "Show un&versioned files" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Tampilkan/Sembunyikan" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Menampilkan gambaran grafik copy/tags/cabang" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Menampilkan semua berkas yang diubah sejak pemutakhiran terakhir, secara lokal dan dalam repositori" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Tampilkan informasi tentang TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Tampilkan berkas log aksi di penyunting teks bawaan" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9300,7 +9437,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "" @@ -9308,20 +9445,20 @@ msgstr "" msgid "Since" msgstr "Sejak" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Ukuran" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Lewati" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9329,23 +9466,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Dilewati" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "target yang hilang dilewati" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Slide" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9353,13 +9490,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Biarkan working tree dan index tidak tersentuh" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9373,7 +9510,7 @@ msgstr "Urutkan berdasarkan urutan komit" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9383,49 +9520,53 @@ msgstr "Menetapkan seberapa banyak item yang ingin anda biarkan dalam dialog pes msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Garis pemisah" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Pisahkan jendela aktif ke dalam pane\nPisahkan" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Squash" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Grafik Stacked Bar" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Grafik Stacked Garis" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standar" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Mulai Hook Komit" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" @@ -9433,7 +9574,7 @@ msgstr "" msgid "Start registry editor" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9445,39 +9586,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statik" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistik" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Status" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Konfigurasi Bilah Status" @@ -9489,32 +9638,32 @@ msgstr "Status dan warna aksi" msgid "Status cache" msgstr "Status cache" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Status cache hanya untuk satu folder, tidak ada lapisan rekursif" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9522,15 +9671,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Subjek" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Subjek:" @@ -9538,7 +9687,7 @@ msgstr "Subjek:" msgid "Submodule" msgstr "Submodul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9546,7 +9695,7 @@ msgstr "" msgid "Submodule Add" msgstr "Submodul Add" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9554,15 +9703,15 @@ msgstr "" msgid "Submodule Diff" msgstr "Submodul Diff" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9570,7 +9719,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9585,15 +9734,15 @@ msgstr "" msgid "Submodules" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Tukar" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "" @@ -9602,43 +9751,43 @@ msgstr "" msgid "Switch To" msgstr "Beralih Ke" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Tukar kembali ke pane jendela sebelumnya\nPane Sebelumnya" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Tukar antara tampilan pane tunggal dan ganda\nTukar antara tampilan pane tunggal dan ganda" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Tukar isi dari tampilan kiri dan kanan\nTukar tampilan kiri dan kanan" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Tukar ke jendela dokumen berikutnya" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Tukar ke pane jendela berikutnya\nPane Berikutnya" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Tukar ke jendela dokumen sebelumnya" @@ -9646,21 +9795,21 @@ msgstr "Tukar ke jendela dokumen sebelumnya" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Tukar perbandingan kiri<->kanan" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9670,23 +9819,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sync..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9696,13 +9845,13 @@ msgstr "Entri registri sistem sudah dihapus dan berkas INI (jika ada) sudah diha msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9716,7 +9865,7 @@ msgstr "Dudukan Tab" msgid "Tab size:" msgstr "Ukuran tab:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "" @@ -9724,16 +9873,16 @@ msgstr "" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Tags" @@ -9741,11 +9890,11 @@ msgstr "Tags" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tugas" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Jendela Tugas" @@ -9757,11 +9906,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Hanya Tes" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9769,13 +9918,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9783,64 +9938,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Ukuran chunk tidak sama dengan jumlah baris yang ditambahkan/dihapus!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Mesin diff dibatalkan karena kesalahan:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Berkas %s tidak ada!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Berkas %s tidak ditemukan dalam berkas tambalan!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9849,15 +10018,15 @@ msgid "" "Do you want to remove the file?" msgstr "Berkas \n%s\nkosong.\nApakah Anda ingin menghapusnya?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Berkas terlalu besar." -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Berkas terlalu besar untuk dibuka." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9865,7 +10034,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Berkas\n%s\nsudah ada! Anda ingin menimpanya?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9873,14 +10042,14 @@ msgid "" "is not a valid text file!" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Folder %s\nberisi berkas tidak berversi dan/atau diubah. Anda ingin tetap menghapusnya?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9889,78 +10058,78 @@ msgid "" "Would you like to create it first?" msgstr "Folder \n%s\ntidak ada.\nAnda ingin membuatnya terlebih dulu?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Naskah hook menghasilkan kesalahan:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Gambar tidak bisa ditampilkan." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Penyedia penjejak-isu tidak dapat dibuat. Silakan periksa bahwa ia terpasang dengan benar." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Penyedia penjejak-isu tidak dapat memvalidasi string parameter" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Baris yang menunjukan berkas baru diharapkan dalam baris %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Jumlah maksimum baris log tindakan yang disimpan.\nTambahan baris diluar batas ini akan menghapus baris tertua dari berkas." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Perintah gagal." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Parameter-parameter '/path' dan '/pathfile' hanya dapat digunakan salah satu. Anda harus menentukan salah satu dari mereka." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9970,7 +10139,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9981,7 +10150,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9992,36 +10161,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "Ekspresi reguler tidak valid!\nHarap memasukkan ekspresi reguler yang valid." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Repositori telah dibuat dengan sukses." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Berkas yang dipilih nampaknya masih mempunyai satu atau lebih tanda konflik didalamnya,\nAnda yakin ingin menandai sudah diselesaikan?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10029,7 +10205,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10038,7 +10214,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10047,26 +10223,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Waktu dalam detik sebelum penguraian berkas yang dipilih berhenti.\r\nNilai lebih rendah akan membuat daftar pelengkapan otomatis tersedia lebih awal,\r\ntapi mungkin tidak memindai semua berkas." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Dua URL yang dipilih tidak dibuat dari akar yang sama.\nTidak mungkin untuk menampilkan pesan log antara mereka!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10076,34 +10252,34 @@ msgstr "" msgid "Their file:" msgstr "Berkas Mereka:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Mereka" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Tidak ada penyedia penjejak-isu." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10112,85 +10288,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Masih ada konflik tidak terselesaikan pada baris%d!\nAnda harus menyelesaikan konflik itu sebelum menyimpan.\nAnda ingin menyimpan berkas yang masih konflik?\nJika anda mengklik YA, maka anda harus menyelesaikan konflik dalam editor lain secara manual!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Ada perubahan-perubahan yang belum tersimpan!\nApakah Anda ingin menyimpan perubahan anda?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Kamus" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Ini bukan URL yang benar.\nSilahkan masukkan URL disini." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Program ini dikaitkan ke ekspor %s yang hilang dalam berkas %s. Mesin ini mungkin mempunyai versi tidak kompatibel %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Program ini membutuhkan berkas %s, yang tidak ditemukan pada sistem ini." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Properti ini hanya dibolehkan pada folder, bukan berkas." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Ini akan menghapus rekaman perintah yang telah Anda gunakan di aplikasi ini dan menyembalikan set bawaan perintah yang nampak ke menu dan bilah Alat. Ini tidak akan membatalkan kustomisasi eksplisit. Apakah Anda yakin ingin melakukan ini?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10206,14 +10382,14 @@ msgstr "Susun secara hori&zontal" msgid "To" msgstr "" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10225,13 +10401,13 @@ msgstr "" msgid "To:" msgstr "Ke:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Tampilkan/Sembunyikan tampilan Satu/Dua Halaman\nTampilkan/Sembunyikan tampilan Satu/Dua Halaman" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10243,11 +10419,11 @@ msgstr "Bilah Alat" msgid "Toolbar Name" msgstr "Nama Bilah Alat" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opsi Bilah Alat" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Kesalahan internal bilah alat. Silakan hubungi pemasok aplikasi Anda." @@ -10263,59 +10439,59 @@ msgstr "Peralatan" msgid "Tools:" msgstr "Peralatan:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" "%s \r\n" -msgstr "" +msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" -msgstr "" +msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10331,7 +10507,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10339,7 +10515,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10353,36 +10529,36 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10421,11 +10597,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Mentransfer pada %s" @@ -10434,39 +10610,35 @@ msgstr "Mentransfer pada %s" msgid "Transparent &color..." msgstr "Warna tembus &pandang..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Coba 'Bersihkan'. Jika itu tidak bekerja Anda perlu melakukan checkout segar." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Coba lagi" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10480,34 +10652,34 @@ msgstr "URL:" #. Resource IDs: (5071) msgid "UTF-16 BE" -msgstr "" +msgstr "UTF-16 BE" #. Resource IDs: (5070) msgid "UTF-16 LE" -msgstr "" +msgstr "UTF-16 LE" #. Resource IDs: (5069) msgid "UTF-8" -msgstr "" +msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Tidak bisa mendapatkan dukungan sistem mail." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Tidak dapat memproses perintah, peladen sibuk." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Tidak bisa membaca dari %1, ia dibuka oleh orang lain." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Tidak bisa membaca properti hanya-tulis." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10515,91 +10687,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Tidak bisa menulis properti hanya-baca." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Tidak bisa menulis ke %1, ia hanya-baca atau dibuka oleh orang lain." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Tidak dicentang" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Batalkan %d Tindakan" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Batalkan 1 Tindakan" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Format berkas tidak diharapkan." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Mengembang" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Teks tanpa Susunan\nteks tanpa susunan apapun" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Unified &diff dari revisi HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Kedalaman tak diketahui" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Konflik tak terselesaikan!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Tanpa judul" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Tak Berversi" @@ -10607,7 +10783,7 @@ msgstr "Tak Berversi" msgid "Unversioned files mark parent folder as modified" msgstr "Berkas tidak berversi menandai folder leluhur sebagai diubah" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "" @@ -10620,23 +10796,23 @@ msgstr "Atas" msgid "Update" msgstr "Mutakhirkan" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Dimutakhirkan" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Memutakhirkan objek-objek ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10648,30 +10824,26 @@ msgstr "Gunakan Gambar &Bawaan:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Gunakan tampilan sat&u-jendela sebagai standar untuk diff 2-berkas" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Gunakan bl&ok teks lain" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10692,15 +10864,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Gunakan Unified Diff dari papan &jepit" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10710,7 +10882,7 @@ msgstr "Menggunakan semua isi tilik kiri\nMenggunakan berkas kiri" msgid "Use block from left before right" msgstr "Gunakan blok teks dari kiri sebelum kanan" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10720,25 +10892,25 @@ msgstr "Gunakan blok dari tilik kiri sebelum blok dari tilik kanan\nGunakan blok msgid "Use block from right before left" msgstr "Gunakan blok teks dari kanan sebelum kiri" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Gunakan blok dari tilik kanan sebelum blok dari tilik kiri\nGunakan blok dari kanan sebelum kiri" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Gunakan kedua blok teks (ini yang pertama)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Gunakan kedua blok teks (ini yang terakhir)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "" @@ -10754,15 +10926,15 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Gunakan tampungan daur ulang saat membalik" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Gunakan ekspresi reguler" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "" @@ -10770,61 +10942,61 @@ msgstr "" msgid "Use system locale for date/time" msgstr "Gunakan lokal sistem untuk tanggal/waktu" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Gunakan blok teks dari '&saya'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Gunakan blok teks dari '&mereka'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Gunakan blok teks dari 'sa&ya' sebelum 'mereka'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Gunakan blok teks dari 'saya' sebelum 'mereka'\nGunakan blok teks 'saya' kemudian 'mereka'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Gunakan blok teks dari 'saya'\nGunakan blok teks 'saya'" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Gunakan blok teks dari 'me&reka' sebelum 'saya'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Gunakan blok teks dari 'mereka' sebelum 'saya'\nGunakan blok teks 'mereka' kemudian 'saya'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Gunakan blok teks dari 'mereka'\nGunakan blok teks 'mereka'" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Gunakan blok teks dari tilik kiri\nGunakan blok kiri" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Gunakan blok teks &ini" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10832,7 +11004,7 @@ msgid "" "%s" msgstr "Gunakan path yang ditemukan\nTerapkan patch pada\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10844,19 +11016,19 @@ msgstr "Gunakan path yang asli\nTerapkan patch pada\n%s" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Gunakan seluru&h berkas ini" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Gunakan seluruh ber&kas lain" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10872,11 +11044,11 @@ msgstr "" msgid "User Name:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Dibatalkan pengguna" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10886,11 +11058,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nama pengguna" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10909,7 +11081,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Nilai" @@ -10917,24 +11089,24 @@ msgstr "Nilai" msgid "Version" msgstr "Versi" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10942,11 +11114,11 @@ msgstr "" msgid "Version Information" msgstr "Informasi Versi" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versi:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Berversi" @@ -10958,23 +11130,27 @@ msgstr "" msgid "View" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Lihat revisi untuk path dalam peninjau &web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "" @@ -10986,13 +11162,13 @@ msgstr "" msgid "Visit our website" msgstr "Kunjungi website kami" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" -msgstr "" +msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" -msgstr "" +msgstr "Visual Studio 2008" #. Resource IDs: (65535) msgid "" @@ -11001,7 +11177,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "PERINGATAN:\r\nHanya mengubah pengaturan ini jika Anda benar-benar yakin apa yang Anda lakukan!\r\nUntuk mengatur nilai-nilai standar mereka, menghapus teks nilai." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Tunggu" @@ -11009,7 +11185,7 @@ msgstr "Tunggu" msgid "Wait for the script to finish" msgstr "Menunggu naskah diselesaikan" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11017,15 +11193,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Peringatan" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Peringatan!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11033,7 +11209,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "" @@ -11041,56 +11217,56 @@ msgstr "" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Saat dihidupkan, item berversi yang terdaftar di dialog komit dipilih secara otomatis." -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11100,15 +11276,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Spasi putih" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Posisi Jendela" @@ -11116,17 +11292,17 @@ msgstr "Posisi Jendela" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" -msgstr "" +msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" -msgstr "" +msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" -msgstr "" +msgstr "Windows XP" #. Resource IDs: (5020) msgid "Windows-1250" @@ -11168,11 +11344,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11180,29 +11356,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Ya" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Ya untuk semua" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Anda sudah mempunyai versi terbaru diinstalasi." @@ -11212,51 +11384,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Anda dapat menempelkan bitmap dengan ukuran (%d x %d) saja!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Anda tidak dapat membuat lebih dari %d bilah alat yang ditentukan pengguna!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Anda tidak bisa mengeset properti ini pada folder tetapi hanya pada berkas!\nJika Anda ingin mengesetnya pada semua berkas di dalam folder itu,\nanda harus mengaktifkan kotak centang 'rekursif'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Anda telah mengubah properti tanpa menyimpannya terlebih dulu.\nAnda ingin menyimpannya sekarang?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11264,67 +11436,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Anda tidak memasukan angka terbitan!\nAnda yakin ingin mengkomit tanpa nomor terbitan?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Anda boleh menentukan paling banyak %d alat." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Anda harus memasukkan sebuah pesan log untuk commit" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Anda harus memulai lagi sistem anda agar perubahan bekerja." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Anda memilih berkas tidak berversi.\nBerkas akan ditambahkan ke kontrol versi saat anda komit." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Anda seharusnya memasukkan sebuah teks!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Anda seharusnya memasukkan sebuah gambar!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11334,7 +11506,7 @@ msgstr "Pesan log yang dimasukan sebelumnya sudah disimpan.\nKlik disini untuk m msgid "Your version is:" msgstr "Versi anda:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Versi anda: %d.%d.%d.%d" @@ -11344,10 +11516,10 @@ msgid "Zip File" msgstr "File Zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Zoo&m out" +msgid "Zoo&m out\t-" +msgstr "Zoo&m out\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Pembesaran" @@ -11359,80 +11531,80 @@ msgstr "&Besarkan" msgid "Zoom &Out" msgstr "&Kecilkan" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Besarkan 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Besarkan\nBesarkan" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Kecilkan\nKecilkan" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Bes&arkan" +msgid "Zoom i&n\t+" +msgstr "Bes&arkan\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Besarkan" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Kecilkan" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Besarkan hingga pas" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Besarkan hingga pas tingginya" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Besarkan hingga pas lebarnya" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Bawaan]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Tidak ditugaskan]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11446,7 +11618,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "ditambahkan" @@ -11454,7 +11626,7 @@ msgstr "ditambahkan" msgid "added files" msgstr "berkas ditambahkan" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "berkas tidak bernama" @@ -11462,14 +11634,19 @@ msgstr "berkas tidak bernama" msgid "and support the developers" msgstr "dan mendukung para pengembang" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "pembuat" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11502,30 +11679,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "komit" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "konflik" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" -msgstr "Salin dari↩\n%s - revisi %ld " +msgstr "Salin dari\r\n%s - revisi %ld " -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "hari" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "dihapus" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11537,7 +11714,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11546,16 +11723,16 @@ msgid "" "%s" msgstr "diekspor\n%s\nke\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "eksternal" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "diabaikan" @@ -11563,23 +11740,23 @@ msgstr "diabaikan" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "tidak lengkap" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "benda yang dipertahankan secara lokal" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "biarkan daftar berkas dalam Bahasa Inggris" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11588,7 +11765,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11603,11 +11780,11 @@ msgstr "" msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "digabung" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "hilang" @@ -11615,7 +11792,7 @@ msgstr "hilang" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "diubah" @@ -11623,7 +11800,7 @@ msgstr "diubah" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "bulan" @@ -11631,40 +11808,44 @@ msgstr "bulan" msgid "new branch" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "tidak" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "tidak ada penjelasan untuk perintah ini yang tersedia" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "non-versi" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "terhambat" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "pada %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixel" @@ -11672,11 +11853,11 @@ msgstr "pixel" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "seperempat tahun" @@ -11684,35 +11865,35 @@ msgstr "seperempat tahun" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "diganti" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "memeriksa path:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "beralih ke\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "ke %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "ke %s" @@ -11721,35 +11902,35 @@ msgstr "ke %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "minggu" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "tahun" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "ya" @@ -11759,4 +11940,4 @@ msgstr "{BugTraq}" #. Resource IDs: (65535) msgid "|" -msgstr "" +msgstr "|" diff --git a/Languages/Tortoise_it_IT.po b/Languages/Tortoise_it_IT.po index eab8a07b2..df3b95c47 100644 --- a/Languages/Tortoise_it_IT.po +++ b/Languages/Tortoise_it_IT.po @@ -6,6 +6,7 @@ # Translators: # acehigh, 2011 # Antonio , 2013 +# Alessio , 2014 # Antonio , 2013 # Cecilia Saltori , 2011 # Emilio Bologna <>, 2012 @@ -17,14 +18,16 @@ # Michele Locati , 2012 # Nathan McCoy, 2013 # Nathan McCoy, 2013 +# Nathan McCoy, 2013 # Roberto Casazza , 2011 -# Sven Strickroth , 2012-2013 +# Silvia, 2013 +# Sven Strickroth , 2012-2013,2015 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Italian (Italy) (http://www.transifex.com/projects/p/tortoisegit/language/it_IT/)\n" "MIME-Version: 1.0\n" @@ -33,7 +36,7 @@ msgstr "" "Language: it_IT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -55,138 +58,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autori visualizzati individualmente:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "" +msgstr "%.2f MiB trasferiti" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 contiene un oggetto inaspettato" -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 contiene un percorso non corretto" -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 contiene un schema non corretto." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 ha un formato non valido." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 non trovato" -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! giorno fa" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! giorni fa" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! ora fa" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! ore fa" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! minuto fa" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! mese fa" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! mesi fa" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! secondo fa" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! secondi fa" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! settimana fa" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! settimane fa" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! anno fa" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! anni fa" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minuti fa" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nContinuare a eseguire lo script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -194,52 +197,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nFile non trovato.\nVerificare che il percorso e il nome del file siano corretti." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Byte trasferiti" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "%I64d KiB trasferiti" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d file modificati" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d file rimossi" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d file ripristinati in %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "seelzionati %d file, totale %d file" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d autore(i) più attivo con almeno %d invii ogni (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -247,78 +250,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nclic per modifica alpha\ndoppio clic per modificare automaticamente alpha" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minuto/i e %ld secondo/i" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld di %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - alla revisione: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Ripristinato]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s in %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, in %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Albero di lavoro" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Esportazione (%d) di %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Esportazione di %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nRimoverlo comunque?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -334,6 +337,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "Unione a &3 vie" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Info su TortoiseGitBlame..." @@ -356,21 +363,21 @@ msgstr "&Aggiungi" #. Resource IDs: (1505) msgid "&Add Filter" -msgstr "" +msgstr "&Aggiungi Filtro" #. Resource IDs: (1382) msgid "&Add New/Save" msgstr "&Aggiungi nuovo/salva" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Aggiungilo" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Aggiungi o rimuovi pulsanti" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Aggiungi..." @@ -410,7 +417,7 @@ msgstr "&Assegna" msgid "&Associate double-click event with:" msgstr "&Associa evento doppio click a:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Nascondi automaticamente" @@ -426,15 +433,15 @@ msgstr "Carica &automaticamente chiave Putty" msgid "&Backup original file" msgstr "&Backup file originale" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "Biasimare" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Suggerisci modifiche" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Suggerisci revisioni" @@ -444,7 +451,7 @@ msgstr "&Blu" #. Resource IDs: (65535) msgid "&Border:" -msgstr "" +msgstr "&Bordo:" #. Resource IDs: (1512) msgid "&Branch" @@ -458,7 +465,7 @@ msgstr "&Ramo:" msgid "&Browse Dir" msgstr "&Esplora cartella" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Esplora il repository" @@ -494,7 +501,7 @@ msgstr "&Categoria:" msgid "&Choose commands from:" msgstr "&Scegli comandi da:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Pulizia..." @@ -518,7 +525,7 @@ msgstr "&ChiudI finestre" msgid "&Command:" msgstr "&Comando:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Commit" @@ -526,23 +533,27 @@ msgstr "&Commit" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "In&via..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Compara revisioni" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Continua" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copia" @@ -562,19 +573,19 @@ msgstr "&Personalizzato" msgid "&Default" msgstr "&Predefinito" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Elimina" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Elimina (mantieni locale)" #. Resource IDs: (1507) msgid "&Delete Filter" -msgstr "" +msgstr "&Cancella Filtro" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Elimina remoto && locale" @@ -586,11 +597,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Differenze" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Diiferenza con versione precedente" @@ -602,7 +613,7 @@ msgstr "&Cartella:" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "A&bbandona" @@ -610,7 +621,7 @@ msgstr "A&bbandona" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Docking" @@ -618,11 +629,15 @@ msgstr "&Docking" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Giù" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Download" @@ -630,19 +645,19 @@ msgstr "&Download" msgid "&Edit" msgstr "&Modifica" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Modifica .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Modifica tutto" #. Resource IDs: (1506) msgid "&Edit Filter" -msgstr "" +msgstr "&Modifica Filtro" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Modifica conflitti" @@ -664,13 +679,13 @@ msgstr "A&bilita server proxy" #. Resource IDs: (32976) msgid "&Enable edit" -msgstr "" +msgstr "Abilita &modifica" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Esporta selezione in..." @@ -682,27 +697,27 @@ msgstr "&Esterno" msgid "&File" msgstr "&File" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Trova" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Trova\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "Adatta immagine nella &finestra" +msgid "&Fit images in window\tF" +msgstr "Adatta immagine nella &finestra\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "Unità &fisse" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Virgola mobile" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Segui rinomina" @@ -714,7 +729,7 @@ msgstr "&Font per commenti:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Forza" @@ -734,7 +749,7 @@ msgstr "&Commit di Stile Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Vai a\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -746,7 +761,7 @@ msgstr "&Verde:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&?" @@ -754,7 +769,7 @@ msgstr "&?" msgid "&Help Topics" msgstr "&Argomenti della Guida in linea" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Nascondi" @@ -762,11 +777,11 @@ msgstr "&Nascondi" msgid "&Icon Set:" msgstr "Set &icone:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignora" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignora %d elementi per nome" @@ -780,14 +795,14 @@ msgid "&Image" msgstr "&Immagine" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informazioni immagine" +msgid "&Image info\tI" +msgstr "&Informazioni immagine\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Solo immagine" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "I&mporta..." @@ -799,7 +814,7 @@ msgstr "Cartella &iniziale:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -811,11 +826,11 @@ msgstr "Durante il caricamento &vai direttamente alla prima differenza" msgid "&Keep CR" msgstr "&Mantiene CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -837,13 +852,13 @@ msgstr "&Limita la ricerca alle linee modificate" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Limita:" #. Resource IDs: (1078) msgid "&Line number" msgstr "Numero &linea" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Numero &linea (%d - %d)" @@ -860,7 +875,7 @@ msgstr "Vista &elenco" msgid "&Local Branch:" msgstr "&Ramo Locale:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -884,11 +899,11 @@ msgstr "&Animazioni menu:" msgid "&Menu contents:" msgstr "&Contenuti menu:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Unisci" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Unisci..." @@ -910,7 +925,7 @@ msgstr "&Minimizza" #. Resource IDs: (32880) msgid "&Moved blocks" -msgstr "" +msgstr "Blocchi &spostati" #. Resource IDs: (1515) msgid "&Name" @@ -938,12 +953,16 @@ msgstr "&Nuovo..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Avanti >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Pagina successiva" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Evento non-doppio clic" @@ -960,11 +979,11 @@ msgstr "&Nessuno" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Una pagina" @@ -972,19 +991,15 @@ msgstr "&Una pagina" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Apri" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -997,18 +1012,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Sovrapponi immagini" +msgid "&Overlay images\tO" +msgstr "&Sovrapponi immagini\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Password:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Incolla" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Prendi TUTTO" @@ -1016,7 +1031,7 @@ msgstr "&Prendi TUTTO" msgid "&Port:" msgstr "&Porta:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Anteprima di stampa" @@ -1024,11 +1039,15 @@ msgstr "&Anteprima di stampa" msgid "&Print..." msgstr "&Stampa..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "Stam&pa...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1036,10 +1055,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Messaggi recenti" @@ -1052,7 +1075,7 @@ msgstr "" msgid "&Red:" msgstr "&Rosso:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Ripeti" @@ -1068,7 +1091,7 @@ msgstr "&Aggiorna" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1076,7 +1099,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "&Ramo Remoto:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1084,7 +1107,7 @@ msgstr "" msgid "&Remote:" msgstr "&Remoto:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Rimuovi" @@ -1096,7 +1119,7 @@ msgstr "" msgid "&Replace" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Browser &repository" @@ -1104,7 +1127,7 @@ msgstr "Browser &repository" msgid "&Reset" msgstr "&Ripristina" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Ripristina barra strumenti" @@ -1120,23 +1143,27 @@ msgstr "&Ripristina dati utilizzo" msgid "&Reset to Default" msgstr "&Ripristina predefinito" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Ripristina le modifiche da questo invio" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Ripristina le modifiche da questi invii" @@ -1148,7 +1175,7 @@ msgstr "&Client SSH:" msgid "&Saturation:" msgstr "&Saturazione:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Salva" @@ -1156,15 +1183,19 @@ msgstr "&Salva" msgid "&Save authentication" msgstr "&Salva autentificazione" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Salva grafico come..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Salva elenco file selezionati in..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Salva\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1172,7 +1203,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Impostazioni" @@ -1192,7 +1223,7 @@ msgstr "&Visualizza etichette" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Salta" @@ -1200,7 +1231,7 @@ msgstr "&Salta" msgid "&Squash" msgstr "&Integra commento" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1212,7 +1243,7 @@ msgstr "" msgid "&Start Group" msgstr "&Crea gruppo" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1232,7 +1263,7 @@ msgstr "Vista &simboli" msgid "&Tab size:" msgstr "Dimensione &tabulatore:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Documento con tabulazioni" @@ -1240,7 +1271,7 @@ msgstr "&Documento con tabulazioni" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Tag" @@ -1276,7 +1307,7 @@ msgstr "" msgid "&Toolbars:" msgstr "Barra strumen&ti" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1288,7 +1319,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Due pagine" @@ -1296,15 +1331,15 @@ msgstr "&Due pagine" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Annulla modifica" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Confronto &unificato" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1316,7 +1351,7 @@ msgstr "&Unità sconosciute" msgid "&Up" msgstr "&Su" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Aggiorna l'elemento alla revisione" @@ -1328,11 +1363,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "Completa a&utomaticamente percorsi e parole chiave" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Utente:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Visualizza" @@ -1340,7 +1375,7 @@ msgstr "&Visualizza" msgid "&View:" msgstr "&Visualizza:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Segnala le mancate conferme durante l'invio" @@ -1356,6 +1391,10 @@ msgstr "&Tutta la parola" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Ignora cambiamento di spaziatura" @@ -1364,46 +1403,46 @@ msgstr "&Ignora cambiamento di spaziatura" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(nessun elenco modifiche)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(nessun numero di linea)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(nessun valore)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(non trovato)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(sconosciuto)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "" @@ -1411,13 +1450,14 @@ msgstr "" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1425,7 +1465,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1441,7 +1481,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1457,31 +1497,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1490,66 +1530,66 @@ msgid "" "And read the manual!" msgstr "TortoiseSVN è un'estensione della shell.\nCiò significa che viene integrata nell'explorer di Windows.\nPer utilizzare TortoiseSVN aprire una qualsiasi finestra e utilizzare il tasto destro su una qualsiasi cartella\nper visualizzare il menu contestuale con tutti i comandi disponibili\n in TortoiseSVN.\nInoltre si consiglia di leggere il manuale!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Attenzione: nessuno ha verificato se questi rami sono stati riuniti completamente nella revisione HEAD" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Attenzione: questa azione rimuoverà i rami da remoto." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1557,7 +1597,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1569,71 +1609,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Una lista, separata da caratteri di a capo, di percorsi per i quali vengono visualizzate icone di stato.\nSe si aggiunge '*' alla fine di un percorso, allora anchetutti i file e le sottodirectory di quel percorso vengono incluse." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Una lista, separata da caratteri di a capo, di percorsi per cui non viene visualizzato il menu contestuale.\r\nSe si aggiunge '*' alla fine di un percorso, allora anche tutti i files e le sotto cartelle in quel percorso saranno escluse.\r\nSe l'elenco è vuota, il menu contestuale sarà visualizzato su tutti i percorsi." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Una lista, separata da caratteri di a capo, di percorsi per cui non vengono visualizzate icone di stato.\nSe si aggiunge '*' alla fine di un percorso, allora anche tutti i files e le sottodirectory in quel percorso saranno escluse.\nSe la lista è vuota, le icone di stato saranno visualizzate su tutti i percorsi." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Manca una risorsa necessaria." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Un visualizzatore per i file GNU diff (file patch).\r\nSe non ne hai uno usa Blocco Note." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "A&nnulla" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&Informazioni su" @@ -1649,23 +1689,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Annulla" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "&Interrompi l'unione" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Informazioni su" @@ -1685,12 +1725,12 @@ msgstr "Informazioni su TortoiseGitMerge" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Non è stato possibile accedere a %1." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Azione" @@ -1698,26 +1738,26 @@ msgstr "Azione" msgid "Action log" msgstr "Registro delle attività" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Azioni" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Lista dei task attivi" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "File attivi" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Gli oggetti ActiveX non possono essere salvati mentre si esce da Windows!\nAnnullare tutte le modifiche a %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Aggiungi" @@ -1725,7 +1765,7 @@ msgstr "Aggiungi" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Aggiungi '%s' al dizionario" @@ -1738,15 +1778,15 @@ msgstr "Aggiungi Remoto" msgid "Add \"&Signed-off-by\"" msgstr "Aggiungi \"&Confermato da\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Aggiungi applicazione di confronto per l'estensione" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Aggiungi applicazione di fusione per l'estensione" @@ -1754,15 +1794,15 @@ msgstr "Aggiungi applicazione di fusione per l'estensione" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Aggiungi all'elenco &ignorati" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Aggiungi alla barra di accesso veloce" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Aggiungi..." @@ -1770,37 +1810,37 @@ msgstr "Aggiungi..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Aggiungi/modifica applicazione di confronto/fusione per estensione specifica" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Aggiunto" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" "%s\n" "to the ignore list." -msgstr "Aggiunto il file modello⏎\n%s\nall'elenco ignorati." +msgstr "Aggiunto il file modello\n\n%s\nall'elenco ignorati." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Aggiunta..." -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Aggiunge file al controllo di Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Aggiunge i file selezionato la maschera file all'elenco ignorati" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Configura le impostazioni\nImpostazioni" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avanzate" @@ -1808,43 +1848,43 @@ msgstr "Avanzate" msgid "Advanced Diff/Merge Settings" msgstr "Impostazioni avanzate di fusione / confronto" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Impostazioni avanzate di confronto" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Impostazioni avanzate di fusione" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Tutto" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Tutti i Comandi" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Tutti i file (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Tutti i file (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1852,47 +1892,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Tutte le modifiche andranno perse! Ripristinare tutte le barre ed i menu?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Tutte le modifiche andranno perse! Ripristinare le assegnazioni dei tasti?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Tutte le modifiche andranno perse! Ripristinare il menu '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Tutte le modifiche andranno perse! Ripristinare la barra '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" -msgstr "" +msgstr "Abilita modifica per questa vista\nAbilita modifica" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Già aggiornato." @@ -1908,11 +1948,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Utilizza sempre le impostazioni del sistema locale per mostrare ore e date" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1920,12 +1960,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Un editor alternativo. Che dovrebbe supportare preferibilmente terminazioni di linea *nix" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1936,7 +1976,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1949,36 +1989,36 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Un handle non valido è stato associato a %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Si è verificano un errore inaspettato." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Si è verificato un errore inaspettato durante l'accesso a %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "E' stato trovato un tipo di linea sconosciuto alla linea %d!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" -msgstr "" +msgstr "Accoda il blocco di destra" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" -msgstr "" +msgstr "Accoda questo blocco a sinistra" #. Resource IDs: (65535) msgid "Application Frame Menus: " @@ -1988,11 +2028,11 @@ msgstr "Menu dei frame dell'applicazione:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Applica Patch..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Applica patch..." @@ -2000,7 +2040,7 @@ msgstr "Applica patch..." msgid "Apply Patches" msgstr "Applica patch" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -2008,7 +2048,7 @@ msgstr "" msgid "Apply unified diff" msgstr "Applica confronto unificato" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Tema acqua" @@ -2016,39 +2056,39 @@ msgstr "Tema acqua" msgid "Arabic" msgstr "" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Marcare il/i file in conflitto come risolti?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Si è sicuri di voler ripristinare %d oggetto(i)? Così facendo tutte le modifiche effettuate dall'ultimo aggiornamento andranno perse." -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Affianca &verticalmente" +msgid "Arrange &vertical\tV" +msgstr "Affianca &verticalmente\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Assegnato all'elenco modifiche '%s'" @@ -2057,11 +2097,11 @@ msgstr "Assegnato all'elenco modifiche '%s'" msgid "Assigned to:" msgstr "Assegnato a:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2073,34 +2113,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Alla revisione: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "È stata tentata un'operazione non supportata." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Si è tentato di accedere a %1 oltre la sua fine." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Si è tentato di leggere dal file %1 in fase di scrittura." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Si è tentato di scrivere sul file %1 in lettura." @@ -2117,11 +2157,11 @@ msgstr "Autenticazione" msgid "Authentication data" msgstr "Dati autenticazione" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autore" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2129,7 +2169,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autore:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autori" @@ -2151,11 +2191,11 @@ msgstr "Conversione automatica CrLf" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Nascondi automaticamente" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Nascondi automaticamebnte tutto" @@ -2163,23 +2203,23 @@ msgstr "Nascondi automaticamebnte tutto" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Chiudi automaticamente in assenza di conflitti" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Chiudi automaticamente in assenza di errori" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Chiudi automaticamente se non ci sono fusioni, aggiunte o eliminazioni" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2193,7 +2233,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatico" @@ -2203,7 +2243,7 @@ msgstr "Verifica automaticamente la disponibilità di &nuove versioni ogni setti #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Test dell'auto testo" #. Resource IDs: (1157) msgid "Average" @@ -2213,19 +2253,19 @@ msgstr "Media" msgid "B&rowse..." msgstr "S&foglia..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Indietro" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Sfondo" #. Resource IDs: (65535) msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Grafico a barre" @@ -2245,7 +2285,7 @@ msgstr "File di base:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2257,45 +2297,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\na bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Tema nero" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Biasima" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Biasima ogni linea di ogni file di uno specifico autore " @@ -2303,26 +2343,30 @@ msgstr "Biasima ogni linea di ogni file di uno specifico autore " msgid "Blend alpha" msgstr "Canale alpha" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Tema blu" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Sia /logmsg che /logmsgfile sono stati specificati!\nSolo uno dei due può essere specificato." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Entrambi i percorsi del file patch e del percorso destinazione devono essere percorsi assoluti!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2334,30 +2378,30 @@ msgstr "S&foglia..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ramo" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2369,11 +2413,11 @@ msgstr "Ramo:" msgid "Bro&wse" msgstr "&Sfoglia" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Cerca l'applicazione esterna di confornto" @@ -2385,19 +2429,19 @@ msgstr "" msgid "Browse..." msgstr "Sfoglia..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "E&spressione Bug-ID:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-ID" @@ -2413,7 +2457,7 @@ msgstr "" msgid "Button Appearance" msgstr "Aspetto dei pulsanti" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2429,7 +2473,7 @@ msgstr "Controlla &adesso" msgid "C&ommands:" msgstr "C&omandi:i" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&rea ramo/etichetta dalla revisione" @@ -2437,11 +2481,11 @@ msgstr "C&rea ramo/etichetta dalla revisione" msgid "C&urrent Keys:" msgstr "Tasti c&orrenti:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Taglia" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "MAIU" @@ -2457,11 +2501,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "E' possibile fare doppio clic nell'elenco dei registri attività per confrontare con revisioni precedenti" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Non posso attivare un oggetto ActiveX statico." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2470,80 +2514,80 @@ msgid "" "%s" msgstr "Non si puo' copiare da\n%s\na\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Impossibile copiare immagine bitmap negli Appunti!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Non posso creare una nuova immagine!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Non posso personalizzare i menu!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Non posso incollare immagini bitmap dagli Appunti!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Annulla" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "" +msgstr "Annulla\nNon modificare le viste" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "" +msgstr "Annulla\nMantieni il file vuoto." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "" +msgstr "Annulla\nRisolvi il conflitto." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" -msgstr "" +msgstr "Annulla\nMantieni i file attuali" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" -msgstr "" +msgstr "Annulla\nMantieni le impostazioni attuali" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Impossibile mostrare il confronto a causa di caratteri di a capo inconsistenti nel file." @@ -2555,9 +2599,9 @@ msgstr "Casca&ta" msgid "Cascaded context menu" msgstr "Menu contestuale a tendina" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Considera differenza tra maiuscole e minuscole" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2579,33 +2623,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Modifica il tema dell'applicazione\nModifica tema" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Cambia la posizione della finestra" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Cambia le dimensioni della finestra" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2613,38 +2657,38 @@ msgstr "" msgid "Changed Files" msgstr "File modificati" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "File modificati tra %s, %s e %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "File modificati: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Elenco modifiche %s spostata" @@ -2653,15 +2697,15 @@ msgstr "Elenco modifiche %s spostata" msgid "Changes made (double-click on file for diff):" msgstr "Modifiche effettuate (fare doppio clic sul file per il confronto):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Modifica il tema dell'applicazione" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Posizione del carattere dove mostrare una linea di confine nelle fineetra di invio:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Controllo aggiornamenti" @@ -2673,31 +2717,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Controllo aggiornamenti..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Controlla l'esistenza di modi&fiche" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Controlla il percorso e/o la URL." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Seleziona le voci di menu che si vogliono far apparire direttamente nel menu contestuale invece che nel sottomenu di TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Seleziona per usare un formato di data e ora abbreviato nei messaggi di log" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Seleziona per usare nei commenti un formato di data e ora abbreviato" @@ -2705,31 +2749,31 @@ msgstr "Seleziona per usare nei commenti un formato di data e ora abbreviato" msgid "Check:" msgstr "Controlla:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Ritira" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2737,11 +2781,11 @@ msgstr "" msgid "Chinese" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Scegli il Repository" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2753,78 +2797,78 @@ msgstr "Puli" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Pulizia in corso" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Pulizia in corso." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "La pulizia ha fallito nel processare i seguenti percorsi:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "La pulizia ha processato con successo i seguenti percorsi:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Azzera" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Strumento di cancellazione\nAzzera" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Cancella %ld coppie di nomi utenti e password, %ld certificati ssl e %ld nomi utenti" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Elimina i registri attività salvati nei %ld repository" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Elimina tutte le informazioni di autenticazione memorizzate\r\nSarà necessario specificare di nuovo nome utente e password per tutti i repository." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Elimina le dimensioni e le posizioni di %ld finestre di dialogo" @@ -2833,7 +2877,7 @@ msgstr "Elimina le dimensioni e le posizioni di %ld finestre di dialogo" msgid "Click here to go to the website" msgstr "Fai clic qui per andare nel sito web" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Fai clic qui per selezionare i commenti utilizzati di recente" @@ -2849,17 +2893,17 @@ msgid "" "extension" msgstr "Fai clic su \"Avanzate\" per specificare i programmi esterni in base all'estensione" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Fai clic per vedere i comandi per spostare blocchi di testo\nUsa blocchi di testo" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Appunti" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2867,7 +2911,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Clone il repository esistente" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Clona un repository" @@ -2875,49 +2919,49 @@ msgstr "Clona un repository" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Facciendo clone..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Chiudi" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Chiudi schermo intero" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Chiudi Anteprima di stampa\n&Chiudi" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Chiudi manualmente" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Chiudi la finestra con richiesta di salvataggio" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Minimizza" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2929,7 +2973,7 @@ msgstr "Colore" #. Resource IDs: (32785) msgid "Color by age, &continuous" -msgstr "" +msgstr "Colore in base all'età, &continuo" #. Resource IDs: (138, 16961, 65535) msgid "Colors" @@ -2943,7 +2987,7 @@ msgstr "Colori:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2951,11 +2995,11 @@ msgstr "" msgid "Comman&ds:" msgstr "Coman&di:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Comando" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Linea di comando" @@ -2963,7 +3007,7 @@ msgstr "Linea di comando" msgid "Command Line To Execute:" msgstr "Linea di comando da eseguire:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Impossibile eseguire il comando." @@ -2971,41 +3015,41 @@ msgstr "Impossibile eseguire il comando." msgid "Commands" msgstr "Comandi" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Invia" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "" @@ -3013,7 +3057,7 @@ msgstr "" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3021,19 +3065,19 @@ msgstr "" msgid "Commit to:" msgstr "Invia a:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Invia..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Invii per autore" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Invii per data" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Invia ogni %s:" @@ -3042,15 +3086,15 @@ msgstr "Invia ogni %s:" msgid "Commits each week:" msgstr "Invia ogni settimana:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Invia i cambiamenti al repository" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3062,52 +3106,52 @@ msgstr "l'invio di una cartella senza versione non aggiungerà ricorsivamente i msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Confronta revisioni &INTESTAZIONE" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Compara due file" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Confronta spaziature" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Confronta con la b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Confronta con revisioni precedenti" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Confronto tutti gli spazi bianchi quando faccio il confronto\nConfronta spazi bianchi" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Confronta il file con l'ultima revisione inviata in modo da mostrare i cambiamenti apportati" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Paragonando %s a %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Completato" @@ -3123,7 +3167,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3157,11 +3201,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "" @@ -3169,15 +3213,15 @@ msgstr "" msgid "Conflict resolved" msgstr "Conflitto risolto" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "In conflitto" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflitti" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflitti: %d" @@ -3190,124 +3234,124 @@ msgstr "Menu contestuale:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continua" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Contrai la finestra agganciata" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" -msgstr "" +msgstr "Converti spazi in tab" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" -msgstr "" +msgstr "Converti tab in spazi" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Copia" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copiato" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copia" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copia %s in %s, revisione %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Strumento di Copia\nCopia" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copia tutte le informazioni negli Appunti" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copia e rinomina" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copia percorsi negli Appunti" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copia la selezione negli a&ppunti" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copia il testo selezionato e lo copia negli Appunti\nCopia" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copia negli Appunti" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copia: nuovo nome per %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Copia di %s in corso" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Copia in corso..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Correzioni" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Impossibile aggiungere %s all'elenco 'ignora'!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Impossibile controllare l'esistenza di nuove versioni!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3315,76 +3359,76 @@ msgid "" "%s" msgstr "Impossibile copiare i file!\n \n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 non può essere creato: il disco è pieno." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Impossibile ottenere l'ultima revisione inviata!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Impossibile ottenere lo stato!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 non può essere aperto: troppi file aperti contemporaneamente." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Impossibile aprire il file/n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 non può essere rimosso perchè si tratta della cartella corrente." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Impossibile rimuovere %s dall'elenco 'ignora'" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Impossibile ripristinare il primo invio (primo step). Annullamento in corso..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Impossibile ripristinare l'ultimo invio (secondo step). Annullamento in corso..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Impossibile ottenere l'URL del file!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Impossibile ottenere la revisione %s del file %s\nImpossibile applicare la patch." -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3392,7 +3436,7 @@ msgid "" "%s" msgstr "Impossibile eseguire il programma di confronto!\n \n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3400,7 +3444,7 @@ msgid "" "%s" msgstr "Impossibile eseguire il programma esterno di confronto!\n \n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3408,11 +3452,11 @@ msgid "" "%s" msgstr "Impossibile eseguire il programma esterno di fusione!\n \n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Impossibile eseguire la stampa." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3420,22 +3464,22 @@ msgid "" "%s" msgstr "Impossibile aprire il visualizzatore di testo!\n \n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Impossibile avviare il thread!" #. Resource IDs: (1501) msgid "Coun&t" -msgstr "" +msgstr "Conta" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." -msgstr "" +msgstr "Calcolo: %u trovati" #. Resource IDs: (1683) msgid "Create &Library" @@ -3445,15 +3489,15 @@ msgstr "Crea &libreria" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Crea un ramo a questa versione..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Crea un ramo..." @@ -3465,29 +3509,29 @@ msgstr "Crea elenco modifiche" msgid "Create New Branch" msgstr "Crea Nuovo Ramo" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3496,49 +3540,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Crea file patch" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Creato" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Crea un file di patch dalle differenze dei due file\nCrea un file di patch" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Crea un repository nella cartella corrente" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Crea un file unificato di confronto per tutte le modifiche apportate" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3550,7 +3594,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Taglia" @@ -3558,7 +3602,7 @@ msgstr "&Taglia" msgid "Current" msgstr "Corrente" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Ramo attuale" @@ -3566,7 +3610,7 @@ msgstr "Ramo attuale" msgid "Current Branch:" msgstr "Ramo attuale:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3578,7 +3622,7 @@ msgstr "" msgid "Current version is:" msgstr "versione attuale:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Versione attuale:: %s" @@ -3591,7 +3635,7 @@ msgstr "Per&sonalizza..." msgid "Custom" msgstr "Personalizzato" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personalizza" @@ -3599,19 +3643,19 @@ msgstr "Personalizza" msgid "Customize Keyboard" msgstr "Personalizza Tastiera" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Personalizza barra di accesso veloce" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Personalizza barra di accesso veloce..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Personalizza..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3625,88 +3669,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Data" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Predefinito" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menu predefinito" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Menu predefinito dell'applicazione. Appare quando i documenti sono aperti." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Codifica preefinita UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Elimina" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Elimina e &ignora %d elementi per nome" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Cancella e aggiungi alla lista di file da &ignorare" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Elimina e ignora %d elementi per &estensione" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3714,34 +3762,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "" +msgstr "Elimina\nIl file è stato rimosso." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Eliminato" @@ -3749,36 +3797,36 @@ msgstr "Eliminato" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Elimina e aggiungi il/i file selezionato/i o la maschera per i file all'elenco 'ignora'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Elimina il file del registro attività" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Eliminazione" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Cancellazione dati della cache" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Cancellazione file" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3788,7 +3836,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Profondità" #. Resource IDs: (65535) msgid "Describe" @@ -3798,7 +3846,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Descrizione" @@ -3806,7 +3854,7 @@ msgstr "Descrizione" msgid "Description:" msgstr "Descrizione:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Deseleziona elenco modifiche" @@ -3814,33 +3862,33 @@ msgstr "Deseleziona elenco modifiche" msgid "Destination" msgstr "Destinazione" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Il disco di destinazione è pieno." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Rileva ed evidenzia blocchi spostati" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3854,11 +3902,15 @@ msgstr "Dimensione e posizione delle finestre di dialogo" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Opzioni diff" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3890,7 +3942,7 @@ msgstr "File di confronto:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3902,12 +3954,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3920,19 +3972,19 @@ msgstr "Differenza tra" msgid "Diffing" msgstr "Confronta" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3944,26 +3996,26 @@ msgstr "Cartelle:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disco pieno durante l'accesso a %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Eccezione: %1" @@ -3972,44 +4024,52 @@ msgstr "Eccezione: %1" msgid "Display &buttons in this order" msgstr "Visualizza &pulsanti in questo ordine" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Visualizza la guida in linea facebndo clic su pulsanti, menu e finestre\nGuida in linea" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Visualizza la guida in linea per l'attività o il comando corrente\nGuida in linea" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Visualizza le istruzioni su come usare la Guida in linea\nGuida in linea" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Visualizza le informazioni sul programma, sulla versione e sul copyright\nInfo su" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4022,54 +4082,71 @@ msgstr "Non visualizzare il menu contestuale per i seguenti percorsi:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Eliminare la barra '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Spostare questo file o questa cartella?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,7 +4154,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4085,21 +4162,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" -msgstr "" +msgstr "Caricare i file modificati?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4107,21 +4184,21 @@ msgid "" "as resolved?" msgstr "Vuoi marcare il file\n%s\ncome risolto?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Recuperare questi documenti salvati automaticamente?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Ricaricare il documento per adattarlo ai cambiamenti di impostazione?\nNota: così facendo tutti i cambiamenti apportati verranno persi!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Vuoi vedere le modifiche?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4129,42 +4206,42 @@ msgstr "" msgid "Document :" msgstr "Documento:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Non recuperare i documenti salvati automaticamente\nUtilizza l'ultima versione dei documenti salvata esplicitamente " -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" -msgstr "" +msgstr "Non salvare\nChiudi la vista senza salvare le modifiche" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "" +msgstr "Non salvare\nRicarica la vista senza salvare le modifiche" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Non visualizzare più questo messaggio" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Fatto" @@ -4176,7 +4253,7 @@ msgstr "&Giù" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Trascina per rendere questo menu flottante" @@ -4204,6 +4281,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "Percorsi da e&scludere:" @@ -4212,7 +4293,7 @@ msgstr "Percorsi da e&scludere:" msgid "E&xit" msgstr "&Esci" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&sporta..." @@ -4232,11 +4313,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Modifica" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4252,23 +4333,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Modifica immagine pulsante" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Modifica Note" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Modifica autore" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Modifica programma di confronto l'estensione" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Modifica programma di fusione l'estensione" @@ -4280,11 +4361,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Modifica la configurazione locale di git" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Modifica commento" @@ -4304,25 +4385,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Il nome o l'indirizzo IP del server proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Strumento ellissi\nEllissi" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4330,9 +4411,9 @@ msgstr "" msgid "Empty" msgstr "Vuoto" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" -msgstr "" +msgstr "Abilita modifica" #. Resource IDs: (1510) msgid "Enable EditorConfig" @@ -4344,9 +4425,9 @@ msgstr "" #. Resource IDs: (1788) msgid "Enable drag context menu" -msgstr "" +msgstr "Abilita menu contestuale trascinabile" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4355,10 +4436,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Gestori di overlay abilitati" @@ -4367,35 +4452,35 @@ msgstr "Gestori di overlay abilitati" msgid "Encode" msgstr "Codifica" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" -msgstr "" +msgstr "Codifica" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Si è verificato un errore hardware di I/O durante l'accesso a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Si è verificata una violazione di blocco cercando di accedere a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Si è verificata una violazione di condivisione cercando di accedere a %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "E' stato fornito un argomento improprio." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Si è verificato un errore inaspettato durante la lettura di %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Si è verificato un errore inaspettato durante la scrittura di %1." @@ -4408,11 +4493,11 @@ msgstr "" msgid "End" msgstr "Fine" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" -msgstr "" +msgstr "Stile della fine della riga" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Allarga la finestra a tutto schermo" @@ -4420,23 +4505,23 @@ msgstr "Allarga la finestra a tutto schermo" msgid "Enter Log Message" msgstr "Inserire un commento" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Inserire un URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Inserire un GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Inserire una valuta." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Inseire una data e/o un orario." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Inserire una data." @@ -4444,90 +4529,90 @@ msgstr "Inserire una data." msgid "Enter a name for the changelist:" msgstr "Inserire un nome per la lista modifiche:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Inserire un numero fra %1 e %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Inserire un numero." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Inserire un numero intero positivo." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Inserire un'orario." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Inserire un numero intero fra %1 e %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Inserire un numero intero fra 0 e 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Inserire un numero intero." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Inserire qui sotto contenuto file da testare:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Inserire un co&mmento:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Non inserire più di %1 carattere(i)." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Inserire qui sotto la stringa regex:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Elimina tutto\nElimina tutto" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Elimina la selezione\nElimina" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Errore" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Errore durante la ricostruzione della cache delle icone di stato!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Errore in lettura/scrittura sulla chiave di registro %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Tutto aggiornato." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4537,28 +4622,28 @@ msgstr "Eseguibile (*.exe)|*.exe|Eseguibile (*.com)|*.com|Informazioni (*.pdf)|* msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Esistente" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Esci" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Espandi (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Espandi finestra agganciata" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Apri percorso file" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Esporta..." @@ -4566,36 +4651,36 @@ msgstr "Esporta..." msgid "Export Zip File" msgstr "Esportare File Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Esporta cartella:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Esporta anche i file senza versione" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Esportazione di %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Esportazione..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Estensione" @@ -4611,7 +4696,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Esterno" @@ -4619,101 +4704,101 @@ msgstr "Esterno" msgid "External Program:" msgstr "Programma esterno:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Dissolvenza" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Impossibile ripristinare versione precedente" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Connessione fallita.\nPossibile collegamento corrotto." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Conversione di oggetto ActiveX fallita." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Creazione di un documento vuoto fallita." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Errore nella creazione dell'oggetto. Assicurarsi che l'applicazione è stata inserita nel registro di sistema." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Impossibile eseguire la Guida in linea." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Esecuzione applicazione server fallita." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Impossibile aprire il documento." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Operazione server non riuscita." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Impossibile salvare il documento." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Impossibile impostare/rimuovere l'elenco modifiche '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Errore nell'avvio dell'issue tracker COM '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Fallito!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4721,62 +4806,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Recuperare" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Recupero del file...." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Recupero della revisione %s del file:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "File" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" -msgstr "" +msgstr "Codifica file" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Cambiamenti nei file ogni %s:" @@ -4785,27 +4870,27 @@ msgstr "Cambiamenti nei file ogni %s:" msgid "File changes each week:" msgstr "Cambiamenti nei file ogni settimana:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Confronto di file" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" -msgstr "" +msgstr "Il file non ha conflitti" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." -msgstr "" +msgstr "Il file è vuoto" -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Lìelenco dei file è vuota" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Patch" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4817,7 +4902,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensione file:\t\t%s (%s)\nLarghezza:\t\t\t%ld pixel\nAltezza:\t\t\t%ld pixel\nRisoluzione orizzontale:\t%.1f dpi\nRisoluzione verticale:\t%.1f dpi\nProfondità:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4837,7 +4922,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensione file:\t\t%s (%s)\nLarghezza:\t\t\t%ld pixel\nAltezza:\t\t\t%ld pixel\nRisoluzione orizzontale:\t%.1f dpi\nRisoluzione verticale:\t%.1f dpi\nProfondità:\t\t\t%d bit\nZoom:\t\t\t%d%%\nDimensione file:\t\t%s (%s)\nLarghezza:\t\t\t%ld pixel\nAltezza:\t\t\t%ld pixel\nRisoluzione Orizzontale:\t%.1f dpi\nRisoluzione verticale:\t%.1f dpi\nProfondità:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4849,7 +4934,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensione file:\t\t%s (%s)\nLarghezza:\t\t\t%ld pixel\nAltezza:\t\t\t%ld pixel\nRisoluzione orizzontale:\t%.1f dpi\nRisoluzione verticale:\t%.1f dpi\nProfondità:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4869,7 +4954,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensione file:\t\t%s (%s)\nLarghezza:\t\t\t%ld pixel\nAltezza:\t\t\t%ld pixel\nRisoluzione orizzontale:\t%.1f dpi\nRisoluzione verticale:\t%.1f dpi\nProfondità:\t\t\t%d bit\nZoom:\t\t\t%d%%\nDimensione file:\t\t\t%s (%s)\nLarghezza:\t\t\t%ld pixel\nAltezza:\t\t\t%ld pixel\nRisoluzione orizzontale:\t%.1f dpi\nRisoluzione verticale:\t\t%.1f dpi\nProfondità:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nome del file" @@ -4877,33 +4962,33 @@ msgstr "Nome del file" msgid "Files" msgstr "File" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Strumento di riempimento\nRiempi" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtra per" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtra percorsi" #. Resource IDs: (1479) msgid "Filter:" -msgstr "" +msgstr "Filtra:" #. Resource IDs: (20090) msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Trova" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4913,41 +4998,41 @@ msgstr "Trova il testo specificato\nTrova" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." -msgstr "" +msgstr "Trova: Prima occorrenza dal fondo trovata. Inizio del documento raggiunto." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." -msgstr "" +msgstr "Trova: Prima occorrenza dall'inizio trovata. Fine del documento raggiunta." #. Resource IDs: (65535) msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Fine" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Completato!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Il primo nodo sovrastante" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Il primo nodo sovrastante solamente" @@ -4956,18 +5041,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Drive per Dischetti (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Cartella" @@ -4979,38 +5064,34 @@ msgstr "" msgid "Font" msgstr "Carattere" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Per ottenere aiuto premere F1. Per far scorrere il testo orizzontalmente utilizzare la rotella del mouse tenendo premuto il tasto Ctrl" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Per ottenere la cronologia completa deselezionare 'Sospendi durante la copia/la rinomina'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forza" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5028,20 +5109,20 @@ msgstr "" msgid "Format Patch" msgstr "Formattazione del Patch" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Inoltra" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5049,7 +5130,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Trova parole automatiche;" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5071,11 +5152,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5083,7 +5164,7 @@ msgstr "" msgid "From:" msgstr "Da:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Schermo intero" @@ -5091,7 +5172,7 @@ msgstr "Schermo intero" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Completamente ricorsivo" @@ -5099,32 +5180,32 @@ msgstr "Completamente ricorsivo" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" -msgstr "" +msgstr "G&ravatar" #. Resource IDs: (5061) msgid "GB2312 (Simplified)" msgstr "GB2312 (Semplificato)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Impossibile inizializzare GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ non riesce a creare un oggetto bitmap. Probabilmente la memoria è insufficente." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Raccolta informazioni. Attendere..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5154,43 +5235,43 @@ msgstr "Generale::Menu contestuale" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Generale::Finestre di dialogo 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Generale::Finestre di dialogo 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Generale::Finestre di dialogo 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Richiedi registri attività di fusione" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Ottenimento file %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Ottenimento del file %s, revisione %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Ricezione informazioni..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Ricezione informazioni richieste..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Ricezione confronto unificato" @@ -5202,23 +5283,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Copia Git e aggiungi i file a questa copia di lavoro" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Copia Git e rinomina qui gli elementi con versione" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Copia GIt qui gli elementi con versione" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Esporta GIt qui tutti gli elementi" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Esporta Git qui tutti gli elementi" @@ -5226,35 +5307,35 @@ msgstr "Esporta Git qui tutti gli elementi" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Sposta Git e rinomina qui elemento con versione" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Sposta git qui gli elementi con versione" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5266,31 +5347,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5311,7 +5392,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5323,47 +5404,47 @@ msgstr "Vai alla linea" msgid "Go to line" msgstr "Vai alla linea" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Vai al prossimo conflitto\nProssimo conflitto" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Vai alla prossima differenza\nProssima differenza" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Vai alla differenza inline successiva\nDifferenza inline successiva" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Vai al conflitto precedente\nConflitto precedente" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Vai alla differenza precedente\nDifferenza precedente" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Vai alla precedenet differenza inline\nDifferenza inline precedente" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Vai alla linea" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Grafico" @@ -5379,11 +5460,11 @@ msgstr "Grigio" msgid "Greek" msgstr "Greco" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Raggruppa elenco modifiche" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5399,7 +5480,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5411,7 +5492,7 @@ msgstr "" msgid "Hebrew" msgstr "Ebraico" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Guida in linea" @@ -5435,11 +5516,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Nascondi menu per percorsi senza versione" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Nascondi finestra agganciata" @@ -5447,25 +5528,25 @@ msgstr "Nascondi finestra agganciata" msgid "Hide the script while running" msgstr "Nascondi lo script mentre è attivo" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "NAscondi/visualizza elenco file patch" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Nascondi/mostra l'elenco dei file patch\nNasconde o mostra l'elenco dei file patch" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5475,7 +5556,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Suggerimento: seleziona il menu contestuale, modifica la pagina in 'Comandi' e trascina i pulsanti della barra nella finestra del menu." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Home" @@ -5491,7 +5572,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Script aggancio::Integrazione Issue Tracker" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tipo agagncio" @@ -5505,9 +5586,9 @@ msgstr "Percorsi da i&ncludere:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5515,55 +5596,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5571,15 +5653,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5603,7 +5685,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5611,7 +5693,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5619,7 +5701,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5627,16 +5709,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5647,17 +5729,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5669,7 +5751,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5733,7 +5815,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Sovrapposizioni icona" @@ -5745,7 +5827,7 @@ msgstr "Sovrapposizioni icona::Set di icone" msgid "Icon Overlays::Overlay Handlers" msgstr "Sovrapposizioni icona::Gestori sovrapposizione" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5755,52 +5837,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Icone/Design/Codice:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Se attivata, le icone di stato ed il menu contestuale non verranno visualizzate nelle finestre di dialogo 'Salva come...' o 'Apri'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Se selezionato, facendo doppio clic su una revisione nel registro attività la confronta con la revisione precedente" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Se selezionato, la finestra di dialogo per l'invio sarà riaperta automaticamente dopo un errore,\nmentre si conservano le ultime impostazioni immesse e l'ultimo messaggio del registro." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Se selezionato TortoiseGit controlla, una volta alla settimana, la disponibilità di nuove versioni" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Se selezionale, i file all'interno delle cartelle senza versione verranno mostrate nelle finestre di dialogo per il controllo dello stato.\r\nIl controllo dello stato è usato ad esempio nella finestra di invio." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5813,18 +5895,18 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignora" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignora %d elementi per &estensione" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" -msgstr "" +msgstr "Ignora Commenti" #. Resource IDs: (1692) msgid "Ignore File" @@ -5834,15 +5916,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignora cambiamenti nelle spaziature" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5850,11 +5932,11 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Ig&nora cambiamenti tra maiuscole/minuscole" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "" +msgstr "Ignora modifiche\nIgnora le modifiche esterne." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5868,11 +5950,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Ignora i caratt&eri di fine riga (raccomandato)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5880,29 +5962,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignora cambiamenti nelle spaziature" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorato" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignora tutti gli spazi bianchi quando fai la differenza\nIgnora tutte le modifiche di spazi bianchi" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5920,24 +6002,24 @@ msgstr "Imm&agine e testo" msgid "Images" msgstr "Immagini" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Figli immediati, includi cartelle" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importa" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importa %s in %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5946,16 +6028,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importazione del file %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5979,24 +6061,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Includi solo il seguente intervallo di revisioni:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nome di file non valido." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Importazione iniziale" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Differenze inline" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Differenze inline globale" @@ -6008,25 +6090,25 @@ msgstr "Differenze all'interno delle linee" msgid "Input" msgstr "Immissione" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Inserisce il contenuto degli Appunti\nIncolla" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Memoria insufficiente per completare l'operazione." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Errore interno dell'applicazione." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Valuta non valida." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6034,7 +6116,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6057,7 +6139,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6065,15 +6147,15 @@ msgstr "" msgid "Keep changelists" msgstr "Mantieni lista modifiche" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Mantenere il file in locale?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "" +msgstr "Continua a risolvere\nSalta al primo conflitto non risolto" #. Resource IDs: (16136) msgid "Keyboard" @@ -6083,7 +6165,7 @@ msgstr "Tastiera" msgid "Keyboard shortcuts:" msgstr "Abbreviazioni da tastiera:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Tasti" @@ -6125,21 +6207,41 @@ msgstr "RIGA8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Lingua:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Ultimo invio" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "" @@ -6147,7 +6249,11 @@ msgstr "" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6155,17 +6261,17 @@ msgstr "" msgid "Least active author:" msgstr "Ultimo autore attivo:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" -msgstr "" +msgstr "Lascia come in conflitto\nLo stato conflitto del file è mantenuto" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Vista sinistra:" @@ -6173,11 +6279,11 @@ msgstr "Vista sinistra:" msgid "Left image" msgstr "Immagine di sinistra" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Linee" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6191,12 +6297,12 @@ msgstr "Barra di co&nfronto delle linee" msgid "Line differences" msgstr "Differenze di linea" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Linea spostata dalla liena %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Linea spostata alla linea %ld" @@ -6209,26 +6315,26 @@ msgstr "" msgid "Line:" msgstr "Linea:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Linea: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Elenca i contenuti dell'Aiuto\nContenuti" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6246,23 +6352,23 @@ msgstr "Carica immagini" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "" +msgstr "Carica modifiche\nLe viste saranno aggiornate con i nuovi contenuti." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6270,13 +6376,13 @@ msgstr "" msgid "Local Branch" msgstr "Ramo locale" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Stato locale" @@ -6284,7 +6390,7 @@ msgstr "Stato locale" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6294,7 +6400,7 @@ msgstr "" msgid "Locator Bar" msgstr "Locator Bar" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Log" @@ -6334,12 +6440,12 @@ msgstr "Commenti (mostra finestra registo attività)" msgid "Login:" msgstr "Entra" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Revisione più bassa visualizzata: %ld - Revisione più alta visualizzata: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6350,7 +6456,7 @@ msgstr "Revisione più bassa visualizzata: %ld - Revisione più alta visualizzat msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6362,14 +6468,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "La DLL del sistema di mail non è valida." -#. Resource IDs: (156) -msgid "Main" -msgstr "Principale" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6382,47 +6484,47 @@ msgstr "" msgid "Manage" msgstr "" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Segna come risolto" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" -msgstr "" +msgstr "Marca come risolto\nLo stato del file diventa modificato" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Marca per la comparazione" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" -msgstr "" +msgstr "Blocchi segnati" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "&Considera maiuscole" @@ -6446,7 +6548,7 @@ msgstr "I me&nu mostrano prima i comandi più usati recentemente" msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Barra Menu" @@ -6454,7 +6556,7 @@ msgstr "Barra Menu" msgid "Menu s&hadows" msgstr "&Ombre Menu" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Fondi" @@ -6462,34 +6564,34 @@ msgstr "Fondi" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Unisci reintegrazioni" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Unito" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6497,22 +6599,22 @@ msgstr "" msgid "Merging" msgstr "Fusione" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Fusione da %s, revisione %s fino a %s, revisione %s in %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "La fusione tra file richiede revisioni differenti o differenti URL nei campi 'Da:' e 'A:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Fusione in corso della revisione %s di %s nella revisione %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Commento" @@ -6522,9 +6624,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "&espressione di parte del messaggio:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Commenti" @@ -6532,23 +6634,27 @@ msgstr "Commenti" msgid "Min" msgstr "Minimo" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Mio" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimizza il nastro" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Minimo numero di caratteri per un messaggio di commit:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Diversi" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Misto" @@ -6556,35 +6662,35 @@ msgstr "Misto" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Data di modifica" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Modificato" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Ancora" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Altri Pulsanti" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Altri Comandi..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Altri colori..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Ancora..." @@ -6604,41 +6710,41 @@ msgstr "Muovi &Giù" msgid "Move &Up" msgstr "Muovi &Su" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Muovi Elemento in Basso" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Muovi Elemento In Alto" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Sposta e rinomina" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Sposta nell'elenco modifiche" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Sposta/Rinomina" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Sposta: Nuovo nome per %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Sposta i file modificati nel cestino prima di tornare indietro" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Spostamento di %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Spostamento..." @@ -6646,23 +6752,23 @@ msgstr "Spostamento..." msgid "My file:" msgstr "Mio file:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nome" #. Resource IDs: (65535) msgid "Name:" -msgstr "" +msgstr "Nome:" #. Resource IDs: (156) msgid "Navigate" msgstr "Naviga" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6672,11 +6778,11 @@ msgstr "Vai a una specifica linea della vista\nVai alla linea" msgid "Navigation Pane Options" msgstr "Opzioni Pannello Navigazione" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opzioni Pannello Navigazione..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Annidato" @@ -6688,7 +6794,7 @@ msgstr "Rete" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nuovo" @@ -6697,43 +6803,43 @@ msgid "New &name:" msgstr "Nuovo &nome:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nuovo Ramo\\Etichetta" +msgid "New Branch/Tag" +msgstr "Nuovo Ramo/Etichetta" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nuovo Menu" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nuovo nome per %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" -msgstr "" +msgstr "Il nuovo nome non deve essere vuoto o identico al nome originale!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nuovo nome:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6741,33 +6847,29 @@ msgstr "" msgid "Next" msgstr "Successivo" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Prossima Pagina\nProssima Pagina" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Conflitto successivo" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Differenza successiva" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Differenza inline successiva" -#. Resource IDs: (73) -msgid "No" -msgstr "No" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6779,102 +6881,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nessun valore di comando specificato!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Nessuna differenza riscontrata!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Nessun messaggio d'errore disponibile" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nessun errore rilevato." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Nessun file o cartella è stato modificato. Non c'è niente da ripristinare per TortoiseGit!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Nessun file da mostrare con le impostazioni correnti.\nControllare una o più impostazioni in basso per vedere files non versionati, ignorati e/o non modificati.\nPer vedere le modifiche remote, fai clicre su 'Controlla Repositor'." +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Nessun file è stato modificato o aggiunto dall'ultimo\ninvio. Non c'è niente da\nfare per TortoiseGit..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Nessun file è stato modificato o aggiunto dall'ultimo\ninvio. Non c'è niente da\nfare per TortoiseGit...\nVuoi vedere i file senza versione?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Nessun grafico disponibile" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Non è stato trovato alcun codificatore di immagini per %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Nessuna versione precedente" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Nessuna correzione ortografica" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Nessuna cache di stato. Solo le cartelle versionate ricevono un'icona di stato, i file rimangono senza" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Nessun suggerimento sui sinonimi" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6882,11 +6989,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Nessuno" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normale" @@ -6898,30 +7005,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Non tutti gli elementi del registro (o del file INI) sono stati rimossi." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Memoria insufficiente per completare l'operazione." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Memoria insufficiente!\nProva a ridurre la dimensione del grafico delle revisioni da ciascun\nnodo collassabile o riducendo il fattore di zoom." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6929,7 +7036,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6948,26 +7055,26 @@ msgstr "Nota: la cartella contiene elementi senza versione" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Nota: questo influenza tutti i client Tortoise, non solo TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Note" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Niente da " -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Niente da inviare" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Avviso" @@ -6975,7 +7082,7 @@ msgstr "Avviso" msgid "Number Commits" msgstr "Numero di invii" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Numero di %s" @@ -6988,7 +7095,7 @@ msgstr "Numero di autori:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7060,41 +7167,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Colori Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7102,15 +7209,15 @@ msgstr "" msgid "Older lines" msgstr "Linee più vecchie" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Sono stati trovati uno o più documenti salvati automaticamente." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Uno o più file sono in conflitto." @@ -7122,29 +7229,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Solo file figli" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Sono ammessi solo numeri (eventualmente\nseparati da virgole)!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Solo questo elemento" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Apri" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7154,51 +7261,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Apri file per differenze o applica una patch\nApri file" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Apri dagli Appunti" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Apri immagine..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Apri livello superiore" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Apri con..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Apri la Guida in linea\nElementi della Guida" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opzione" @@ -7207,30 +7315,30 @@ msgid "Options" msgstr "Opzioni" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Dimensioni ori&ginali" +msgid "Ori&ginal size\tS" +msgstr "Dimensioni ori&ginali\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Altri pannelli task" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Altri" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Memoria insufficente." @@ -7238,7 +7346,7 @@ msgstr "Memoria insufficente." msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7246,20 +7354,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Pagina %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7270,15 +7382,15 @@ msgstr "Pagina %u\nPagine %u-%u\n" msgid "Page :" msgstr "Pagina:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametri" @@ -7286,25 +7398,25 @@ msgstr "Parametri" msgid "Parameters:" msgstr "Parametri:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7316,39 +7428,39 @@ msgstr "" msgid "Password" msgstr "" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Password:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Incolla" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Incolla Messaggi Recenti..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Strumento Incolla\nIncolla" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Incolla l'elenco dei file" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Copia il percorso svn dagli Appunti, effettuando un'operazione di spostamento (taglia) o copia" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7364,54 +7476,54 @@ msgstr "Applica patch agli elementi &selezionati" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Applica patch a tutti i file" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Applica patch ai file selezionati" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Applico patch" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Percorso" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." -msgstr "" +msgstr "E' stato trovato un percorso che corrisponde meglio a questo percorso." #. Resource IDs: (1580, 65535) msgid "Path:" msgstr "Percorso:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Percorsi" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Strumento Matita\nMatita" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Percentuale di autori" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Percento" @@ -7419,24 +7531,24 @@ msgstr "Percento" msgid "Personalized Menus and Toolbars" msgstr "Menu e barre personalizzate" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Prendi" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7446,56 +7558,56 @@ msgstr "Immagine (Metafile)\na immagine" msgid "Picture:" msgstr "Immagine:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Torta" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Inserire uno script di agagncio da eseguire." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Inserire un percorso al quale applicare uno script di aggancio" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Selezionare un tipo di hook" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Attendere. Annullamento in corso..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Attendere, reperimento delle differenze..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Attendere..." @@ -7511,11 +7623,11 @@ msgstr "Porta:" msgid "Port:" msgstr "Porta:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Hook post invio" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7523,25 +7635,25 @@ msgstr "" msgid "Pre&v Page" msgstr "Pagina &precedente" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Hook pre invio" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" -msgstr "" +msgstr "Anteponi il blocco destro" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" -msgstr "" +msgstr "Anteponi questo blocco a sinistra" #. Resource IDs: (65535) msgid "Press &New Shortcut Key:" @@ -7551,11 +7663,11 @@ msgstr "Premi &nuova abbreviazione tasto:" msgid "Press &new shortcut key:" msgstr "Premi &Nuova abbreviazione tasto:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Anteprima" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Anteprima del file con patch" @@ -7567,51 +7679,51 @@ msgstr "Anteprima:" msgid "Previous" msgstr "Precedente" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Pagina precedente\nPagina precedente" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflitto precedente" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Differenza precedente" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Differenza inline precedente" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Stampa" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Stampa documento\n&Stampa documento" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Stampa su file" @@ -7619,7 +7731,7 @@ msgstr "Stampa su file" msgid "Printer :" msgstr "Stampante:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "File stampante (*.prn)|*.prn|Tutti i file (*.*)|*.*||" @@ -7627,11 +7739,11 @@ msgstr "File stampante (*.prn)|*.prn|Tutti i file (*.*)|*.*||" msgid "Printing" msgstr "Stampa in corso" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programma" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programma (*.exe)|*.exe|Tutti i file (*.*)|*.*||" @@ -7639,11 +7751,11 @@ msgstr "Programma (*.exe)|*.exe|Tutti i file (*.*)|*.*||" msgid "Progress" msgstr "Avanzamento" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Proprietà" @@ -7651,17 +7763,17 @@ msgstr "Proprietà" msgid "Property Page" msgstr "Pagina delle proprietà" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Fornitore" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Para&metri del fornitore:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Fornitore uuid win&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7683,15 +7795,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Pull" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Pull..." @@ -7699,19 +7811,19 @@ msgstr "Pull..." msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Push" @@ -7727,11 +7839,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Push..." @@ -7739,22 +7851,22 @@ msgstr "Push..." msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Esce dall'applicazione con richiesta di salvataggio del documento\nEsci" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7772,11 +7884,15 @@ msgstr "Dischi R&AM" msgid "R&eset" msgstr "R&ipristina" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "R&ipristina fino a questa revisione" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7784,7 +7900,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7806,7 +7922,7 @@ msgstr "" msgid "Re&movable drives" msgstr "Dischi ri&muovibili" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Rino&mina..." @@ -7822,15 +7938,15 @@ msgstr "R&ipristiona tutto" msgid "Re&store defaults" msgstr "Ri&pristina predefiniti" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Ripris&tina..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Leggere 'Daily Use Guide' prima di ritrovarsi bloccati..." @@ -7838,21 +7954,21 @@ msgstr "Leggere 'Daily Use Guide' prima di ritrovarsi bloccati..." msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Recente" @@ -7864,21 +7980,21 @@ msgstr "File Recente" msgid "Recently modified lines" msgstr "Linee modificate di recente" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Sola lettura" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Recupera i documenti salvati automaticamente\nApre i le versioni dei documenti salvati automaticamente anziché le versioni salvate esplicitamente" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7892,17 +8008,21 @@ msgstr "" msgid "Recursive" msgstr "Ricorsivo" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Ripristina l'operazione precedentemente annullata\nRipristina" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Riduci la finestra ad icona" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7910,31 +8030,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Aggiorna" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7946,7 +8066,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7965,7 +8085,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtro espressioni regolari:\r\n.: qualunque carattere\r\nc+: trova carattere c una o più volte\r\nc*: trova carattere c zero o più volte\r\n^: linea inziale\r\n$: linea finale\r\n(string){n}: trova la stringa n volte\r\n(abcd): sottoespressione\r\n[aei0-9]: trova a,e,i e 0..9\r\n[^aei0-9]: qualunque carattere tranne a,e,i e 0..9\r\n\r\n\\w: trova a-z,A-Z,0-9 e _\r\n\\W: qualunque carattere non-alfanumerico\r\n\\d: cifre 0-9\r\n\\s: spazi bianchi" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Pezzi di patch rifiutate per '%s'" @@ -7978,7 +8098,7 @@ msgstr "" msgid "Reload" msgstr "Ricarica" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8012,19 +8132,19 @@ msgstr "" msgid "Remote Branch" msgstr "Ramo remoto" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Stato remoto" @@ -8036,12 +8156,12 @@ msgstr "Remoto:" msgid "Remove" msgstr "Rimuovi" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Rimuovi %ld elementi" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Elimina %s" @@ -8050,7 +8170,7 @@ msgstr "Elimina %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Rimuovi &ramo" @@ -8058,21 +8178,21 @@ msgstr "Rimuovi &ramo" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" -msgstr "" +msgstr "Rimuovi tutti i commenti prima di vedere le differenze così non risultano come differenti" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Rimuovi dall'elenco &ignora" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Rimuovi dalla barra di accesso veloce" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Rimuovi dall'elenco modifiche" @@ -8084,7 +8204,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8092,11 +8212,11 @@ msgstr "" msgid "Removed" msgstr "Rimosso" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Rimosso dall'elenco modifiche" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8104,7 +8224,7 @@ msgid "" "from the ignore list." msgstr "Il o i percorsi dei file\n%s\nsono stati rimossi dall'elenco 'ignora'." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Rimuove il/i file selezionato/i all'elenco 'ingora'" @@ -8112,11 +8232,11 @@ msgstr "Rimuove il/i file selezionato/i all'elenco 'ingora'" msgid "Rena&me..." msgstr "Rino&mina..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Rinomina" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Rinomina %s" @@ -8125,20 +8245,20 @@ msgstr "Rinomina %s" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Rinomina/sposta" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8148,7 +8268,7 @@ msgstr "Ripeti l'ultima azione\nRipeti" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8160,14 +8280,14 @@ msgstr "" #. Resource IDs: (65535) msgid "Replace:" -msgstr "" +msgstr "Sostituisci:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Sostituzione" @@ -8191,11 +8311,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Richiede un nome utente e una password" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." -msgstr "" +msgstr "Risoluzione.." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Ripristina" @@ -8207,25 +8327,25 @@ msgstr "Ripristina &tutto" msgid "Reset Type" msgstr "Tipo Ripristino" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Ripristina colonne" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Risolvi" @@ -8233,126 +8353,122 @@ msgstr "Risolvi" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Risolvi conflitto utilizzando la 'mia' versione" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Risolvi conflitto utilizzando la 'loro' versione" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Risolto" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Risolto:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Risolvi file in conflitto" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Ripristina" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Ripristina predefiniti" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Ripristina dopo modifiche" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Riporta la finestra alla dimensione normale" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Rirpstinato" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Riprova" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Ripprovera' fra 2 secondi..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Ripristina" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Ripristinato" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Annulla tutte le modifiche apportate dall'ultimo aggiornamento" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Ripristina un'aggiunta al controllo di versione" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisione" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisione %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisione %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Grafico revisioni" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8368,31 +8484,31 @@ msgstr "Filtro grafico revisioni" msgid "Revision graph" msgstr "Grafico revisioni" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntesto con formattazione di carattere e paragrafo" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Vista destra:" @@ -8400,21 +8516,21 @@ msgstr "Vista destra:" msgid "Right image" msgstr "Immagine di destra" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Riga %d di %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Riga %d-%d di %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Riga giù" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Riga su" @@ -8422,11 +8538,11 @@ msgstr "Riga su" msgid "S&elect..." msgstr "S&eleziona..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Visualizza pulsanti su una riga" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Visualizza pulsanti su due righe" @@ -8434,25 +8550,33 @@ msgstr "&Visualizza pulsanti su due righe" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Visualizza barra di accesso veloce sotto il nastro" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatistiche" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8462,7 +8586,7 @@ msgstr "" msgid "SMTP Server:" msgstr "SMTP Server:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8470,31 +8594,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8506,15 +8630,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8530,37 +8654,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Testo di esempio:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Salva" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Salva &come..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Salva &come...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Salva come" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" -msgstr "" +msgstr "Salva file" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" -msgstr "" +msgstr "Salva file a sinistra come\nTi verrà chiesto dove salvare il file a sinistra" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8568,13 +8696,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" -msgstr "" +msgstr "Salva file a destra come\nTi verrà chiesto dove salvare il file a destra" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8582,74 +8710,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" -msgstr "" +msgstr "Salva tutto\nEntrambi i fie verranno salvati" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Salva come" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Salva come..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "" +msgstr "Salva come\nChiede dove salvare il file" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Salvare cambiamenti in %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." -msgstr "" +msgstr "Salva le modifiche" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Salva revisione &come..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Salva il documento attivo\nSalva file" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8671,13 +8799,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "" +msgstr "Salva\nSalva il file con i contrassegni del conflitto." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8689,28 +8817,28 @@ msgstr "" msgid "Saved Data" msgstr "Dati salvati" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Scansiona" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Scorrimento a sinistra" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Scorrimento a destra" @@ -8718,7 +8846,7 @@ msgstr "Scorrimento a destra" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Cerca nei &commenti..." @@ -8730,20 +8858,20 @@ msgstr "" msgid "Search for:" msgstr "Cerca:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Ricerca di percorso migliore per applicare la patch..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Cerca campo in %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Seleziona" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Seleziona &tutti" @@ -8759,59 +8887,59 @@ msgstr "Seleziona menu &contestuale:" msgid "Select &window:" msgstr "Seleziona &finestra:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Strumento selezione colore\nSelezione colore" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Seleziona file..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Seleziona client SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Seleziona un pulsante." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Seleziona l'oggetto su cui si desidera ottenere Aiuto" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Seleziona elenco modifiche" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Seleziona applicazione per il confronto" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Seleziona una cartella da associare all'issue tracker" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Selezionare la cartella in cui esportare.\nPotrebbe essere necessario creare una nuova cartella prima di procedere all'esportazione." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Seleziona una cartella su cui eseguire lo script" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Seleziona una cartella in cui salvare i file selezionati" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Seleziona il file contenente lo script di aggancio" @@ -8819,20 +8947,20 @@ msgstr "Seleziona il file contenente lo script di aggancio" msgid "Select items automatically" msgstr "Seleziona automaticamente elementi" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Seleziona applicazione per l'unione" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Seleziona destinazione per l'unione" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8842,27 +8970,31 @@ msgstr "Seleziona l'intero documento\nSeleziona tutto" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Seleziona la lingua che questo progetto sta usando. Questa impostazione influenza il correttore ortografico usato per invio dei messaggi" + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Seleziona l'applicazione per il confronto dei file" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" -msgstr "" +msgstr "Seleziona quale file vuoi salvare come" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" -msgstr "" +msgstr "Seleziona quale file vuoi salvare come\nNota: E' presente un conflitto non risolto!" #. Resource IDs: (1067) msgid "Select/deselect &all" msgstr "Seleziona / deseleziona &tutti" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8870,7 +9002,7 @@ msgstr "" msgid "Send" msgstr "Invia" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Invia Email" @@ -8878,11 +9010,11 @@ msgstr "Invia Email" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Invio posta - invio messaggio fallito." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Invia Email..." @@ -8890,19 +9022,19 @@ msgstr "Invia Email..." msgid "Send Patch" msgstr "Invia Patch" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Invia Patch tramite Email" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Invio contenuti" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Invio in corso..." @@ -8922,28 +9054,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Impostazione delle proprietà..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Impostazioni" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Impostazioni - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8951,7 +9083,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "La cache delle Icone di Shell è stata ricostruita!" @@ -8963,7 +9095,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Usa formato corto per &date e orari nei commenti" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Accorcia lista delle proprietà" @@ -8975,7 +9107,7 @@ msgstr "Visualizza" msgid "Show &Accelerator for:" msgstr "Visualizza &Acceleratore per:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8983,15 +9115,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "Visualizza File &Senza Versione" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Mostra &l'Intero Progetto" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Visualizza &cambiamenti" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Visualizza ®istro attività" @@ -8999,15 +9131,19 @@ msgstr "Visualizza ®istro attività" msgid "Show &log..." msgstr "Visualizza ®istro attività..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "&Visualizza le icone di stato e i menu contestuali solo in explorer" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Visualizza Sopra il Nastro" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Visualizza Sotto il Nastro" @@ -9015,35 +9151,35 @@ msgstr "Visualizza Sotto il Nastro" msgid "Show Environment Variables" msgstr "Mostra Variabili d'Ambiente" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Visualizza Meno Pulsanti" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Visualizza nodi della revisione di TESTA" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Visualizza Differenze-Inlinea parola per parola\nInline-Diff word-wise" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Visualizza differenze in linea\nDifferenze in linea" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Visualizza Più Pulsanti" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Visualizza Barra Accesso Veloce Sopra il Nastro" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Visualizza Barra Accesso Veloce Sotto il Nastro" @@ -9051,11 +9187,11 @@ msgstr "Visualizza Barra Accesso Veloce Sotto il Nastro" msgid "Show Screen&Tips on toolbars" msgstr "Visualizza suggerime&nti sulle barre" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Visualizza spazi" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Visualizza una visione d'insieme del grafico" @@ -9063,7 +9199,7 @@ msgstr "Visualizza una visione d'insieme del grafico" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9071,11 +9207,11 @@ msgstr "" msgid "Show author" msgstr "Mostra autore" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Visualizza cambiamenti come confronto &unificato" @@ -9095,15 +9231,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Mostra cartelle di destinazione" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Mostra cambiamenti" @@ -9115,11 +9251,15 @@ msgstr "Mostra cambiamenti dall'ultimo invio" msgid "Show excluded folders as normal" msgstr "Mostra cartelle escluse come normali" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Visualizza menu inte&ri dopo un piccolo ritardo" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9135,7 +9275,7 @@ msgstr "Mostra file i&gnorati" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9143,90 +9283,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Mo&stra i numeri di linea" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Visualizza registro attività" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Visualizza registro attività del submodule" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Visualizza registro attività per questa cartella" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Visualizza registro attività..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Posizione in cima il nodo più vecchio" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Visualizza/nascondi la barra confronto linee\nBarra Confronto Linee" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Visualizza/nascondi la barra Locatori\nBarra Locator" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Visualizza/nascondi la barra di stato\nBarra di stato" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Visualizza/nascondi la barra di stato\nBarra di stato" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Visualizza/nascondi la barra degli strumenti\nBarra degli strumenti" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Visualizza le proprietà della revisione" @@ -9234,7 +9374,7 @@ msgstr "Visualizza le proprietà della revisione" msgid "Show shortcut &keys in ScreenTips" msgstr "Visualizza tasti di a&bbreviazioni nei suggerimenti" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9244,7 +9384,7 @@ msgstr "Visualizza caratteri speciali per spazi e ritorni a capo\nVisualizza spa msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9256,45 +9396,43 @@ msgstr "Mostra file n&on modificati" msgid "Show un&versioned files" msgstr "Mostra file sen&za versione" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Visualizza/nascondi" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Visualizza una rappresentazione grafica di copie/tag/rami" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Visualizza tutti i file che hanno subito modifiche dall'ultimo aggiornamento, localmente e nel repository" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Visualizza informazioni su TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Visualizza il file di log delle azioni nell'editor di testo di default" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Visualizza il log per i file / cartelle selezionate" @@ -9306,7 +9444,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Tema argento" @@ -9314,20 +9452,20 @@ msgstr "Tema argento" msgid "Since" msgstr "Da" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Dimensioni" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Salta" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Salta Patch: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9335,23 +9473,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Saltato" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Obbiettivo mancate saltato" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Scorri" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" -msgstr "" +msgstr "Carattere di tabulazione intelligente" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9359,13 +9497,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "Lascia albero attuale e gli indici intatti" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9379,7 +9517,7 @@ msgstr "Ordina secondo il numero di invii" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9389,57 +9527,61 @@ msgstr "Specifica quanti messaggi si vogliono visualizzare nella finestra di dia msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Dividi le linee" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Separa la finestra\nSepara" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Integra commeto" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Barre in pila" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Linee in pila" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Hook di inizio invio" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Avvia editor del registro" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9451,39 +9593,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statico" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistiche" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Stato" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configurazione Barra di Stato" @@ -9495,32 +9645,32 @@ msgstr "Colori di stato / delle azioni" msgid "Status cache" msgstr "Cache di stato" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Cache di stato solo per una cartella, non applicare icone di stato ricorsivamente" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9528,15 +9678,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Tema" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "" @@ -9544,7 +9694,7 @@ msgstr "" msgid "Submodule" msgstr "Submodule" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9552,7 +9702,7 @@ msgstr "" msgid "Submodule Add" msgstr "Aggiungi Submodule" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9560,15 +9710,15 @@ msgstr "" msgid "Submodule Diff" msgstr "Confronto Submodule" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Inizializza Submodule" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Sincronizza Submodule" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Aggiorna Submodule" @@ -9576,7 +9726,7 @@ msgstr "Aggiorna Submodule" msgid "Submodule Update Options" msgstr "Opzioni Aggiornamento Submodule" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9591,15 +9741,15 @@ msgstr "" msgid "Submodules" msgstr "Submodule" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Successo" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Scambia" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Sposta %s verso %s, revisione %s" @@ -9608,43 +9758,43 @@ msgstr "Sposta %s verso %s, revisione %s" msgid "Switch To" msgstr "Scambia a" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Torna alla precedente parte di finestra\nPannello precedente" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Cambia tra vista pannello singolo e doppio" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Cambia visualizzazione da singolo a doppio pannello\nCambia visualizzazione da singolo a doppio pannello" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Cambia vista sinistra e destra" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Inverte i contenuti della vista di destra e di quella di sinistra\nInverti colonne" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Vai alla finestra seguente" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Passa al prossima parte di finestra\nProssimo pannello" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Vai alla finestra precedente" @@ -9652,21 +9802,21 @@ msgstr "Vai alla finestra precedente" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Inverte la posizione dei file confrontati sullo schermo" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9676,23 +9826,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9702,13 +9852,13 @@ msgstr "Le chiavi del registro di sistema sono state rimosse e il fine INI (se e msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9722,7 +9872,7 @@ msgstr "Tab Placeholder" msgid "Tab size:" msgstr "Dimensione tabulazione:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Tag" @@ -9730,16 +9880,16 @@ msgstr "Tag" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Informazioni Tag" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Copia di lavoro etichettata come %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Tags" @@ -9747,11 +9897,11 @@ msgstr "Tags" msgid "Tags:" msgstr "Tags:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tasks" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Pannello Task" @@ -9763,11 +9913,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Solo Test" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9775,13 +9925,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9789,64 +9945,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "La dimensione del frammeno non corrisponde al numero di linee aggiunte/eliminate!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Il motore di comparazione ha annullato l'operazione a causa di un errore:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Il file %s non esiste!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Il file %s non è stato trovato nel file di patch!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9855,15 +10025,15 @@ msgid "" "Do you want to remove the file?" msgstr "Il file\n%s\nè vuoto.\nRimuovere il file?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Il file è troppo grande" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Il file è troppo grande per essere aperto." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9871,7 +10041,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Il file\n%s\nesiste già. Lo si vuole sovrascrivere?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9879,14 +10049,14 @@ msgid "" "is not a valid text file!" msgstr "Il file\n%s\nnon è file di testo valido!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "La cartella %s\ncontiene file senza versione e/o modificati. Rimuoverla comunque?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9895,78 +10065,78 @@ msgid "" "Would you like to create it first?" msgstr "La cartella \n%s\nnon esiste.\nSi desidera crearla?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Lo hook script ha segnalato un errore:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "L'immagine non può essere visualizzata." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Il fornitore di issue-tracker non è stato creato. Si prega di controllare che sia installato correttamente." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Il fornitore di issue-tracker non è stato in grado di validare la stringa del parametro" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "La stringa indicante il nuovo file era attesa alla linea %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Il numero linea deve essere compreso tra %d e %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Il numero massimo di linee del log delle azioni da conservare.\nOgni linea aggiunta oltre questo limite rimuoverà le linee più vecchie dal file." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Operazione fallita" -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "I parametri '/path' e '/pathfile' sono mutualmente esclusivi.\nSpecificare uno solo di essi." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9976,7 +10146,7 @@ msgid "" "do not match!" msgstr "La patch sembra essere superata! La linea\n%s\ndel file e la linea\n%s\nnella pach non corrispondono!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9987,7 +10157,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Il percorso/URL inserito non sembra essere valido per Windows!\nÈ possibile tentare comunque, ma così facendo si rischia di incorrere in un errore più avanti.\n\nUn percorso valido non deve contenere caratteri quali '<<>|\"?*:' come pure uno dei seguenti nomi di periferiche:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\nProcedere comunque?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9998,36 +10168,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Il percorso\n%s\nsembra non corrispondere al percorso specificato nella patch.\nTortoiseGitMerge ritiene che il percorso\n%s\nsia più corretto. Si desidera usare il percorso suggerito invece di quello specificato?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "L'espressione regolare è invalida!\nSi prega di inserire una espressione regolare valida." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Il repository è stato creato con successo." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Il file selezionato sembra contenere ancora uno o più indicatori di conflitto.\nSi è certi di voler marcare il file come \"risolto\"?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10035,7 +10212,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10044,7 +10221,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10053,26 +10230,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" -msgstr "" +msgstr "Il testo è identico, ma i file non coincidono!\nSono state trovate le seguenti differenze:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Il tempo, in secondi, dopo il quale l'analisi del file selezionato viene interrotta.\r\nUn valore basso renderà l'elenco d'autocompletamento disponibile più velocemente,\r\nma potrebbe non analizzare tutti i file." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "I due URL selezionati non sono stati creati dalla stessa radice.\nNon è possibile visualizzare i commenti per entrambi!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10082,34 +10259,34 @@ msgstr "" msgid "Their file:" msgstr "Loro file:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Loro" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Ci sono attualmente %d handler overlay installati oltra a quello usato da Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" -msgstr "" +msgstr "Ci sono più viste modificabili.\nQuale vista vuoi salvare?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Non ci sono fornitori di issue-tracker disponibili." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10118,85 +10295,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Vi sono ancora dei conflitti irrisolti alla linea %d\nÈ consigliabile risolvere questi conflitti prima di poter salvare.\nSi desidera salvare il file nonostante i conflitti?\nSe si seleziona Sì sarà necessario risolvere manualmente i conflitti in un'altro editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Alcune modifiche non sono state salvate!\nSi desidera salvare i cambiamenti?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Thesaurus" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Questi sono stati salvati più recentemente dei documenti correntemente aperti e contengono modifiche che sono state fatte prima che l'applicazione fosse chiusa." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Questo campo è richiesto e non deve essere vuoto." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "URL non valido.\nÈ necessario inserire un URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Percorso non valido!\nUn percorso valido non deve contenere caratteri quali '<<>|\"?*:' come pure uno dei seguenti nomi di periferiche:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Quest'applicazione è connessa all'eportazione mancante %s nel file %s. Questa macchina potrebbe avere una versione incompleta di %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Questa applicazione richiede il file %s, ma il file non è stato trovato nel sistema." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Questa proprietà è disponibile solo per le cartelle, non per i file." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Questo cancellerà il record di comandi utilizzati nell'applicazione e ripristinerà il set di comandi visibili di default per menu e barre. Non modificherà le personalizzazioni espliicite. Continuare?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "&Applica confronto unificato" @@ -10212,14 +10389,14 @@ msgstr "Dividi &Orizzontalmente" msgid "To" msgstr "A" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10231,13 +10408,13 @@ msgstr "" msgid "To:" msgstr "A:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Toggle One/Two Pages display\nToggle One/Two Pages display" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10249,11 +10426,11 @@ msgstr "Barra degli strumenti" msgid "Toolbar Name" msgstr "Nome Barra degli strumenti" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opzioni Barra degli strumenti" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Errore interno Barra. Si prega di contattare il fornitore dell'applicazione." @@ -10269,16 +10446,16 @@ msgstr "Strumenti" msgid "Tools:" msgstr "Strumenti:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10288,20 +10465,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit ha individuato nomi di file simili. Vuoi che anche i file:%s\nvengano rinominati?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" @@ -10310,18 +10487,18 @@ msgstr "" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Versione %d.%d.%d.%d" @@ -10337,7 +10514,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10345,7 +10522,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Software di confronto delle immagini, parte integrante di TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10359,36 +10536,36 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10427,11 +10604,11 @@ msgstr "Tracciare" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Trasferimento su %s" @@ -10440,39 +10617,35 @@ msgstr "Trasferimento su %s" msgid "Transparent &color..." msgstr "Colore &trasparente..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Prova 'Pulizia'. Se non funziona è necessario ritirare nuovamente i file." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Riprova" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turco" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Personalizza TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tipo" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Tipo:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10496,24 +10669,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Impossibile caricare il sistema di mail." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Impossibile processare il comando, server occupato." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Impossibile leggere da %1, risulta aperto da qualcun'altro." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Impossibile leggere la proprietà di sola scrittura." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10521,91 +10694,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Impossibile risalire al percorso della copia di lavoro!\nCiò può accadere se il file è stato rinominato.\nProvare a controllare il log per questo specifico file e ripristinare la situazione\nutilizzando il pannello superiore della finestra di dialogo." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Impossibile scrivere la proprietà di sola lettura." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Impossibile scrivere in %1, il file è di sola lettura o aperto da qualcun'altro." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Deseleziona" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Annulla modifiche" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Annulla %d Azioni" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Annulla 1 Azione" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Annulla Aggiungi..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Annulla l'ultima azione\nAnnulla" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Annulla l'ultima modifica\nAnnulla modifica" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Formato del file inatteso." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Separa" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Testo Non Formattato\ntesto senza formattazione" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "&Confronto unificato delle revisioni di testa" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Sconosciuto" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Profondità sconosciuta" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" +msgstr "Conflitto non risolto!" + +#. Resource IDs: (1558) +msgid "Unset tracked branch" msgstr "" -#. Resource IDs: (3841) +#. Resource IDs: (61443) msgid "Untitled" msgstr "Senza titolo" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Non versionato" @@ -10613,7 +10790,7 @@ msgstr "Non versionato" msgid "Unversioned files mark parent folder as modified" msgstr "I file senza versione marcano le cartelle che li contengono come modificate " -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Rimozione di %s dal versionamento" @@ -10624,25 +10801,25 @@ msgstr "Su" #. Resource IDs: (1710) msgid "Update" -msgstr "" +msgstr "Aggiorna" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Aggiorna Submodule" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Aggiornato" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Aggiornamento oggetti ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Aggiornamento Indice" @@ -10654,37 +10831,33 @@ msgstr "Usa Immagine Pre&definita:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Usa la vista ad &un solo pannello come predefinita per il confronto tra due file" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Usa un'altr&o blocco di testo" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Usa i 'miei' blocchi di testo" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Usa i 'miei' blocchi di testo al posto dei 'suoi'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Usa 'i suoi' blocchi di testo" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Usa i 'suoi' blocchi di testo al posto dei 'miei'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Usa blocchi" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" #. Resource IDs: (1066) msgid "Use Ribbons" -msgstr "" +msgstr "Usa righelli" #. Resource IDs: (1500) msgid "Use Task Dialog" @@ -10698,15 +10871,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Una confronto unificato dagli a&ppunti" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10716,7 +10889,7 @@ msgstr "Usa tutto il contenuto della visualizzazione di sinistra\nUsa file di si msgid "Use block from left before right" msgstr "Usa blocco di sinistra prima di quello di destra" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10726,25 +10899,25 @@ msgstr "Usa blocco della visualizzazione di sinistra prima del blocco della visu msgid "Use block from right before left" msgstr "Usa blocco di destra prima di quello di sinistra" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Usa blocco della visualizzazine di destra prima di quello della visualizzazione di sinistra\nUsa blocco di destra prima di quello di sinistra" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Usa entrambi i blocchi di testo (questo per primo)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Usa entrambi i blocchi di testo (questo per ultimo)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Usa blocchi a sinistra" @@ -10760,77 +10933,77 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Usa cestino quando si fa il reverting" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Usa espressione regolare" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" -msgstr "" +msgstr "Usa il blocco destro" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" -msgstr "" +msgstr "Usa spazi" #. Resource IDs: (1426) msgid "Use system locale for date/time" msgstr "Utilizzare la data di sistema come data/ora" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Usa il blocco di testo dal '&mio'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Usa il blocco di testo dal '&loro'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Usa blocco di testo dal 'm&io' prima del 'loro'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Usa blocco di testo dal 'mio' prima del 'loro'\nUsa il 'mio' blocco di testo e poi il 'loro'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Usa il blocco di testo da 'mio'\nUsa il 'mio' blocco di testo" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Usa il blocco di testo dal 'l&oro' prima del 'mio'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Usa il blocco di testo dal 'loro' prima del 'mio'\nUsa il 'loro' blocco di testo e poi il 'mio'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Usa il blocco di testo da 'loro'\nUsa il 'loro' blocco di testo" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Usa il blocco di testo dalla visualizzazione di sinistra\nUsa blocco di sinistra" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Usa &questo blocco di testo" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10838,7 +11011,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10850,19 +11023,19 @@ msgstr "" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Utilizza questo&intero file" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" -msgstr "" +msgstr "Usa questo blocco sulla sinistra" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Utilizza l'intero altro &file" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10878,25 +11051,25 @@ msgstr "Informazione Utente" msgid "User Name:" msgstr "Nome Utente:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Utente cancellato" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" -msgstr "Nome utente e email devono essere impostate prima dell'invio.»⏎\nVuoi impostarle adesso?" +msgstr "Nome utente e email devono essere impostate prima dell'invio.\r\nVuoi impostarle adesso?" #. Resource IDs: (1650) msgid "User&name:" msgstr "Nome& Utente:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nome Utente:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10915,7 +11088,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valore" @@ -10923,24 +11096,24 @@ msgstr "Valore" msgid "Version" msgstr "Versione" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Versione: %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Versione 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Version 2 (Base)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10948,11 +11121,11 @@ msgstr "" msgid "Version Information" msgstr "Informazioni sulla versione" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versione:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versionato" @@ -10964,23 +11137,27 @@ msgstr "" msgid "View" msgstr "Visualizza" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "View Patch" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Visualizza Patch>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Visualizza il percorso della revisione nel &webviewer" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Visualizza la revisione in un editor alternativo" @@ -10992,11 +11169,11 @@ msgstr "" msgid "Visit our website" msgstr "Visita il nostro sito" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11007,7 +11184,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ATTENZIONE:\r\nModificare queste impostazioni solo se si è assolutamente certi di ciò che si sta facendo!\r\nPer impostare i valori al valore predefinito, eliminare il relativo valore." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Attendi" @@ -11015,7 +11192,7 @@ msgstr "Attendi" msgid "Wait for the script to finish" msgstr "Attende che lo script abbia finito" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "In attesa di input" @@ -11023,15 +11200,15 @@ msgstr "In attesa di input" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Attenzione" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Attenzione!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11039,7 +11216,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11047,56 +11224,56 @@ msgstr "Web" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Quando attivato, tieni premuto il tasto SHIFT e il tasto destro del mouse per aggiungere i menu di TortoiseGit al menu contestuale" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Quando abilitato, gli elementi versionati elencati nella finestra di dialogo di invio vengono automaticamente selezionati" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11106,15 +11283,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" -msgstr "" +msgstr "Differenze di spazi (tabs, spazi)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Spaziature" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Posizione finestra" @@ -11122,15 +11299,15 @@ msgstr "Posizione finestra" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Wiindows XP" @@ -11174,11 +11351,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Copia di lavoro" @@ -11186,29 +11363,25 @@ msgstr "Copia di lavoro" msgid "Working Tree Path:" msgstr "Percorso della copia di lavoro:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "A capo automatico" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "A capo bordo destr della vista per linee linghe\nA capo automatico" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Sì" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Sì a tutti" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Si sta già utilizzando la versione più recente." @@ -11218,119 +11391,119 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "E' possibile disabilitare degli specifici gestori di Overlay qui.\nI gestori disabilitati non useranno uno slot di overlay e daranno alle altre estensioni di shell la possibilità di mostrare gli overlay." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "E' possibile incollare solo una bitmap con le misure (%d x %d) !" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Non è possibile creare più di %d toolbar definite dall'utente!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "È possibile impostare questa proprietà solo per i file e non per le cartelle!\nSe si desidera impostare tale proprietà su tutti i file contenuti nella cartella,\nbisogna attivare l'opzione 'ricorsivo'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Alcune proprietà sono state modificate senza essere prima salvate.\nSi desidera salvarle ora?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" "For every of these items a new instance of the diff viewer will be started.\n" "Do you really want to show the diff for so many items at once?" -msgstr "" +msgstr "Hai selezionato %d elementi per visualizzare le differenze.\nPer ciascuno di questi elemnti verrà avviata una nuova istanza del visualizzatore differenze.\nVuoi realmente visualizzare le differenze per così tanti elementi in una solo volta?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Non è stato specificato un issue-number!\nSi è sicuri di voler inviare senza specificare tale numero?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "E' possibile definire fino a %d barre." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Devi registrare un messagio per il commit" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "È necessario riavviare il sistema affinchè i cambiamenti abbiano effetto." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "È stato selezionato un file senza versione.\nIl file verrà aggiunto alla versione quando si procederà all'invio." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Va inserito un testo!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Va inserita un'immagine!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Hai cambiato il set di icone da %s a %s.\nIl cambiamento non avrà effetto fino al prossimo riavvio del compiuter o fino alla prossima disconnessione dell'utente." -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11340,7 +11513,7 @@ msgstr "I commenti scritti in precedenza sono stati salvati.\nFai clic qui per l msgid "Your version is:" msgstr "Verisione installata:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Versione installata: %d.%d.%d.%d" @@ -11350,10 +11523,10 @@ msgid "Zip File" msgstr "File zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Zoo&m indietro" +msgid "Zoo&m out\t-" +msgstr "Zoo&m indietro\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zoom" @@ -11365,80 +11538,80 @@ msgstr "Zoom &avanti" msgid "Zoom &Out" msgstr "Zoom &indietro" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Zoom avanti\nZoom avanti" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Zoom indietro\nZoom indietro" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Zoom &avanti" +msgid "Zoom i&n\t+" +msgstr "Zoom &avanti\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Zoom avanti" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Zoom indietro" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Adatta alla finestra" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zoom per adattare in altezza" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zoom per adatta in larghezza" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Predefinito]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Non assegnato]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" non è valido." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" non è un repository git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11452,7 +11625,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "aggiunto" @@ -11460,7 +11633,7 @@ msgstr "aggiunto" msgid "added files" msgstr "file aggiunti" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "un file senza nome" @@ -11468,14 +11641,19 @@ msgstr "un file senza nome" msgid "and support the developers" msgstr "e supporta gli sviluppatori" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autore" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11508,30 +11686,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "invia" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "in conflitto" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copiato da \r\n%s - revisione %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "giorno" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "eliminato" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11543,7 +11721,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11552,16 +11730,16 @@ msgid "" "%s" msgstr "esportato\n%s\nin\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "esterno" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorato" @@ -11569,23 +11747,23 @@ msgstr "ignorato" msgid "include &untracked" msgstr "&Includi &non tracciati" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incompleto" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "elemento mantenuto in locale" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "mantieni l'elenco di file in inglese" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11594,7 +11772,7 @@ msgid "" "%s = %ld" msgstr "linea: %d(+) %d(-) file: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11609,11 +11787,11 @@ msgstr "linea: %d(+) %d(-) file: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %l msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "unito" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "mancante" @@ -11621,7 +11799,7 @@ msgstr "mancante" msgid "missing/deleted/replaced" msgstr "mancante/eliminato/sostituito" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "modificato" @@ -11629,7 +11807,7 @@ msgstr "modificato" msgid "modified/copied" msgstr "modificato/copiato" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mese" @@ -11637,40 +11815,44 @@ msgstr "mese" msgid "new branch" msgstr "nuovo ramo" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "no" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "nessuna descrizione disponibile per questo comando" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "senza versione" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normale" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "non trovato" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "ostruito" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "su %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixel" @@ -11678,11 +11860,11 @@ msgstr "pixel" msgid "possible or real conflict/obstructed" msgstr "possibile conflitto o conflitto reale / ostruito" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestre" @@ -11690,35 +11872,35 @@ msgstr "trimestre" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "sostituito" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "scansione percorso:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "Spostato in\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "a %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "in %s" @@ -11727,35 +11909,35 @@ msgstr "in %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "settimana" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "anno" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "sì" diff --git a/Languages/Tortoise_ja.po b/Languages/Tortoise_ja.po index b5fe12d6d..8e363053e 100644 --- a/Languages/Tortoise_ja.po +++ b/Languages/Tortoise_ja.po @@ -9,7 +9,7 @@ # Takumi Shotoku , 2012 # Tetsuhiko Koto, 2014 # Tetsuhiko Koto, 2012-2014 -# Tetsuhiko Koto, 2014 +# Tetsuhiko Koto, 2014-2015 # YANO Tetsu , 2012-2013 # YANO Tetsu , 2013 # YANO Tetsu , 2013-2014 @@ -17,9 +17,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:59+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/tortoisegit/language/ja/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgstr "" "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -50,138 +50,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "別個に表示する作者の人数:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB 転送しました" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 は想定外のオブジェクトを含んでいます。" -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 は正しくないパスを含んでいます。" -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 は正しくないスキーマを含んでいます。" -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 のフォーマットが不正です。" -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 は見つかりませんでした。" -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! 日前" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! 日前" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! 時間前" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! 時間前" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! 分前" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! 月前" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! 月前" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! 秒前" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! 秒前" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! 週間前" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! 週間前" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! 年前" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! 年前" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! 個のアイテムを選択" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! 分前" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\n%2!d! ファイル、%3!d! サブモジュール、%4!d! フォルダーを表示中、全部で %5!d! 項目" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nサイズ %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nスクリプトの実行を続けますか？" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -189,52 +189,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nこのファイルを見つける事が出来ません。\n正しいパスとファイル名である事を確認して下さい。" -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig もしくは %XDGHOME%/git/config (ユーザ固有の設定)" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d バイトを転送しました" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB 転送しました" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d個のコミット(\"%s\"に対して)" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d 個のファイルを変更しました" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d 個のファイルを削除しました。" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d 個のファイルを %s まで戻しました。" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "選択ファイル数 %d 、全体ファイル数 %d" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "最もアクティブな %d 人 (最も少ない人は %d 回のコミットで、これは 全体の %d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -242,78 +242,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "透過率 %i%%\nクリックで透過率を反転します。\nダブルクリックで透過率を自動的に反転します。" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld 分 %ld 秒" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld / %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - リビジョン: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [復元済]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s (%s)" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s にはバージョン %s 以上のGitが必要です。" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s (%s)" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s : 作業ツリー" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s のエクスポート(%d個) %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s のエクスポート %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\n正しくパッチを適用できませんでした。" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\n本当に削除してもよろしいですか？" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -329,6 +329,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-wayマージ" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "中止(&A)" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "TortoiseGitBlameについて(&A)..." @@ -357,15 +361,15 @@ msgstr "フィルターを追加(&A)" msgid "&Add New/Save" msgstr "新規に追加/保存(&A)" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "追加する(&A)" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "ボタンの追加/削除(&A)" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "追加(&A) ..." @@ -405,7 +409,7 @@ msgstr "割り当て(&A)" msgid "&Associate double-click event with:" msgstr "ダブルクリックイベントの関連付け(&A):" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "自動的に隠す(&A)" @@ -421,15 +425,15 @@ msgstr "Putty 認証キーの自動ロード(&A)" msgid "&Backup original file" msgstr "オリジナルファイルをバックアップ(&B)" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "注釈履歴(行毎の由来)(&B)" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "変更の注釈履歴(行毎の由来)(&B)" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "リビジョンの注釈履歴(行毎の由来)(&B)" @@ -453,7 +457,7 @@ msgstr "ブランチ(&B):" msgid "&Browse Dir" msgstr "フォルダーを参照(&B)" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "リポジトリを参照(&B)" @@ -489,7 +493,7 @@ msgstr "カテゴリ(&C):" msgid "&Choose commands from:" msgstr "コマンドを選択(&C):" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "クリーンアップ(&C)..." @@ -513,7 +517,7 @@ msgstr "ウィンドウを閉じる(&C)" msgid "&Command:" msgstr "コマンド(&C):" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "コミット(&C)" @@ -521,23 +525,27 @@ msgstr "コミット(&C)" msgid "&Commit submodule..." msgstr "サブモジュールをコミット(&C)..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "なしでコミット(&C)" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "コミット(&C)..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "リビジョンの比較(&C)" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "短縮されたグラフ(&C)" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "続行(&C)" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "コピー(&C)" @@ -557,11 +565,11 @@ msgstr "カスタム(&C)" msgid "&Default" msgstr "デフォルト(&D)" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "削除(&D)" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "削除(ローカルを保持）(&D)" @@ -569,7 +577,7 @@ msgstr "削除(ローカルを保持）(&D)" msgid "&Delete Filter" msgstr "フィルターを削除(&D)" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "ローカル、リモート共に削除(&D)" @@ -581,11 +589,11 @@ msgstr "移動/複製された行の検知(&D)" msgid "&Detect moved or copied lines:" msgstr "移動/複製された行の検知(&D):" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "差分(&D)" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "前のバージョンとの差分(&D)" @@ -597,7 +605,7 @@ msgstr "ディレクトリ(&D):" msgid "&Disabled" msgstr "無効(&D)" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "破棄(&D)" @@ -605,19 +613,23 @@ msgstr "破棄(&D)" msgid "&Do the same for the rest" msgstr "残りを同様に実行する(&D)" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "ドッキング(&D)" #. Resource IDs: (1032) msgid "&Don't ask me again" -msgstr "" +msgstr "次からは確認しない(&D)" + +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "このメッセージを再び表示しない(&D)" #. Resource IDs: (1384) msgid "&Down" msgstr "下へ(&D)" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "ダウンロード(&D)" @@ -625,11 +637,11 @@ msgstr "ダウンロード(&D)" msgid "&Edit" msgstr "編集(&E)" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr ".git/configを編集(&E)" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "すべて編集(&E)" @@ -637,7 +649,7 @@ msgstr "すべて編集(&E)" msgid "&Edit Filter" msgstr "フィルターを編集(&E)" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "競合の編集(&E)" @@ -662,10 +674,10 @@ msgid "&Enable edit" msgstr "編集を有効化(&E)" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "" +msgid "&Exit\tCtrl+W" +msgstr "終了(&E)\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "選択をエクスポート(&E)..." @@ -677,27 +689,27 @@ msgstr "外部(&E)" msgid "&File" msgstr "ファイル(&F)" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "検索(&F)" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "検索(&F)\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "画像をウィンドウサイズに合わせる(&F)" +msgid "&Fit images in window\tF" +msgstr "画像をウィンドウサイズに合わせる(&F)\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "固定ドライブ(&F)" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "フローティング(&F)" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "名前の変更を超えてさかのぼる(&F)" @@ -709,7 +721,7 @@ msgstr "ログメッセージのフォント(&F):" msgid "&Font:" msgstr "フォント(&F):" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "強制(&F)" @@ -729,7 +741,7 @@ msgstr "&Git スタイル コミット (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "指定先へ移動(&G)\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "無関係な変更のパスをグレーで表示(&G)" @@ -741,7 +753,7 @@ msgstr "緑(&G):" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "ヘルプ(&H)" @@ -749,7 +761,7 @@ msgstr "ヘルプ(&H)" msgid "&Help Topics" msgstr "トピックス(&H)" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "隠す(&H)" @@ -757,11 +769,11 @@ msgstr "隠す(&H)" msgid "&Icon Set:" msgstr "アイコンセット(&I):" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "無視(&I)" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "名前により %d 項目を無視する(&I)" @@ -775,14 +787,14 @@ msgid "&Image" msgstr "画像(&I)" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "画像情報を表示(&I)" +msgid "&Image info\tI" +msgstr "イメージ情報(&I)\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "画像のみ(&I)" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "インポート(&I)..." @@ -794,7 +806,7 @@ msgstr "初期ディレクトリ(&I):" msgid "&Initialize submodules (--init)" msgstr "サブモジュールを初期化する(--init) (&I)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "インストール(&I)" @@ -806,11 +818,11 @@ msgstr "ロード時に最初の相違点へ移動する(&J)" msgid "&Keep CR" msgstr "CRコードを維持(&K)" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "現在のステータスを維持(&K)" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "ラベル(&L)" @@ -838,7 +850,7 @@ msgstr "限度(&L):" msgid "&Line number" msgstr "行番号(&L)" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "行番号(&L) (%d - %d)" @@ -855,7 +867,7 @@ msgstr "リスト表示(&L)" msgid "&Local Branch:" msgstr "ローカルブランチ(&L):" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "ローカルブランチ(&L)" @@ -879,11 +891,11 @@ msgstr "メニューのアニメーション(&M):" msgid "&Menu contents:" msgstr "メニューの内容(&M):" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "マージ(&M)" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "マージ(&M)..." @@ -933,12 +945,16 @@ msgstr "新規(&N)..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "次へ(&N) >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "次のページ(&N)" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "いいえ(&N)" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "ダブルクリックイベントを発生しない(&N)" @@ -955,31 +971,27 @@ msgstr "無し(&N)" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "1ページ(&O)" #. Resource IDs: (1828) msgid "&Onto" -msgstr "" +msgstr "つなぎ先(&O)" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "開く(&O)" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "Git for Windows のウェブサイトを開く(&O)" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "開く(&O)...\tCtrl+O" @@ -992,18 +1004,18 @@ msgid "&Overlay Icon:" msgstr "オーバーレイアイコン(&O):" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "オーバーレイイメージ(&O)" +msgid "&Overlay images\tO" +msgstr "オーバーレイイメージ(&O)\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "パスワード(&P):" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "貼り付け(&P)" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "すべて採用(&P)" @@ -1011,7 +1023,7 @@ msgstr "すべて採用(&P)" msgid "&Port:" msgstr "ポート(&P):" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "印刷プレビュー(&P)" @@ -1019,11 +1031,15 @@ msgstr "印刷プレビュー(&P)" msgid "&Print..." msgstr "印刷(&P)..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "印刷(&P)...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "続行(&P)" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "プル(&P)" @@ -1031,10 +1047,14 @@ msgstr "プル(&P)" msgid "&Push all branches" msgstr "すべてのブランチをプッシュ(&P)" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "コミットをやり直す(&R)" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "リベース(&R)" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "最近のログメッセージ(&R)" @@ -1047,7 +1067,7 @@ msgstr "再帰的(&R)" msgid "&Red:" msgstr "赤(&R):" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "やり直し(&R)" @@ -1063,15 +1083,15 @@ msgstr "更新(&R)" msgid "&Regular Expression" msgstr "正規表現(&R)" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" -msgstr "" +msgstr "後で通知する(&R)" #. Resource IDs: (1617) msgid "&Remote Branch:" msgstr "リモートブランチ(&R):" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "リモートブランチ(&R)" @@ -1079,7 +1099,7 @@ msgstr "リモートブランチ(&R)" msgid "&Remote:" msgstr "リモート(&R):" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "削除(&R)" @@ -1091,7 +1111,7 @@ msgstr "このファイルをインデックスから削除(&R)" msgid "&Replace" msgstr "置換(&R)" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "リポジトリブラウザー(&R)" @@ -1099,7 +1119,7 @@ msgstr "リポジトリブラウザー(&R)" msgid "&Reset" msgstr "リセット(&R)" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "ツールバーをリセット(&R)" @@ -1115,23 +1135,27 @@ msgstr "使用データのリセット(&R)" msgid "&Reset to Default" msgstr "デフォルトの状態に戻す(&R)" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "解決済み(&R)" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "復元(&R)" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "前の状態に復元(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "再試行(&R)" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "このコミットの変更を戻す(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "これらのコミットの変更を戻す(&R)" @@ -1143,7 +1167,7 @@ msgstr "SSHクライアント(&S):" msgid "&Saturation:" msgstr "彩度(&S):" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "保存(&S)" @@ -1151,15 +1175,19 @@ msgstr "保存(&S)" msgid "&Save authentication" msgstr "認証を保存(&S)" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "グラフに名前を付けて保存(&S)..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "選択ファイルのリストを保存(&S)..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "保存(&S)\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "Gitへのパスを設定(&S)" @@ -1167,7 +1195,7 @@ msgstr "Gitへのパスを設定(&S)" msgid "&Set upstream/track remote branch" msgstr "上流/追跡しているリモートブランチに設定(&S)" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "設定(&S)" @@ -1187,7 +1215,7 @@ msgstr "テキストラベルを表示(&S)" msgid "&Signing key ID:" msgstr "署名鍵 ID(&S):" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "スキップ(&S)" @@ -1195,7 +1223,7 @@ msgstr "スキップ(&S)" msgid "&Squash" msgstr "融合(&S)" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "すべて融合(&S)" @@ -1207,7 +1235,7 @@ msgstr "開始(&S)" msgid "&Start Group" msgstr "グループの始まり(&S)" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "スタッシュ(&S)" @@ -1227,7 +1255,7 @@ msgstr "アイコン表示(&S)" msgid "&Tab size:" msgstr "タブ幅(&T):" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "タブ型ドキュメント(&T)" @@ -1235,7 +1263,7 @@ msgstr "タブ型ドキュメント(&T)" msgid "&Tag" msgstr "タグ(&T)" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "タグ(&T)" @@ -1271,7 +1299,7 @@ msgstr "ツールバーとドッキングウィンドウ(&T)" msgid "&Toolbars:" msgstr "ツールバー(&T):" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1283,7 +1311,11 @@ msgstr "TortoiseGitMerge(&T)" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "やり直し(&T)" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "2ページ(&T)" @@ -1291,15 +1323,15 @@ msgstr "2ページ(&T)" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "元に戻す(&U)" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Unified形式の差分" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Unified 形式の差分" @@ -1311,7 +1343,7 @@ msgstr "その他/判定に失敗(&U)" msgid "&Up" msgstr "上へ(&U)" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "項目をこのリビジョンへ更新(&U)" @@ -1323,11 +1355,11 @@ msgstr "上流(&U):" msgid "&Use auto-completion of file paths and keywords" msgstr "ファイルのパスやキーワードの自動補完を使用する(&U)" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "ユーザー名(&U):" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "表示(&V)" @@ -1335,7 +1367,7 @@ msgstr "表示(&V)" msgid "&View:" msgstr "表示(&V):" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "コミットが Signed-off-by を含まない場合に警告(&W)" @@ -1351,6 +1383,10 @@ msgstr "単語単位(&W)" msgid "&Within file" msgstr "ファイルの中で(&W)" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "はい(&Y)" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "空白の変更を無視(&I)" @@ -1359,46 +1395,46 @@ msgstr "空白の変更を無視(&I)" msgid "&known changes" msgstr "把握している変更(&K)" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit のデフォルト)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "（%s から）" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "（変更リストに未分類）" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "（行番号なし）" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "（値なし）" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "（見つかりません）" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(想定外)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- すべて -" @@ -1406,13 +1442,14 @@ msgstr "- すべて -" msgid "--&all" msgstr "すべて (--&all)" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1420,7 +1457,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "ローカルリポジトリのルートの .git/config ファイル (ローカルリポジトリ固有の設定)" @@ -1436,13 +1473,13 @@ msgstr "アイテムのディレクトリの無視リストファイル(.gitigno msgid ".gitignore in the repository root" msgstr "リポジトリルートの無視リストファイル(.gitignore)" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "リポジトリルートの .tgitconfig ファイル" #. Resource IDs: (1020) msgid "< &Previous" -msgstr "" +msgstr "< 前へ (&P)" #. Resource IDs: (16506) msgid "<.....>" @@ -1452,31 +1489,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<すべてのブランチ>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "<ローカルブランチ>" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1485,66 +1522,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit はシェル拡張です。\nつまり、エクスプローラーに統合されます。\nTortoiseGit を使用するために、エクスプローラーを開いて適当なフォルダー上で右クリックして\nコンテキストメニューを表示させてください。そこから TortoiseGit のすべてのコマンドが使用できます。\nあとは、マニュアルをお読みください。" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "警告: これらのブランチが HEAD に完全にマージされているか否かは確認されません。" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "警告: 本操作はリモートのブランチを削除する事になります。" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "警告: このブランチはまだ完全にHEADにマージされていません。" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "現在の HEAD は切り離されました, ブランチ無し(no branch)で作業しています。\nブランチを今作成しますか？" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "本当にすべてのスタッシュを削除しても宜しいですか？" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "スタッシュに保存された変更の再現に失敗しました！" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "スタッシュに保存された変更の復元に失敗しました！" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "スタッシュの操作に失敗しました！" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "mboxが与えられましたが、前のリベースディレクトリにrebase-applyファイルが残っています。どうしますか？" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "競合により変更の再現に失敗しました" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "競合により変更の復元に失敗しました" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "スタッシュに保存された変更の再現に成功しました" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "スタッシュに保存された変更の復元に成功しました" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "スタッシュに成功しました" @@ -1552,7 +1589,7 @@ msgstr "スタッシュに成功しました" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<新しい変更リスト>" @@ -1564,71 +1601,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "入力したタグ名と同じ名前のブランチが既にあります(refが短いと紛らわしくなります)。\n問題を引き起こす可能性があるので避けるべきです。" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "このブランチ名は既に存在します" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "マージプロセスが実行中なので、このコミットはマージコミットになります。マージを中止するには、リセットするか、強制チェックアウトする必要があります。" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "新しいバージョンが利用可能です。最新バージョンをダウンロードしてください。" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "アイコンオーバーレイを表示させるパスのリストを、改行で区切って入力してください。\nパスの末尾に「*」を追加すると、パス内のすべてのファイルやサブディレクトリも表示の対象になります。" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "コンテキストメニューを表示させないパスのリストを、改行で区切って入力してください。\nパスの末尾に「*」を追加すると、パス内のすべてのファイルやサブディレクトリにおいてコンテキストメニューが表示されません。\n何も入力しないと、すべてのパス上でコンテキストメニューが表示されます。" -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "アイコンオーバーレイを表示させないパスのリストを、改行で区切って入力してください。\nパスの末尾に「*」を追加すると、パス内のすべてのファイルやサブディレクトリが表示の対象になりません。\n何も入力しないと、すべてのパス上でアイコンオーバーレイが表示されます。" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "要求されたリソースは使用できませんでした。" -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "入力したブランチ名と同じ名前のタグが既にあります(refが短いと紛らわしくなります)。\n問題を引き起こす可能性があるので避けるべきです。" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "このタグ名は既に存在します" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "GNU 形式の差分ファイル（パッチファイル）用のビューアープログラムを指定する。\r\nデフォルトではメモ帳を使用する。" -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "中止(&B)" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "TortoiseGit について(&B)" @@ -1644,11 +1681,11 @@ msgstr "名前の変更を短縮" msgid "Abbreviated size" msgstr "短縮した文字数" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "中止" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "マージを中止(&M)" @@ -1656,11 +1693,11 @@ msgstr "マージを中止(&M)" msgid "Abort Merge" msgstr "マージ中止" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "実行中のマージを中止します。" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "について" @@ -1680,12 +1717,12 @@ msgstr "TortoiseGitMergeについて" msgid "Accept certificate" msgstr "証明書を受け入れる" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "%1 へのアクセスは拒否されました。" -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "アクション" @@ -1693,26 +1730,26 @@ msgstr "アクション" msgid "Action log" msgstr "アクションログ" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "アクション" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "タスクリストをアクティブにする" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "アクティブなファイル" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Windows を終了すると、ActiveX オブジェクトは保存されません。\n%1 へのすべての変更を破棄しますか？" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "追加" @@ -1720,7 +1757,7 @@ msgstr "追加" msgid "Add &Signed-off-by" msgstr "Signed-off-by を追加 (&S)" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "「%s」を辞書に追加" @@ -1733,15 +1770,15 @@ msgstr "リモートを追加" msgid "Add \"&Signed-off-by\"" msgstr "「Signed-off-by」を追加(&S)" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" -msgstr "" +msgstr "他のコミットを追加しますか?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "拡張子に応じた差分プログラムを追加" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "拡張子に応じたマージプログラムを追加" @@ -1749,15 +1786,15 @@ msgstr "拡張子に応じたマージプログラムを追加" msgid "Add new files automatically to Git" msgstr "新しいファイルを自動的にGitに追加" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "無視リストに追加(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "クイックアクセスツールバーに追加" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "追加..." @@ -1765,11 +1802,11 @@ msgstr "追加..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "拡張子に応じた差分/マージプログラムの追加/編集" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "追加" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1777,25 +1814,25 @@ msgid "" "to the ignore list." msgstr "ファイルパターン\n%s\nを無視リストに追加しました。" -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "追加中" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "ファイルをバージョン管理に追加" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "選択されたファイルもしくはファイルマスクを「無視」リストに追加" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "設定を調整する\n設定" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "高度な設定" @@ -1803,43 +1840,43 @@ msgstr "高度な設定" msgid "Advanced Diff/Merge Settings" msgstr "差分/マージの高度な設定" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "差分の高度な設定" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "マージの高度な設定" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "すべて" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "すべてのコマンド" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "すべてのファイル (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "すべてのファイル (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "すべての親" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "すべてのローカルブランチ" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "すべてのRef" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "すべてのタグ" @@ -1847,47 +1884,47 @@ msgstr "すべてのタグ" msgid "All tags only" msgstr "タグのみ" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "すべての変更が失われます。本当にツールバーとメニューのすべてをリセットしてもよろしいですか？" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "すべての変更が失われます。本当にキーボードの割り当てをリセットしてもよろしいですか？" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "すべての変更が失われます。本当にメニュー「%s」をリセットしてもよろしいですか？" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "すべての変更が失われます。本当にツールバー「%s」をリセットしてもよろしいですか？" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "このビューで編集を許可\n編集を有効化" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "GravatarのURLをカスタマイズ" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." -msgstr "" +msgstr "空のコミット (コミットメッセージはあるがファイルがない) を許す (cf. git commit --allow-empty)" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "最新状態です。" @@ -1903,11 +1940,11 @@ msgstr "このローカルブランチでのpushを常に指定のリモート msgid "Always show long format" msgstr "常に長いフォーマットで表示" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "日付と時刻の表示に、常にシステムの地域と言語の設定を使用します。" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Amend" @@ -1915,12 +1952,12 @@ msgstr "Amend" msgid "Amend &Last Commit" msgstr "最後のコミットをやり直し(&L)" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "*nix 行編集をサポートする外部エディター" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1931,7 +1968,7 @@ msgid "" "%mine: the modified file" msgstr "異なるリビジョンのファイルを比較するために\r\n使用する外部差分ツールを指定する。\r\n\r\nパスに次のパラメーターを使用することができます。\r\n%base : BASEファイル\r\n%mine : 変更後のファイル" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1944,34 +1981,34 @@ msgid "" "%base: the original file without your changes" msgstr "ファイルの競合を解決するために使用する\r\n外部マージツールを指定する。\r\n\r\nパスに次のパラメーターを使用することができます。\r\n%merged : 保存先の競合ファイル名\r\n%theirs : リポジトリ内のファイル\r\n%mine : あなたが変更したファイル\r\n%base : 変更前のオリジナルファイル" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "無効なファイルハンドルが %1 に関連付けられています。" -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "何らかのエラーが発生しました。" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "%1 にアクセス中に何らかのエラーが発生しました。" -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "想定外の種類の行が、%d行目で見つかりました。" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "注釈付き (annotated) タグ" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "右側のブロックを後ろへ追加" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "このブロックを左側の後ろへ追加" @@ -1981,13 +2018,13 @@ msgstr "アプリケーションメニュー: " #. Resource IDs: (32780) msgid "Apply &Patch..." -msgstr "" +msgstr "パッチを適用(&P)..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "パッチを適用..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "パッチを適用..." @@ -1995,7 +2032,7 @@ msgstr "パッチを適用..." msgid "Apply Patches" msgstr "パッチを適用" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "メールボックスから一連のパッチを適用" @@ -2003,7 +2040,7 @@ msgstr "メールボックスから一連のパッチを適用" msgid "Apply unified diff" msgstr "Unified形式の差分を適用" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Aqua スタイル" @@ -2011,39 +2048,39 @@ msgstr "Aqua スタイル" msgid "Arabic" msgstr "アラビア語" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "任意の&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "カラムをリセットしてよろしいですか？" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "リベース処理を中断してもよろしいですか？" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "本当に、ファイルの競合を解決済としてもよろしいですか？" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "本当に%d個の項目をの変更を取り消してもよろしいですか？ 最後の更新以降のすべての変更が失われます。" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "\"%s\" へ保存してよろしいですか?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "垂直方向に並べる(&V)" +msgid "Arrange &vertical\tV" +msgstr "垂直方向に並べる(&V)\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "変更リスト「%s」に割り当てる" @@ -2052,11 +2089,11 @@ msgstr "変更リスト「%s」に割り当てる" msgid "Assigned to:" msgstr "割り当て:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "変更なしとみなす (assume-unchanged)" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "変更なしとみなす (assume-unchanged)" @@ -2068,34 +2105,34 @@ msgstr "\"assume-unchanged\" (TortoiseSVNでは\"ロックが必要\")" msgid "At file &creation" msgstr "ファイルが作られた時に(&C)" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "ファイルが作られた時に" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "リビジョン %d になりました" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "この場合、ブランチ名を変更する事しか出来ません。" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "未サポートの操作を行おうとしました。" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "%1 へのアクセスがその終わりを通り越して行われました。" -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "書き込み中の %1 から読み込もうとしました。" -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "読み取り中の %1 へ書き込もうとしました。" @@ -2112,11 +2149,11 @@ msgstr "認証" msgid "Authentication data" msgstr "認証データ" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "作者" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "著者アドレス" @@ -2124,7 +2161,7 @@ msgstr "著者アドレス" msgid "Author:\t\t\t\tStefan Kueng" msgstr "作者:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "作者" @@ -2146,11 +2183,11 @@ msgstr "自動改行コード変換" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "自動的に隠す" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "自動的にすべてを隠す" @@ -2158,23 +2195,23 @@ msgstr "自動的にすべてを隠す" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "競合がなければ自動的に閉じる" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "エラーがなければ自動的に閉じる" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "選択肢がなければ自動的に閉じる" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "マージ、追加、削除がなければ自動的に閉じる" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2188,7 +2225,7 @@ msgstr "Putty 認証キーの自動ロード(&K)" msgid "Autoload Putty &Key" msgstr "Putty 認証キーの自動ロード(&K)" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "自動" @@ -2208,7 +2245,7 @@ msgstr "平均" msgid "B&rowse..." msgstr "参照(&R)..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "戻る" @@ -2220,7 +2257,7 @@ msgstr "背景" msgid "Baltic" msgstr "バルト" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "ヒストグラム" @@ -2240,7 +2277,7 @@ msgstr "BASEファイル:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "TortoiseSVN の TortoiseIDiff を元にしています" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "基本情報" @@ -2252,45 +2289,45 @@ msgstr "ファイル間:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "二分探索: bad" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "二分探索: good" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "二分探索リセット" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "二分探索開始" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "ビットマップ\nビットマップ" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Black スタイル" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "注釈履歴(行毎の由来)" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "注釈履歴のエラー" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "前のリビジョンの注釈履歴" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "ファイルのそれぞれの行に注釈履歴をつける" @@ -2298,26 +2335,30 @@ msgstr "ファイルのそれぞれの行に注釈履歴をつける" msgid "Blend alpha" msgstr "アルファブレンド" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Blue スタイル" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "ボディ" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg と /logmsgfile の両方が指定されています。\nどちらか片方しか指定できません。" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "パッチファイルと適用先ファイルのパスは、両方とも絶対パスである必要があります!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "下部ビュー:" @@ -2329,30 +2370,30 @@ msgstr "参照(&O)..." msgid "Branc&h:" msgstr "ブランチ(&H):" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "ブランチ" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "ブランチ %s は %s の下流にあります。\n%s は %s へファストフォワードされます" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "ブランチ (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "ブランチ名" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "ブランチ/タグの名前が無効です" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "ブランチ/タグの名前が空であるか、無効です。" @@ -2364,11 +2405,11 @@ msgstr "ブランチ:" msgid "Bro&wse" msgstr "参照(&W)" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "リファレンスをブラウズ" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "外部差分ツールを参照" @@ -2380,7 +2421,7 @@ msgstr "リファレンスをブラウズ" msgid "Browse..." msgstr "参照..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "課題ID" @@ -2392,7 +2433,7 @@ msgstr "課題IDの正規表現(&X):" msgid "Bug-ID/Issue-Nr:" msgstr "課題ID/問題番号:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "課題ID" @@ -2408,7 +2449,7 @@ msgstr "Bugtraq 正規表現テスト - TortoiseGit" msgid "Button Appearance" msgstr "ボタンの外観" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "ボタン１" @@ -2424,7 +2465,7 @@ msgstr "今すぐチェック(&H)" msgid "C&ommands:" msgstr "コマンド(&O):" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "このリビジョンからブランチ/タグを作成(&R)" @@ -2432,11 +2473,11 @@ msgstr "このリビジョンからブランチ/タグを作成(&R)" msgid "C&urrent Keys:" msgstr "現在のキー(&U):" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "切り取り(&U)" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2452,11 +2493,11 @@ msgstr "計算" msgid "Can double-click in log list to compare with previous revision" msgstr "ログリスト内のダブルクリックで直前のリビジョンと比較する" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "静的な ActiveX オブジェクトをアクティブにできません。" -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2465,80 +2506,80 @@ msgid "" "%s" msgstr "%s\nを\n%sにコピーできませんでした。" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "クリップボードにビットマップ画像をコピーできませんでした。" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "新規に画像を作成することはできません。" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "メニューをカスタマイズできません!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "クリップボードからビットマップ画像を貼り付けることはできません。" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "キャンセル" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "キャンセル\nTortoiseGitMergeを終了しない" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "キャンセル\nビューを切り替えない" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "キャンセル\n空ファイルを保持" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "キャンセル\n競合ファイルを先に解決" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "キャンセル\n現在のファイルのままにします" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "キャンセル\n現在の設定のままにします" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "結合してコミットができません。\r\n現在のブランチとフィルターが適用されていない事を履歴から確認して下さい。" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "現在のブランチは強制的にアップデート出来ません。望むなら、リセットを実行してください。" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "履歴を追跡(Blame)出来ません。 \"%s\" は Git による管理対象外です。" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "ファイルの改行コードに一貫性がないため、差分を表示できません。" @@ -2550,7 +2591,7 @@ msgstr "重ねる(&D)" msgid "Cascaded context menu" msgstr "コンテキストメニューに表示する項目" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "大文字/小文字を区別" @@ -2574,33 +2615,33 @@ msgstr "証明書の検証に失敗しました (Certificate verification failed msgid "Change log" msgstr "変更ログ" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "プリンターの変更並びに印刷オプション\n印刷設定" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "印刷オプションの変更\nページ設定" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "アプリケーションのスタイルを変更\nスタイル変更" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "ウィンドウ位置を変更する" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "ウィンドウサイズを変更する" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "変更のタイプ" @@ -2608,38 +2649,38 @@ msgstr "変更のタイプ" msgid "Changed Files" msgstr "変更されたファイル" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "%s と %s の間で変更されたファイル" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "%s, %s と %s, %s の間に変更されたファイル" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "変更されたファイル: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "変更行数（追加/削除したファイルを含む）" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "時期×変更行数（追加/削除したファイルを含む）" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "変更行数（追加/削除したファイルは除く）" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "時期×変更行数（追加/削除したファイルは除く）" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "変更リスト %s を移動しました" @@ -2648,7 +2689,7 @@ msgstr "変更リスト %s を移動しました" msgid "Changes made (double-click on file for diff):" msgstr "変更した項目（ダブルクリックで差分を表示）:" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "アプリケーションのスタイルを変更" @@ -2656,7 +2697,7 @@ msgstr "アプリケーションのスタイルを変更" msgid "Char position where to show a border line in commit text boxes:" msgstr "コミットのテキストボックスにおける、折り返し線の位置:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "チェック" @@ -2668,31 +2709,31 @@ msgstr "更新を確認する - TortoiseGit" msgid "Check For Updates..." msgstr "最新バージョンをチェック..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "変更をチェック(&F)" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "入力したパス、もしくは URL をチェックしてください。" -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "TortoiseGit のサブメニューではなく、コンテキストメニューに直接表示したいメニュー項目にチェックしてください。" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "拡張コンテキストメニュー(Shift + 左クリック)\nに直接表示したいメニュー項目にチェックしてください。" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "ログメッセージにおいて相対時間を表示させる場合はチェックして下さい" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "有効にすると、ログメッセージで短い日付/時刻形式が使用されます。" @@ -2700,31 +2741,31 @@ msgstr "有効にすると、ログメッセージで短い日付/時刻形式 msgid "Check:" msgstr "チェック:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "チェックアウト" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "マージを伴うチェックアウト" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "チェリーピック" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "チェリーピックに失敗" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "選択したコミットをチェリーピック(採用)..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "このコミットをチェリーピック(採用)..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "チェリーピックに失敗! このコミットを飛ばしますか？" @@ -2732,11 +2773,11 @@ msgstr "チェリーピックに失敗! このコミットを飛ばしますか msgid "Chinese" msgstr "中国語" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "リポジトリを選択" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "時系列の逆順 (gitデフォルト)" @@ -2748,78 +2789,78 @@ msgstr "クリーン" msgid "Clean Type" msgstr "クリーンタイプ" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "完全に削除する" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "ごみ箱へ入れる" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "古いリモートブランチをクリーンナップ" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "クリーンアップ" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "クリーンアップ" -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "次のパスを処理する際にクリーンアップが失敗しました。\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "次のパスに対してクリーンアップが正しく行われました。\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "クリア" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "クリアツール\nクリア" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "%ld 個のURL (%ld 個の作業ツリーのための) をクリアします。" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "%ld 個のログメッセージ (%ld 個の作業ツリーのための) をクリアします。" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "%ld 個のユーザー名・パスワードと、%ld 個のSSL証明書と、%ld 個のユーザー名をクリアします。" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "%ld個のリポジトリのログのキャッシュをクリアする" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "保存されている認証データをクリアする。\r\nすべてのリポジトリに対して、再度ユーザー名とパスワードを入力する必要があります。" -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "保存されている%ld個のダイアログの位置と大きさをクリアする" @@ -2828,7 +2869,7 @@ msgstr "保存されている%ld個のダイアログの位置と大きさをク msgid "Click here to go to the website" msgstr "WEBサイトを訪れるにはここをクリックしてください" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "最近入力したメッセージを選択する場合はここをクリックしてください" @@ -2844,17 +2885,17 @@ msgid "" "extension" msgstr "「高度な設定」をクリックすると、それぞれのファイル拡張子に応じたマージプログラムを指定することができます。" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "テキストブロックを移動させるコマンドを見るために、クリックして下さい。\nテキストブロックを使用" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "クリップボード" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "クローン(複製)" @@ -2862,7 +2903,7 @@ msgstr "クローン(複製)" msgid "Clone Existing Repository" msgstr "すでに存在するリポジトリをクローン" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "リポジトリをクローン" @@ -2870,49 +2911,49 @@ msgstr "リポジトリをクローン" msgid "Clone into Bare Repo" msgstr "Bareリポジトリにクローン" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "クローン(複製)..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "閉じる" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "全画面表示を閉じる" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "印刷プレビューを閉じる\n閉じる(&C)" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "手動で閉じる" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "印刷プレビューモードを閉じる\nプレビューモードをキャンセル" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "有効なドキュメントを閉じる\n閉じる" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "ドキュメントを保存するために、アクティブなウィンドウとプロンプトを閉じる" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "折りたたむ" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2938,7 +2979,7 @@ msgstr "色:" msgid "Combine One Mail" msgstr "一つのメールにまとめる" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "一つのコミットに集約" @@ -2946,11 +2987,11 @@ msgstr "一つのコミットに集約" msgid "Comman&ds:" msgstr "コマンド(&D):" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "コマンド" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "コマンドライン" @@ -2958,7 +2999,7 @@ msgstr "コマンドライン" msgid "Command Line To Execute:" msgstr "実行するコマンドライン:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "コマンドの実行に失敗しました。" @@ -2966,41 +3007,41 @@ msgstr "コマンドの実行に失敗しました。" msgid "Commands" msgstr "コマンド" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "コミット" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "コミット %s は、今のところ見えません。" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "コミット %s が \"%s\" の中に見つかりませんでした。サブモジュールを更新しますか?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "コミット日付" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "コミット Email" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "コミット終了" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "コミット情報" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "コミットメッセージ" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "コミット名" @@ -3008,7 +3049,7 @@ msgstr "コミット名" msgid "Commit Ordering:" msgstr "コミット順序:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "親プロジェクトをコミット" @@ -3016,19 +3057,19 @@ msgstr "親プロジェクトをコミット" msgid "Commit to:" msgstr "コミット先:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "コミット..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "作者×コミット数" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "時期×コミット数" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "%sあたりのコミット数" @@ -3037,15 +3078,15 @@ msgstr "%sあたりのコミット数" msgid "Commits each week:" msgstr "週あたりのコミット数:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "変更をリポジトリにコミット" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "コミッターアドレス" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3057,52 +3098,52 @@ msgstr "バージョン管理外のフォルダーをコミットする場合、 msgid "Common Name:" msgstr "Common Name:" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "&HEADのリビジョンを比較(&H)" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "選択した ref を比較" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "２つのファイルを比較" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "空白類を比較" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "作業ツリーと比較(&W)" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "作業ベースと比較(&B)" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "直前のリビジョンと比較" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "差分時にすべてホワイトスペースを比較\n空白類を比較" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "変更点を表示するために、最後にコミットしたリビジョンとファイルを比較する" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "%s と %s を比較してます" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "完了" @@ -3118,7 +3159,7 @@ msgstr "設定のでどころ" msgid "Config type:" msgstr "設定タイプ:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "正規表現フィルターを設定" @@ -3152,11 +3193,11 @@ msgstr "GNUの差分ファイル（パッチファイル）の表示に用いる msgid "Confirm to kill running git process" msgstr "gitプロセスを強制停止する時に確認" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "競合" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "競合したファイル" @@ -3164,15 +3205,15 @@ msgstr "競合したファイル" msgid "Conflict resolved" msgstr "解決済みの競合" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "競合" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "競合" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "競合: %d" @@ -3185,124 +3226,124 @@ msgstr "コンテキストメニュー: " msgid "Context lines for patches" msgstr "パッチのコンテキスト行数" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "続行" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "ドッキングしているウィンドウをコントラクトする" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "空白をタブに変換" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "タブを空白に変換" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "コピー(&Y)" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "コピー" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "コピー" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "%s を %s にコピー, リビジョン %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "SHA-1をクリックボードにコピー" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "コピーツール\nコピー" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "クリップボードにすべての情報をコピー" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "コピーして名前を変更" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "ログをクリップボードにコピー" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "ログをクリップボードにコピー" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "クリップボードにパスをコピー" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "ref名をコピー" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "選択範囲をクリップボードにコピー(&P)" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "選択範囲をクリップボードにコピーする\nコピー" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "クリップボードにコピー" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "コピー: %s の新しい名前" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "%s をコピー中" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "コピー中..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "訂正" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "%s を無視リストに追加できませんでした。" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "最新のバージョンのチェックができませんでした。" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "最新のバージョンのチェックができませんでした。 %s (エラーコード: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3310,76 +3351,76 @@ msgid "" "%s" msgstr "ファイルをコピーできませんでした。\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "ディレクトリがいっぱいなので %1 を作成できません。" -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "最後にコミットしたリビジョンを決定できませんでした。" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "親プロジェクトが見つかりません" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "状態を取得できませんでした。" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "非常に多くのファイルを開いているため、%1 を開くことができません。" -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "ファイルを開くことができません\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 はカレントディレクトリのため削除出来ません。" -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "%s を無視リストから削除できませんでした" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "最初のコミットへリセット出来ませんでした（第一段階）。 中止します..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "最終コミットへリセット出来ませんでした（第二段階）。 中止します..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "元の HEAD へリセット出来ませんでした。" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "URLで指定したファイルを見つけることができませんでした。\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "リビジョン %s のファイル %s が取得出来ませんでした。\nパッチを適用することが出来ません。" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "TortoiseGitBlame　を起動できません" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3387,7 +3428,7 @@ msgid "" "%s" msgstr "差分ビュアーを起動出来ませんでした。\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3395,7 +3436,7 @@ msgid "" "%s" msgstr "外部差分プログラムを起動出来ませんでした。\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3403,11 +3444,11 @@ msgid "" "%s" msgstr "外部マージプログラムを起動出来ませんでした。\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "印刷ジョブを開始できません。" -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3415,11 +3456,11 @@ msgid "" "%s" msgstr "テキストビュアーを起動出来ませんでした。\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Putty エージェント(pageant) を開始出来ませんでした。" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "スレッドを開始できません。" @@ -3427,7 +3468,7 @@ msgstr "スレッドを開始できません。" msgid "Coun&t" msgstr "カウント(&T)" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "カウント: %u個の一致。" @@ -3440,15 +3481,15 @@ msgstr "ライブラリを作成(&L)" msgid "Create .gitignore file" msgstr "無視リストファイルを作成" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "ブランチを作成" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "このバージョンでブランチを作成..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "ブランチを作成..." @@ -3460,29 +3501,29 @@ msgstr "変更リストを作成" msgid "Create New Branch" msgstr "新しいブランチを作成" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "パッチを作成..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "タグを作成" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "このバージョンでタグを作成..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "タグを作成..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "新規ドキュメントを作成\n新規" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3491,49 +3532,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "指定された個数のリビジョンに切り捨てられた履歴を複製します。\nこのリポジトリには、多くの制限があります（このリポジトリから複製、フェッチ、プッシュすることはできませんし、このリポジトリへプッシュすることもできません）。\nこのオプションは、あなたが、長い履歴を持つ大きなプロジェクトの最近の変更だけに興味があり、修正をパッチの形式で送信する場合に適しています。" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "パッチ を作成" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "プルリクエストを作成(&R)" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "ここにリポジトリを作成(&Y)..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "作成しました" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "ブランチないしはタグを作成" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Gitワーキングツリー用に特別設定のライブラリフォルダーを作成" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "２つのファイルの差分からパッチファイルを作成\nパッチを作成" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "現在の位置にリポジトリデータベースを作成" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "すべての変更をもとにUnified形式の差分ファイルを作成" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "プルリクエスト作成..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "資格情報ヘルパーは、空欄に出来ません。" @@ -3545,7 +3586,7 @@ msgstr "資格情報ヘルパー:" msgid "Credentials" msgstr "資格情報" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "切り取り(&T)" @@ -3553,7 +3594,7 @@ msgstr "切り取り(&T)" msgid "Current" msgstr "現在の" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "現在のブランチ" @@ -3561,7 +3602,7 @@ msgstr "現在のブランチ" msgid "Current Branch:" msgstr "現在のブランチ:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3573,7 +3614,7 @@ msgstr "現在のブランチ %s は最新です。\n\n現在のブランチは msgid "Current version is:" msgstr "最新のバージョン:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "最新のバージョン: %s" @@ -3586,7 +3627,7 @@ msgstr "カスタマイズ(&T)..." msgid "Custom" msgstr "ユーザー設定" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "カスタマイズ" @@ -3594,19 +3635,19 @@ msgstr "カスタマイズ" msgid "Customize Keyboard" msgstr "キーボードのカスタマイズ" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "クイックアクセスツールバーをカスタマイズする" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "クイックアクセスツールバーをカスタマイズする..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "カスタマイズ..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3620,88 +3661,92 @@ msgstr "キリル文字" msgid "DCommit Type" msgstr "DCommit タイプ" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "バックグラウンド稼働" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "日時" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "最終コミット日付" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "デフォルト" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "デフォルトメニュー" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "デフォルトのアプリケーションメニュー。ドキュメントを開いていない場合に表示されます。" +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "ログメッセージ数のデフォルトの制限:" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "UTF-8エンコーディングをデフォルトにする" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "削除" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "%d 個のブランチを削除" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "%d 個のリモートブランチを削除" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "%d タグを削除" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "ローカルを削除(&L)" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Refを削除..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "すべてのタグを削除" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "名前で %d 個のアイテムを削除して無視(&I)" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "削除して無視リストに追加(&I)" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "拡張子で %d 個のアイテムを削除して無視(&E) " -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "ブランチを削除" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "ブランチ/タグを削除" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "リモートブランチを削除" @@ -3709,34 +3754,34 @@ msgstr "リモートブランチを削除" msgid "Delete remote tag - TortoiseGit" msgstr "リモートタグ を削除 - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "\"%s\" のリモートのタグを削除..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "リモートタグ を削除..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "サブモジュールを削除" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "タグを削除" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "既にあるブランチを削除するか、違う名前を使ってください" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "削除\nこのファイルは削除" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "削除" @@ -3744,36 +3789,36 @@ msgstr "削除" msgid "Deleted merge conflict" msgstr "削除されたマージの競合" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "削除して、選択したファイルかファイルマスクを無視リストに追加" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "バージョン管理からファイル/フォルダーを削除する" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "バージョン管理からファイル/フォルダーを削除し、ファイル自体は保持する" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "アクションログファイルを削除する" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "削除中" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "キャッシュデータを削除中" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "ファイルを削除中" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "リモートのrefを削除..." @@ -3793,7 +3838,7 @@ msgstr "Describe" msgid "Describe Strategy" msgstr "Describe の方式" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "説明" @@ -3801,7 +3846,7 @@ msgstr "説明" msgid "Description:" msgstr "説明:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "変更リストを選択解除する" @@ -3809,33 +3854,33 @@ msgstr "変更リストを選択解除する" msgid "Destination" msgstr "宛先" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "送り先ディスクドライブはいっぱいです。" -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "移動したブロックを検出して強調" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "任意のコミットのファイルから、移動/複製された行を検知する" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "移動/複製先のファイルが作られたコミットのファイルから、移動/複製された行を検知する" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "同じのコミットで変更されたファイルから、移動/複製された行を検知する" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "ファイルの中で、移動/複製された行を検知する" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3849,11 +3894,15 @@ msgstr "ダイアログのサイズと位置" msgid "Dialogs" msgstr "ダイアログ" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "差分のオプション" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "２つのコミットの差分" @@ -3885,7 +3934,7 @@ msgstr "差分ファイル:" msgid "Diff header" msgstr "diffのヘッダ" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "後で差分を取る" @@ -3897,12 +3946,12 @@ msgstr "diffの位置" msgid "Diff removed lines" msgstr "diffの削除された行" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "\"%s\" と差分を取る" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "親%d との差分" @@ -3915,19 +3964,19 @@ msgstr "以下の間の差分" msgid "Diffing" msgstr "差分" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "コミットの差分を計算中" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "作業ツリーのファイルと最後のコミット以前のものとの差分をとる" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "任意の2コミットの間の差分" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "フォルダー..." @@ -3937,28 +3986,28 @@ msgstr "ディレクトリ:" #. Resource IDs: (1796) msgid "Disable sounds" -msgstr "" +msgstr "音を無効にする" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "大きな作業ツリーを使用している場合や、作業ツリーをブラウズする際に\r\nとても時間がかかるなら、このオプションを無効にしてください。" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" -msgstr "" +msgstr "更新チェックを無効にする" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "無効" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "%1 にアクセス中にディスクがいっぱいになりました。" -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "ディスパッチ例外: %1" @@ -3967,44 +4016,52 @@ msgstr "ディスパッチ例外: %1" msgid "Display &buttons in this order" msgstr "この順序でボタンを表示(&B)" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "すべてのページを表示\n印刷プレビュー" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "クリックされたボタン、メニュー、ウィンドウに対するヘルプを表示する\nヘルプ" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "現在のタスクもしくはコマンドに対するヘルプを表示\nヘルプ" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "ヘルプの使い方を表示する\nヘルプ" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "プログラムの情報、バージョン、コピーライトを表示する\nバージョン情報" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "コミットメッセージのサブジェクトとボディを表示する" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "この警告を再度表示しない (続行が選択された場合のみ有効) (&N)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "２度と警告メッセージを表示しない (無視を選択した場合)(&N)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "行方不明のファイル (git 外の手段で削除された) を自動的に選択しない" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "サブモジュールを自動的に選択しない" @@ -4017,54 +4074,71 @@ msgstr "次のパスではコンテキストメニューを表示しない" msgid "Do not use recycle bin" msgstr "ごみ箱は使用しない" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "本当に%s を削除しても宜しいですか？" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "本当にこのツールバー「%s」を削除してもよろしいですか？" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." -msgstr "" +msgstr "本当に TortoiseGit の自動更新チェックを無効にしますか?\n自動更新チェックは、TortoiseGin の設定の「全般」ページで有効に戻せます。" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "本当に、選択したファイルを \"assume-unchanged (変更なしとみなす)\" とマークしてよろしいですか？" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "本当に、選択したファイルを \"skip-worktree (作業ツリーを保持)\" とマークしてよろしいですか？" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "本当にこのファイルもしくはフォルダーを移動させてもよろしいですか？" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "本当に選択した %d refs を完全に削除していいですか？ 取り消す事はできません！" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "本当に \"%s\" をインデックスから削除してもよろしいですか？" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" -msgstr "本当に\"%s\" を削除しても宜しいですか？" +msgstr "本当に \"%s\" を削除しても宜しいですか？" + +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "本当に、選択した %d 個のファイル/ディレクトリをインデックスから削除してもよろしいですか？" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "本当に、選択した %d 個のファイル/ディレクトリを削除してもよろしいですか？" -#. Resource IDs: (69) +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "本当にコピーを復元してもよろしいですか？コピーを作成した後のすべての変更が失われます。" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4072,7 +4146,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "本当に\n%s\nのすべての変更を取り消して、このリビジョンに戻りますか？\nワーキングツリーでリビジョンをさかのぼって逆マージされて変更が取り消されます。" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4080,21 +4154,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "本当に、このリビジョンで作成した\n%s\nのすべての変更を取り消しますか?\nワーキングツリーでリビジョンをさかのぼって逆マージされて変更が取り消されます。" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "本当に、選択したファイルから、フラグ \"assume-unchanged (変更なしとみなす)\" あるいは \"skip-worktree (作業ツリーを保持)\" を削除してよろしいですか？" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "新しく追加されたリモートからブランチをフェッチしますか？" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "変更があったファイルを読み込みますか？" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4102,21 +4176,21 @@ msgid "" "as resolved?" msgstr "以下のファイルを解決済みとしてマークしますか？\n%s" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "自動保存したドキュメントを復元しますか？" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "設定の変更を反映させるために、ドキュメントを再読み込みしますか？\n注意: 行ったすべての変更が失われます。" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "変更点を表示しますか？" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "スタッシュに保存した変更を復元しますか？" @@ -4124,28 +4198,28 @@ msgstr "スタッシュに保存した変更を復元しますか？" msgid "Document :" msgstr "ドキュメント:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "ブランチ「%s」を把握していないため何をプッシュするか不明です" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "URLが入力されたために何をプッシュするか不明です" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "自動保存されたドキュメントを復元しない\n明示的に保存した最新のバージョンのドキュメントを使用する" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "保存しない\n変更を保存しないでビューを閉じる" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4153,13 +4227,13 @@ msgstr "保存しない\n変更点を保存しないでビューを再読込" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" -msgstr "" +msgstr "選択したアイテムは表示しません (Shiftキーを押していると表示します)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "このメッセージを再び表示しない" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "終了" @@ -4171,7 +4245,7 @@ msgstr "下へ" msgid "Download" msgstr "ダウンロード" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "ドラッグするとメニューがフローティング表示になります" @@ -4199,6 +4273,10 @@ msgstr "ダミーボタンフォーム" msgid "Dumy Group For locat TabCtr" msgstr "locat TabCtrの為のダミーグループ" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "非選択を編集(&D)" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "除外するパス(&X):" @@ -4207,7 +4285,7 @@ msgstr "除外するパス(&X):" msgid "E&xit" msgstr "終了(&X)" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "エクスポート(&X)..." @@ -4227,11 +4305,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "東ヨーロッパ" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "編集" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "このユーザの設定を編集(&G)" @@ -4247,23 +4325,23 @@ msgstr ".tgitconfigを編集" msgid "Edit Button Image" msgstr "ボタンイメージを編集" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "ノートを編集" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "作者を編集" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "説明を編集" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "拡張子に応じた差分プログラムを編集" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "拡張子に応じたマージプログラムを編集" @@ -4275,11 +4353,11 @@ msgstr "このユーザの設定を編集(&O)" msgid "Edit global &XDG git/config" msgstr "このユーザーのXDG設定を編集(&X)" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "ローカルのgit configを編集" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "ログメッセージを編集" @@ -4293,31 +4371,31 @@ msgstr "編集..." #. Resource IDs: (1827) msgid "Edit/Split commit" -msgstr "" +msgstr "編集/分割してコミット" #. Resource IDs: (1770) msgid "Effective" msgstr "有効値" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "プロキシサーバーの名前もしくは IP を入力します" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "楕円ツール\n楕円" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "メール" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "同時に To/Cc に空白を指定する事はできません。" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "メール" @@ -4325,7 +4403,7 @@ msgstr "メール" msgid "Empty" msgstr "空" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "編集を 有効化" @@ -4341,7 +4419,7 @@ msgstr "Gravatarを有効化" msgid "Enable drag context menu" msgstr "ドラッグ時コンテキストメニューを有効化" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "ログキャッシュファイル(tortoisegit.data, tortoisegit.index)の保存/読込を有効にする" @@ -4350,10 +4428,14 @@ msgstr "ログキャッシュファイル(tortoisegit.data, tortoisegit.index) msgid "Enable log cache" msgstr "ログキャッシュの有効化" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "ログダイアログでGravatar画像の表示を有効にする" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "シンタックスハイライトを有効化" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "有効なオーバーレイハンドラー" @@ -4362,35 +4444,35 @@ msgstr "有効なオーバーレイハンドラー" msgid "Encode" msgstr "エンコード" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "エンコーディング" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "%1 にアクセス中にハードウェア I/O エラーが通知されました。" -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "%1 にアクセス中にロック違反が発生しました。" -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "%1 にアクセス中に共有違反が発生しました。" -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "不適切な引数に遭遇しました。" -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "%1 の読み込み中に想定外のエラーが発生しました。" -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "%1 の書き込み中に想定外のエラーが発生しました。" @@ -4403,11 +4485,11 @@ msgstr "暗号化" msgid "End" msgstr "終わり" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "改行コードの形式" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "ウィンドウを最大化する" @@ -4415,23 +4497,23 @@ msgstr "ウィンドウを最大化する" msgid "Enter Log Message" msgstr "ログメッセージを入力" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "URLを入力" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "GUIDを入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "通貨を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "日付/時刻を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "日付を入力してください。" @@ -4439,33 +4521,33 @@ msgstr "日付を入力してください。" msgid "Enter a name for the changelist:" msgstr "変更リストの名前を入力して下さい:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "%1 ～ %2 の間の数値を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "数値を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "正の整数を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "時刻を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "%1 ～ %2 の間の整数を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "0 ～ 255 の間の整数を入力してください。" -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "整数を入力してください。" @@ -4477,7 +4559,7 @@ msgstr "テストするファイルの内容を入力:" msgid "Enter log &message:" msgstr "ログメッセージを入力(&M):" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "%1 文字以上は入力できません。" @@ -4486,43 +4568,43 @@ msgstr "%1 文字以上は入力できません。" msgid "Enter the regex string below:" msgstr "正規表現を入力:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "すべてを削除する\n全削除" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "選択範囲を削除する\n削除" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "エラー" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "シェルのアイコンキャッシュの再構築中にエラーが発生しました。" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "\"%s\" のためのサーバー証明書の検証におけるエラー:" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "レジストリーキー %s の読み込み/書き込みに失敗しました\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "すべての更新を完了しました。" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4532,28 +4614,28 @@ msgstr "実行ファイル (*.exe)|*.exe|コマンド (*.com)|*.com|PDFファイ msgid "Executable (+x)" msgstr "実行可能 (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "存在しています" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "終了" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "展開（%s）" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "ドッキングしたウィンドウを展開する" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "エクスプローラーで開く" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "エクスポート" @@ -4561,36 +4643,36 @@ msgstr "エクスポート" msgid "Export Zip File" msgstr "zipファイルへエクスポート" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "エクスポート先ディレクトリ:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "選択したアイテムをエクスポート..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "このバージョンをエクスポート..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "バージョン管理外のファイルもエクスポートする" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "エクスポート %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "エクスポート中..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "リビジョンをzipファイルにエクスポート" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "拡張子" @@ -4606,7 +4688,7 @@ msgstr "拡張子:" msgid "Extern DLL Path:" msgstr "外部DLLへのパス:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "外部" @@ -4614,101 +4696,101 @@ msgstr "外部" msgid "External Program:" msgstr "外部プログラム:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "フェード" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "失敗" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "変更の取り消しに失敗しました" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "\"%s\" のチェックアウトに失敗しました" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "\"%s\" のリビジョン %s を \"%s\" にチェックアウトする事に失敗しました。" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "接続に失敗しました。\nリンクが壊れている可能性があります。" -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "ActiveX オブジェクトの変換に失敗しました。" -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "空のドキュメントの作成に失敗しました。" -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "オブジェクトの作成に失敗しました。アプリケーションがシステムレジストリに入力されているかを確認してください。" -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "プルリクエストの作成に失敗しました。" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "ベースファイルの取得に失敗しました。" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "マージファイルの取得に失敗しました。" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "ヘルプを起動できませんでした。" -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "サーバーアプリケーションの実行に失敗しました。" -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "ドキュメントを開くことができませんでした。" -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "サーバー操作の実行に失敗しました。" -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "ドキュメントを保存できませんでした。" -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "変更リスト「%s」の設定/削除に失敗しました" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "課題追跡システムのCOMプロバイダー「%s」の起動に失敗しました。\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "pageantが鍵を読み込み終えるまでの待機に失敗しました。" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "失敗" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "ファストフォワード" @@ -4716,62 +4798,62 @@ msgstr "ファストフォワード" msgid "Fast Forward o&nly" msgstr "ファストフォワードのみ(&N)" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "%s へファストフォワード" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "フェッチ(&H)" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "フェッチ" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "フェッチ＆リベース(&B)" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "SVN リポジトリからのフェッチ" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "\"%s\" からのフェッチ" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "フェッチ&&リベース(&B)" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "フェッチ(ローカルへ反映―要マージ)..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "ステータスをフェッチ..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "変更したファイルをフェッチしています..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "ファイルを取り出す..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "リビジョン %s のファイルを取得中:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "ファイル" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "ファイルのエンコーディング" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "%sあたりのファイル変更数" @@ -4780,27 +4862,27 @@ msgstr "%sあたりのファイル変更数" msgid "File changes each week:" msgstr "週あたりのファイル変更数:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "ファイルの差分" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "ファイルの競合はありません" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "ファイルは空です。" -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "ファイルリストは空です" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "ファイルパッチ" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4812,7 +4894,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "ファイルサイズ:\t%s (%s)\n画像の幅:\t\t%ld pixel\n画像の高さ:\t%ld pixel\n水平方向の解像度:\t%.1f dpi\n垂直方向の解像度:\t%.1f dpi\n色深度:\t\t%d bit\nズーム:\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4832,7 +4914,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "ファイルサイズ:\t%s (%s)\n画像の幅:\t\t%ld pixel\n画像の高さ:\t%ld pixel\n水平方向の解像度:\t%.1f dpi\n垂直方向の解像度:\t%.1f dpi\n色深度:\t\t%d bit\nズーム:\t\t%d%%\n\nファイルサイズ:\t%s (%s)\n画像の幅:\t\t%ld pixel\n画像の高さ:\t%ld pixel\n水平方向の解像度:\t%.1f dpi\n垂直方向の解像度:\t%.1f dpi\n色深度:\t\t%d bit\nズーム:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4844,7 +4926,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "ファイルサイズ:\t%s (%s)\n画像の幅:\t\t%ld pixel\n画像の高さ:\t%ld pixel\n水平方向の解像度:\t%.1f dpi\n垂直方向の解像度:\t%.1f dpi\n色深度:\t\t%d bit\nズーム:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4864,7 +4946,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "ファイルサイズ:\t%s (%s)\n画像の幅:\t\t%ld pixel\n画像の高さ:\t%ld pixel\n水平方向の解像度:\t%.1f dpi\n垂直方向の解像度:\t%.1f dpi\n色深度:\t\t%d bit\nズーム:\t\t%d%%\n\nファイルサイズ:\t%s (%s)\n画像の幅:\t\t%ld pixel\n画像の高さ:\t%ld pixel\n水平方向の解像度:\t%.1f dpi\n垂直方向の解像度:\t%.1f dpi\n色深度:\t\t%d bit\nズーム:\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "ファイル名" @@ -4872,17 +4954,17 @@ msgstr "ファイル名" msgid "Files" msgstr "ファイル" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "塗りつぶしツール\n塗りつぶし" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "絞り込み条件：" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "パスフィルター" @@ -4894,11 +4976,11 @@ msgstr "フィルター:" msgid "Filter: " msgstr "フィルター: " -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "検索" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4906,19 +4988,19 @@ msgstr "指定された文字列を検索する\n検索" #. Resource IDs: (65535) msgid "Find:" -msgstr "" +msgstr "検索:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "検索: テキスト「%s」が見つかりません" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "検索: ドキュメントの先頭に達したため、末尾から最初のものを検索しました。" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "検索: ドキュメントの末尾に達したため、先頭から最初のものを検索しました。" @@ -4926,23 +5008,23 @@ msgstr "検索: ドキュメントの末尾に達したため、先頭から最 msgid "Fingerprints" msgstr "Fingerprints" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "終了" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "リベースが終了しました。" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "終了" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "1つ目の親だけさかのぼる" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "1つ目の親だけ" @@ -4951,18 +5033,18 @@ msgid "First known &bad:" msgstr "問題のあるものの最初(&B):" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "画像の高さを合わせる(&H)" +msgid "Fit image &heights\tH" +msgstr "画像の高さを合わせる(&H)\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "画像の幅を合わせる(&W)" +msgid "Fit image &widths\tW" +msgstr "画像の幅を合わせる(&W)\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "フロッピードライブ (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "フォルダー" @@ -4974,38 +5056,34 @@ msgstr "名前の変更を超えてさかのぼる" msgid "Font" msgstr "フォント" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "F1でヘルプ、Ctrl+ホイール操作で横スクロール" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "すべての履歴を表示するためには「コピー/名前変更が発生したら停止」のチェックをはずしてください" -#. Resource IDs: (1521) -msgid "Force" -msgstr "強制実行" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "同じ名前がすでに存在しても、強制的にブランチ/タグを作ります。" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "リモートの追跡しているブランチが、このローカルリポジトリが把握しているのと同じコミットにある時に限り、強制的にプッシュします。\nリモートリポジトリのコミットを失う可能性があります。\nこのオプションは、git の --force--with-lease に相当します。" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "安全性のチェックなしに、選択されたリモートの参照へプッシュし、上書きします。\nこれによって、リモートリポジトリの、まだ把握していないコミットが失われるかもしれません。\nこのオプションは、git の --force に相当します。" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5023,20 +5101,20 @@ msgstr "テキストの色" msgid "Format Patch" msgstr "パッチを作成" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "パッチを作成..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "前へ" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "前進 %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5066,11 +5144,11 @@ msgstr "変更されたファイルから(&M)" msgid "From SVN Repository" msgstr "SVNのリポジトリから" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "存在するファイルから" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "変更されたファイルから" @@ -5078,7 +5156,7 @@ msgstr "変更されたファイルから" msgid "From:" msgstr "From:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "フルスクリーン" @@ -5086,7 +5164,7 @@ msgstr "フルスクリーン" msgid "Full text search" msgstr "全文検索" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "完全再帰" @@ -5094,7 +5172,7 @@ msgstr "完全再帰" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "コミットダイアログのさらなるオプションが、ダイアログ3のページにあります。" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5102,24 +5180,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplified)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+を初期化できませんでした。" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+はビットマップオブジェクトを作成できませんでした。おそらく十分なメモリがありません。" -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" -msgstr "" +msgstr "タグをGPGで署名します。詳細は、マニュアルを参照してください。" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "情報収集中です。しばらくお待ちください..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "統計情報収集中" @@ -5163,29 +5241,29 @@ msgstr "全般::ダイアログ3" msgid "General::Set Extend Menu Item" msgstr "全般::拡張メニュー" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "マージのログを取得する" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "%s を取得中" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "%s のリビジョン%sを取得中" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "情報を取得中..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "必要な情報を取得中..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Unified 形式の差分を取得中" @@ -5197,23 +5275,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git コマンド実行中" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git: ファイルをコピーしてバージョン管理へ追加" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git: バージョン管理されたファイルをここへコピーして名前を変更" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git: バージョン管理されたファイルをここへコピー" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git: すべてのアイテムをここへエクスポート" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git: バージョン管理されたファイルをここへエクスポート" @@ -5221,35 +5299,35 @@ msgstr "Git: バージョン管理されたファイルをここへエクスポ msgid "Git Init" msgstr "リポジトリの作成(Git Init)" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Git をインストールしたパス" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "履歴を表示(Git Log)" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git: バージョン管理されたファイルをここへ移動して名前を変更" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git: バージョン管理されたファイルをここへ移動" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "リモート設定(Git Remote Settings)" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "リビジョン一覧（Git Revision List)" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVNリベース(ローカルへ反映)" @@ -5261,7 +5339,7 @@ msgstr "Git 同期" msgid "Git clone - TortoiseGit" msgstr "Git クローン - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Git ディレクトリーがセットされていません (設定の\"全般\" 設定ページを見てください)." @@ -5269,23 +5347,23 @@ msgstr "Git ディレクトリーがセットされていません (設定の\" msgid "Git for Windows" msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git for Windows (https://msysgit.github.io/) が見つかりませんでした。" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "リポジトリを作成する際にエラーが発生しました！\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Gitリビジョンリストはファイルの完全な履歴を含みます" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Gitリビジョンリストはファイルの名前の変更を追跡します" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5306,7 +5384,7 @@ msgstr "Git::資格情報" msgid "Git::Remote" msgstr "Git::リモート" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "グローバル" @@ -5318,47 +5396,47 @@ msgstr "行移動" msgid "Go to line" msgstr "行移動" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "次の競合点へ移動する\n次の競合" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "次の相違点へ移動する\n次の相違" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "次の行内相違点へ移動\n次の行内相違" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "以前の競合へ\n前の競合" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "前の相違点へ移動する\n前の相違" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "前の行内相違点へ移動\n前の行内相違" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "行移動" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "グラフ" @@ -5374,11 +5452,11 @@ msgstr "灰色" msgid "Greek" msgstr "ギリシア語" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "変更リストのグループ化" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "無関係な変更のパスを隠す(&H)" @@ -5394,7 +5472,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "ハード" @@ -5406,7 +5484,7 @@ msgstr "Hard: 作業ツリーとインデックスをリセット（コミット msgid "Hebrew" msgstr "ヘブライ語" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "ヘルプ" @@ -5430,11 +5508,11 @@ msgstr "16進" msgid "Hide Menus for unversioned paths" msgstr "バージョン管理外のパスではメニューを表示しない" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "パッチを隠す<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "ドッキングしているウィンドウを隠す" @@ -5442,25 +5520,25 @@ msgstr "ドッキングしているウィンドウを隠す" msgid "Hide the script while running" msgstr "実行時はスクリプトを非表示にする" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "変更のないものを隠す" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Ref比較リストにおいて変更のないものを隠す" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "パッチファイルの一覧を表示/非表示" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "パッチファイルのリストを表示もしくは非表示にする\nパッチリストの表示/非表示" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "ヒント" @@ -5470,7 +5548,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "ヒント: コンテキストメニューを選択し、ページを「コマンド」に変更してメニューウィンドウにツールバーボタンをドラッグします。" -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "ホーム" @@ -5486,7 +5564,7 @@ msgstr "フックスクリプト::課題追跡システム管理設定" msgid "Hook Scripts::Issue Tracker Integration" msgstr "フックスクリプト::課題追跡システムとの統合" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "フックの種類" @@ -5502,7 +5580,7 @@ msgstr "含めるパス(&N):" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5510,55 +5588,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" -msgstr "" +msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" -msgstr "" +msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" -msgstr "" +msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" -msgstr "" +msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" -msgstr "" +msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" -msgstr "" +msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5566,15 +5645,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5598,7 +5677,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5606,7 +5685,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5614,7 +5693,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5622,16 +5701,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5642,17 +5721,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5664,7 +5743,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5728,7 +5807,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "アイコンオーバーレイ" @@ -5740,7 +5819,7 @@ msgstr "アイコンオーバーレイ::アイコンセット" msgid "Icon Overlays::Overlay Handlers" msgstr "アイコンオーバーレイ::オーバーレイハンドラー" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5750,52 +5829,52 @@ msgstr "アイコン ファイル (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jp msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "アイコン/デザイン/コード:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "同一" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "有効にすると、「名前を付けて保存」や「開く」ダイアログ内でオーバーレイやコンテキストメニューが非表示になります。" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "チェックされれば--trackオプションをgitコマンドへ渡します。クリアされれば、--no-trackを渡します。いずれでもなければ、--trackも--no-trackも渡しません。（ヘルプを参照して下さい）" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "有効にすると、ログリスト内でリビジョンをダブルクリックすると直前のリビジョンと比較します。" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "有効にした場合、保存作業中にエラーが検知された場合に再びコミットダイアログが\r\n自動的に開始されます。" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "有効にした場合、 TortoiseGit は週に一度新しいバージョンがリリースされているかを調べます" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "有効にすると、オーバーレイの対象から除外されている作業ツリーのフォルダーが、\n「通常」の状態としてオーバーレイ表示されます。\n無効にすると、オーバーレイは表示されません。" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "有効にすると、バージョン管理外のフォルダーに存在するファイルが状態表示コントロールに表示されます。\r\n状態表示コントロールは、コミットダイアログなどで使用されています。" -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5808,16 +5887,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "もしこのフォルダーで編集作業を行いたいのであれば、チェックを外して下さい。典型的にはBareリポジトリはプッシュされた変更だけを含みます。\n（慣例により、Bareリポジトリは .git で終わる名前にして下さい。）" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "無視" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "拡張子によって%d個の項目を無視する(&E)" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "コメントを無視" @@ -5829,15 +5908,15 @@ msgstr "無視ファイル" msgid "Ignore Type" msgstr "無視タイプ" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "すべての空白を無視" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "全空白類の変更を無視" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "空行を無視" @@ -5845,7 +5924,7 @@ msgstr "空行を無視" msgid "Ignore case cha&nges" msgstr "大文字/小文字の変更を無視(&N)" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5863,11 +5942,11 @@ msgstr "再帰的にアイテムを無視します" msgid "Ignore line &endings (recommended)" msgstr "改行コードを無視する（推奨）(&E)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "行末の空白を無視" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "空白の変更を無視" @@ -5875,29 +5954,29 @@ msgstr "空白の変更を無視" msgid "Ignore whitespace" msgstr "空白類を無視" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "空白類の変更を無視" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "親のバージョンと子のバージョンを比較するときに、ホワイトスペースを無視する" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "無視" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "無視したファイル" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "差分時にすべてのホワイトスペースの変更を無視\n全空白類の変更を無視" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5915,24 +5994,24 @@ msgstr "イメージとテキスト(&A)" msgid "Images" msgstr "画像" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "直接の子階層（フォルダーを含む）" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "インポート" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "%s を %s%s へインポート" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "SVNの無視リストをインポート" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "SVNの無視リストをインポート..." @@ -5941,16 +6020,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "SVNの無視リストを .git/info/exclude へインポート（上書きします）" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "%s をインポート" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "受け入れ変更リスト" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "受け入れコミット" @@ -5968,30 +6047,30 @@ msgstr "無視ファイルを含める(&I)" #. Resource IDs: (1797) msgid "Include FETCH_HEAD in branch selection boxes" -msgstr "" +msgstr "ブランチの選択ダイアログに FETCH_HEAD も含める" #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "次のリビジョン範囲のみを含める:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "ファイル名が正しくありません。" -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "初期インポート" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "\"%s\" を空のGitレポジトリとして初期化しました。" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "行内差分" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "単語単位 行内差分" @@ -6003,25 +6082,25 @@ msgstr "行内差分" msgid "Input" msgstr "入力" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "クリップボードの内容を挿入する\n貼り付け" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "操作を行うのに、十分なメモリがありません。" -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "内部アプリケーションエラー。" -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "無効な通貨です。" -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "不正なリビジョン番号！" @@ -6029,7 +6108,7 @@ msgstr "不正なリビジョン番号！" msgid "Issuer:" msgstr "Issuer:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6052,7 +6131,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "維持" @@ -6060,11 +6139,11 @@ msgstr "維持" msgid "Keep changelists" msgstr "変更リストを保持する" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "ローカルにファイルを保持しますか？" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6078,7 +6157,7 @@ msgstr "キーボード" msgid "Keyboard shortcuts:" msgstr "キーボードショートカット:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "キー" @@ -6122,19 +6201,39 @@ msgstr "ライン8" msgid "Language:" msgstr "言語:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "最後の %s コミット" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "最後の %s ヶ月" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "最後の %s 週間" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "最後の %s 年間" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "最終更新者" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "最後のコミット" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "最終更新" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "最後の修正:" @@ -6142,7 +6241,11 @@ msgstr "最後の修正:" msgid "Last known &good:" msgstr "問題の無かったものの最後(&G):" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "最後に選択した日付" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "競合を解決するために、外部の差分/マージプログラムを起動" @@ -6150,17 +6253,17 @@ msgstr "競合を解決するために、外部の差分/マージプログラ msgid "Least active author:" msgstr "最も活発でない作者:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "競合したままにする\nファイルの競合状態を保持" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "マークされたブロックだけを残す" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "左ビュー: " @@ -6168,11 +6271,11 @@ msgstr "左ビュー: " msgid "Left image" msgstr "左側の画像" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "折れ線グラフ" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6186,12 +6289,12 @@ msgstr "行差分バー" msgid "Line differences" msgstr "行差分" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "%ld 行目から移動した行" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "%ld 行目へ移動した行" @@ -6204,26 +6307,26 @@ msgstr "線の幅" msgid "Line:" msgstr "行番号:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "行番号: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "追加した行" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "削除した行" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "ヘルプトピックを列挙\nヘルプトピック" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6241,23 +6344,23 @@ msgstr "画像を開く" msgid "Load Putty &Key" msgstr "Putty 認証キーのロード(&K)" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "変更を読み込み\nTortoiseGitMerge でした変更は失われ、新しいコンテンツが読み込まれます。" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "変更を読み込み\nビューは新しいコンテンツで更新されます。" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "読み込み中..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "ローカル" @@ -6265,13 +6368,13 @@ msgstr "ローカル" msgid "Local Branch" msgstr "ローカルブランチ" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "ローカルの変更を無視 (\"assume-unchanged (変更なしとみなす)\" もしくは \"skip-worktree (作業ツリーを保持)\" フラグが付いたファイル)" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "ローカルの状態" @@ -6279,7 +6382,7 @@ msgstr "ローカルの状態" msgid "Local:" msgstr "ローカル:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6289,7 +6392,7 @@ msgstr "レポジトリの選択したリビジョンの内容を保存する位 msgid "Locator Bar" msgstr "位置バー" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "ログ" @@ -6329,12 +6432,12 @@ msgstr "ログメッセージ（ログダイアログ）" msgid "Login:" msgstr "ログイン:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "一番下の表示リビジョン: %ld - 一番上の表示リビジョン: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6345,7 +6448,7 @@ msgstr "一番下の表示リビジョン: %ld - 一番上の表示リビジョ msgid "Lum" msgstr "明度" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6357,14 +6460,10 @@ msgstr "マッキントッシュ" msgid "Mail" msgstr "メールl" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "メールシステムDLLは無効です。" -#. Resource IDs: (156) -msgid "Main" -msgstr "メイン" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Bare を生成(作業ディレクトリーを作りません)" @@ -6377,47 +6476,47 @@ msgstr "管理(&G)" msgid "Manage" msgstr "管理" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "リモートを管理" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "解決済み とする" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "解決済みとする\nファイルのステータスは、修正済みに変更" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "後で差分を取るためにマーク" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "このブロックをマークする" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "マークされたブロック" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Git上でファイルを解決済みとマークします\n解決済みとする" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "マークしたリビジョンに問題があります" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "マークしたリビジョンは適切です" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "大文字と小文字を区別(&C)" @@ -6441,7 +6540,7 @@ msgstr "最近使用したコマンドをメニューの最初に表示する(&N msgid "Menu" msgstr "メニュー" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "メニューバー" @@ -6449,7 +6548,7 @@ msgstr "メニューバー" msgid "Menu s&hadows" msgstr "メニューの影(&H)" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "マージ" @@ -6457,34 +6556,34 @@ msgstr "マージ" msgid "Merge &Message" msgstr "メッセージをマージ(&M)" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "マージポイント" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "マージの再統合" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "オリジナルのブランチと、作業ツリーの内容と、切り替え先のブランチとをマージする" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "\"%s\" へマージする..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "マージ済み" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "マージしたファイル" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "異なるブランチへマージ" @@ -6492,22 +6591,22 @@ msgstr "異なるブランチへマージ" msgid "Merging" msgstr "マージ" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "%s のリビジョン %s から %s のリビジョン %s までを、%s, %s%s へマージ" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "マージを行うには、「元:」と「先:」に異なるリビジョン、もしくは異なるURLを指定する必要があります。" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "リビジョン %s (%s の) を %s, %s%s へマージ" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "メッセージ" @@ -6519,7 +6618,7 @@ msgstr "メッセージのみ (&Y)" msgid "Message part &expression:" msgstr "メッセージ部の正規表現(&E):" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "メッセージ" @@ -6527,11 +6626,11 @@ msgstr "メッセージ" msgid "Min" msgstr "最小" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "こちら側" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "リボンを最小化する" @@ -6543,7 +6642,11 @@ msgstr "コミットメッセージの最低文字数:" msgid "Misc" msgstr "その他" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "行方不明" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "ミックス" @@ -6551,35 +6654,35 @@ msgstr "ミックス" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作業ツリーは現状を維持し、インデックスはリセット" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "変更日" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "変更" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "変更されたファイル" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "その他" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "その他のボタン" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "その他のコマンド..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "その他の色..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "その他..." @@ -6599,41 +6702,41 @@ msgstr "下へ移動(&D)" msgid "Move &Up" msgstr "上へ移動(&U)" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "項目を下へ移動" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "項目を上へ移動" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "移動して名前を変更" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "変更リストへ移動" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "移動/名前変更" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "移動: %s の新しい名前" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "変更を取り消す前に、変更したファイルをごみ箱へ移動します。" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "%s を移動中" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "移動中..." @@ -6641,11 +6744,11 @@ msgstr "移動中..." msgid "My file:" msgstr "My ファイル:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "名前" @@ -6657,7 +6760,7 @@ msgstr "名前:" msgid "Navigate" msgstr "移動" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6667,11 +6770,11 @@ msgstr "ビューの指定行へ移動\n行移動" msgid "Navigation Pane Options" msgstr "ナビゲーション領域の設定" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "ナビゲーション領域の設定..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "入れ子" @@ -6683,7 +6786,7 @@ msgstr "ネットワーク" msgid "Network::Email" msgstr "ネットワーク::メール" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "新規" @@ -6692,43 +6795,43 @@ msgid "New &name:" msgstr "新しい名前(&N):" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "新規ブランチタグ/タグ" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "新規メニュー" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "新しいハッシュ" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "新しいメッセージ" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "%s の新しい名前" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "新しい名前は、空、もしくは、元々と同じ名前であってはいけません！" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "新しい名前:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "新しいサブモジュール" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "新しいコミット時刻" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "改行文字" @@ -6736,33 +6839,29 @@ msgstr "改行文字" msgid "Next" msgstr "次へ" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "次のページ\n次のページ" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "次の 競合" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "次の 相違" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "次の 行内相違" -#. Resource IDs: (73) -msgid "No" -msgstr "いいえ" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "ファストフォワードしない(&F)" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "マージなし(&M)" @@ -6774,102 +6873,107 @@ msgstr "チェックアウトしない" msgid "No Co&mmit" msgstr "コミットしない(&M)" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "HEADが見つかりません" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "コマンドが指定されませんでした。\n\nTortoiseGitProc.exe はシェル拡張より使用されます。ダイレクトに呼び出す事は出来ません。" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "何のコマンド値も指定されません。" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "相違点は見つかりませんでした。" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "違いは見つかりませんでした。サブモジュールは更新していません。今サブモジュールを更新しますか？" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "どのエラーメッセージも使用できません。" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "エラーは何も起きませんでした。" -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "マージ後の追加の変更はありませんでした" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "ファイルやフォルダーは何も変更されていません。 TortoiseGit が取り消す変更は何もありません。" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "現在の設定では表示するファイルはありません。\nバージョン管理外、無視、未変更、のファイルを見るためには以下の設定にチェックをしてください。\nリモートでの変更を見るためには、「リポジトリをチェック」をクリックしてください。" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "現在の設定では表示するファイルはありません。\nバージョン管理外、無視、未変更、のファイルを見るためには以下の設定にチェックをしてください。" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "最後のコミットから変更/追加されたファイルはありません。\n今回、TortoiseGitがすることは何もありません..." +"the last commit." +msgstr "最後のコミットから\n変更/追加されたファイルはありません。" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "最後のコミットから変更/追加されたファイルはありません。\n今回、TortoiseGitがすることは何もありません...\nバージョン管理外のファイルを見ますか。" +msgstr "最後のコミットから\n変更/追加されたファイルはありません。\nバージョン管理外のファイルを見ますか？" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "グラフを利用できません" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "%s に対する画像エンコーダが見つかりません。" -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "制限しない" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "それ以上リビジョンは見つかりませんでした。" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "直近のバージョンではありません。" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "リファレンスが見つかりません" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "スペルの訂正はありません" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "状態をキャッシュしません。バージョン管理されたフォルダーのみオーバーレイされ、ファイルはオーバーレイ表示されません。" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "シソーラスからの提案はありません" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "ワーキングディレクトリーが見つかりません。" @@ -6877,11 +6981,11 @@ msgstr "ワーキングディレクトリーが見つかりません。" msgid "Node size" msgstr "ノードサイズ" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "無し" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "通常" @@ -6893,30 +6997,30 @@ msgstr "普通の&SVNコミット（空のディレクトリを残します）" msgid "North European" msgstr "北ヨーロッパ" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "バージョン管理下のファイルではありません" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "一部（もしくは全部）のファイルがダウンロード・検査されませんでした。" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "システムレジストリのエントリ（またはINIファイル）がすべて削除されたわけではありません。" -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "操作を完了するのに、十分なメモリがありません。" -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "十分なメモリがありません。\nノードを折りたたむかズームを小さくすることで、\nリビジョングラフの大きさを小さくしてみてください。" -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "パッチは生成されませんでした。" @@ -6924,7 +7028,7 @@ msgstr "パッチは生成されませんでした。" msgid "Note node" msgstr "ノートノード" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6943,26 +7047,26 @@ msgstr "注意: フォルダーはバージョン管理外の項目を含んで msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "注意: これは TortoiseGit だけでなく、すべての Tortoise クライアントに影響します。" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "ノート" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "リベースする必要はありません\n「%s」と「%s」は同じです" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "リベースはありません" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "コミットはありません" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "注意" @@ -6970,7 +7074,7 @@ msgstr "注意" msgid "Number Commits" msgstr "コミット数" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "%sの数" @@ -6983,7 +7087,7 @@ msgstr "作者の数:" msgid "Number of characters required for moved or copied line detection:" msgstr "移動/コピーされた行と判定するのに必要な文字数" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "短縮されたハッシュ値部分の文字数" @@ -7055,41 +7159,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "OLE 初期化に失敗しました。OLEライブラリが正しいバージョンか確認してください。" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007 の配色" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "古いハッシュ" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "古いメッセージ" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "古いコミット時刻" @@ -7097,15 +7201,15 @@ msgstr "古いコミット時刻" msgid "Older lines" msgstr "古い行" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "オンデマンド" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "一つ以上の自動保存されたドキュメントが見つかりました。" -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "競合しているファイルがあります。" @@ -7117,29 +7221,29 @@ msgstr "現在のブランチのみ" msgid "Only Local Branches" msgstr "ローカルブランチのみ" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "マージしたファイルのみ" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "子階層のファイルのみ" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "数値のみ（コンマで分割可能）が入力可能です。" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "この項目のみ" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "開く" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7149,51 +7253,52 @@ msgstr "既存のドキュメントを開く\n開く" msgid "Open certificate" msgstr "証明書を開く" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "差分の表示やパッチの適用のためにファイルを開く\nファイルを開く" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "クリップボードから開く" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "画像ファイルを開く ..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "親フォルダーを開く" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" -msgstr "" +msgstr "パッチファイルを開く" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "ドキュメントを開く" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "プログラムを指定して開く..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "ヘルプを開く\nヘルプトピック" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "リファレンスブラウザーのダイアログを開く。" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "リポジトリブラウザーを開く" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "オプション" @@ -7202,30 +7307,30 @@ msgid "Options" msgstr "オプション" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "オリジナルのサイズで表示する(&G)" +msgid "Ori&ginal size\tS" +msgstr "オリジナルのサイズで表示する(&G)\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "オリジナル名" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "その他のタスク領域" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Others" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "送り出し変更リスト" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "送り出しコミット" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "メモリ不足です。" @@ -7233,7 +7338,7 @@ msgstr "メモリ不足です。" msgid "Output Directory" msgstr "出力ディレクトリー" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7241,20 +7346,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "存在する場合はブランチを上書き" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "上書き" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "作業ツリーの変更を上書きする (強制)" + #. Resource IDs: (32781) msgid "P&age setup..." -msgstr "" +msgstr "ページ設定(&A)..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "ページ %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7265,15 +7374,15 @@ msgstr "ページ %u\nページ %u-%u\n" msgid "Page :" msgstr "ページ :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "領域 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "領域 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "パラメーター" @@ -7281,25 +7390,25 @@ msgstr "パラメーター" msgid "Parameters:" msgstr "パラメーター:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "親 %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "親%d はありません" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "親1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "親2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "親" @@ -7311,39 +7420,39 @@ msgstr "コードの一部は、TortoiseSVN Blame から来ています。" msgid "Password" msgstr "パスワード" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "パスワード:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "貼り付け" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "最近のメッセージを貼り付け..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "ファイル名のリストを貼り付け(&F)" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "最後のコミットメッセージを貼り付け(&L)" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "最近のメッセージを貼り付け(&R)..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "貼り付けツール\n貼り付け" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "ファイル名のリストを貼付" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "最後のコミットメッセージを貼り付け" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "クリップボードから SVN のパスを貼り付け、移動（切り取り）もしくはコピー操作を行う" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "パッチ" @@ -7359,32 +7468,32 @@ msgstr "選択された項目にパッチを適用(&S)" msgid "Patch As Attachment" msgstr "パッチを添付ファイルにする" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "すべてのファイルにパッチ適用" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "選択したファイルにパッチ適用" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "パッチファイル (*.diff;*.patch)|*.diff;*.patch|すべてのファイル (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "パッチ適用中" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "'%s' ファイルにパッチ適用" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "パス" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "パッチのパスよりもよいパスが見つかりました。" @@ -7392,21 +7501,21 @@ msgstr "パッチのパスよりもよいパスが見つかりました。" msgid "Path:" msgstr "パス:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "パス" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "鉛筆ツール\n鉛筆" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "作者別の貢献度" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "パーセント" @@ -7414,24 +7523,24 @@ msgstr "パーセント" msgid "Personalized Menus and Toolbars" msgstr "個人用メニューとツールバー" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "採用" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "コミットのハッシュを選択" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "コミットのハッシュを選択(&H)" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "コミットメッセージを選択" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "コミットメッセージを選択(&M)" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "%s をピックアップ" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7441,56 +7550,56 @@ msgstr "画像（メタファイル）\n画像" msgid "Picture:" msgstr "画像:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "画像 ファイル (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|グラフ (*.gv)|*.gv|すべてのファイル (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "画像 ファイル (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|すべてのファイル (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "円グラフ" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "実行するフックスクリプトを入力してください。" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "フックスクリプトを適用するパスを入力してください。" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "フックの種類を選択してください" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "ブランチを選択してください" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "上流を選択してください" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "スキップされたコミットに注意してください" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "キャンセル処理が完了するまでしばらくお待ちください ..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "差分を取得する間、しばらくお待ちください ..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "しばらくお待ちください ..." @@ -7506,11 +7615,11 @@ msgstr "ポート:" msgid "Port:" msgstr "ポート:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Commit後フック" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Push後フック" @@ -7518,23 +7627,23 @@ msgstr "Push後フック" msgid "Pre&v Page" msgstr "1つ前のページ(&V)" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Commit前フック" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Push前フック" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "コミットの準備中..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "右側のブロックを前に追加" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "このブロックを左側の前に追加" @@ -7546,11 +7655,11 @@ msgstr "新しいショートカットキーを押してください(&N):" msgid "Press &new shortcut key:" msgstr "新しいショートカットキーを押してください(&N):" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "プレビュー" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "パッチ結果をプレビューする" @@ -7562,51 +7671,51 @@ msgstr "プレビュー: " msgid "Previous" msgstr "以前の" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "前のページ\n前のページ" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "以前のバージョン" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "前の 競合" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "前の 相違" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "前の 行内相違" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "印刷" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "ドキュメントを印刷\n印刷(&P)" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "作業中のドキュメントを現在の設定で印刷\nクイック印刷" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "作業中のドキュメントを印刷\n印刷" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "ファイルへ印刷" @@ -7614,7 +7723,7 @@ msgstr "ファイルへ印刷" msgid "Printer :" msgstr "プリンター:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "プリンターファイル (*.prn)|*.prn|すべてのファイル (*.*)|*.*||" @@ -7622,11 +7731,11 @@ msgstr "プリンターファイル (*.prn)|*.prn|すべてのファイル (*.*) msgid "Printing" msgstr "印刷中" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "プログラム" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "プログラム (*.exe)|*.exe|すべてのファイル (*.*)|*.*||" @@ -7634,11 +7743,11 @@ msgstr "プログラム (*.exe)|*.exe|すべてのファイル (*.*)|*.*||" msgid "Progress" msgstr "進行状況" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "プロジェクト" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "プロパティ" @@ -7646,7 +7755,7 @@ msgstr "プロパティ" msgid "Property Page" msgstr "プロパティページ" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "プロバイダー" @@ -7678,15 +7787,15 @@ msgstr "リモートに無いブランチを削除" msgid "Prune (All remotes)" msgstr "リモートに無いブランチを削除 (すべてのリモート)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "プル" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "プルを行うには、選択したローカルブランチを現在のブランチにする必要があります。" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "プル(ローカルへ反映)..." @@ -7694,19 +7803,19 @@ msgstr "プル(ローカルへ反映)..." msgid "Pull/Fetch" msgstr "プル/フェッチ" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "プルした差分" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "プルしたログ" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "プッシュ(&H)" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "プッシュ" @@ -7722,11 +7831,11 @@ msgstr "プッシュ URL:" msgid "Push notes" msgstr "ノートをプッシュ" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "タグをプッシュ(&G)" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "プッシュ(リモートへ反映)..." @@ -7734,22 +7843,22 @@ msgstr "プッシュ(リモートへ反映)..." msgid "Putty Key:" msgstr "Putty 認証キー:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty のプライベート鍵 (*.ppk)|*.ppk|すべてのファイル (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "ドキュメントの保存を確認し、プログラムを終了する\n終了" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7767,11 +7876,15 @@ msgstr "RAM ドライブ(&A)" msgid "R&eset" msgstr "リセット(&E)" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "このファイルをインデックスから復元(&E)" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "このリビジョンに戻す(&E)" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "リベース" @@ -7779,7 +7892,7 @@ msgstr "リベース" msgid "Randomize Sync Dialog startup position" msgstr "同期ダイアログの開始位置をランダムにする" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7801,7 +7914,7 @@ msgstr "リモート(&M):" msgid "Re&movable drives" msgstr "リムーバブルドライブ(&M)" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "名前を変更(&N)..." @@ -7817,15 +7930,15 @@ msgstr "すべてリセット(&S)" msgid "Re&store defaults" msgstr "デフォルトに戻す(&S)" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "変更の取り消し(&V)..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "到達可能" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "行き詰まったら「日常の使用ガイド」をお読みください。" @@ -7833,21 +7946,21 @@ msgstr "行き詰まったら「日常の使用ガイド」をお読みくださ msgid "Rebase" msgstr "リベース" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "\"%s\" をここにリベース(付け替え)..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "リベース(ブランチの付け替え)..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "リベース中... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "最近" @@ -7859,21 +7972,21 @@ msgstr "最近のファイル" msgid "Recently modified lines" msgstr "最近変更された行" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "記録のみ" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "自動保存されたドキュメントを復元する\n明示的に保存されたバージョンの代わりに自動保存されたバージョンを開く" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "リベースする前の状態を復元" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7887,17 +8000,21 @@ msgstr "サブモジュールを再帰的にチェック" msgid "Recursive" msgstr "再帰的" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "以前に行われた元に戻す操作をやり直す\nやり直し" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "ウィンドウをアイコン化する" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref" @@ -7905,31 +8022,31 @@ msgstr "Ref" msgid "Ref (Click it then go to)" msgstr "Ref (クリックすると移動)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Refリスト" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Refブラウザー" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "RefLog" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Ref名" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "最新に更新" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "更新中" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "正規表現フィルター" @@ -7941,7 +8058,7 @@ msgstr "正規表現フィルター" msgid "Regex:" msgstr "正規表現:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7960,7 +8077,7 @@ msgid "" "\\s : whitespaces" msgstr "正規表現による絞り込み条件\n. : 任意の文字\nc+ : 文字 c の1回以上の出現にマッチ\nc* : 文字 c の0回以上の出現にマッチ\n^ : 行頭\n$ : 行末\n(string){n} : 文字列 string への n 回の出現にマッチ\n(abcd) : 部分式\n[aei0-9] : a、e、i、0～9 にマッチ\n[^aei0-9] : a、e、i、0～9 以外の文字にマッチ\n\n\\w : a～z、A～Z、0～9、_ にマッチ\n\\W : アルファベットと数字以外にマッチ\n\\d : 十進数0～9にマッチ\n\\s : ホワイトスペース（空白やタブなど）" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "'%s' でリジェクトされたパッチの一部分" @@ -7973,7 +8090,7 @@ msgstr "ログで相対時間を使用" msgid "Reload" msgstr "再読込" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8007,19 +8124,19 @@ msgstr "リモート追跡ブランチ(&T)" msgid "Remote Branch" msgstr "リモートブランチ" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "リモート URL は空白を指定できません。" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "リモートを更新" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "リモートの名前は空白を指定できません。" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "リモートの状態" @@ -8031,12 +8148,12 @@ msgstr "リモート:" msgid "Remove" msgstr "削除" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "%ld 個の項目を削除" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "%s を削除" @@ -8045,7 +8162,7 @@ msgstr "%s を削除" msgid "Remove &all untracked files (-fx)" msgstr "すべてのバージョン管理外のファイルを削除 (-fx) (&A)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "ブランチを削除(&B)" @@ -8053,21 +8170,21 @@ msgstr "ブランチを削除(&B)" msgid "Remove &non-ignored untracked files (-f)" msgstr "無視リストにない、バージョン管理外のファイルを削除 (-f) (&A)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "差分を取る前にすべてのコメントを削除するので、コメント内の変更は差分として表示されません" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "無視リストから削除(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "クイックアクセスツールバーから削除" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "変更リストから削除" @@ -8079,7 +8196,7 @@ msgstr "無視リストに該当するファイルを削除" msgid "Remove untracked directories (-d)" msgstr "バージョン管理外のディレクトリを削除" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "ワーキングツリーからバージョン管理外のファイルを削除、..." @@ -8087,11 +8204,11 @@ msgstr "ワーキングツリーからバージョン管理外のファイルを msgid "Removed" msgstr "削除" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "変更リストから削除" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8099,7 +8216,7 @@ msgid "" "from the ignore list." msgstr "ファイルパターン\n%s\nを無視リストから削除しました。" -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "ファイルもしくはファイルマスクを無視リストから削除" @@ -8107,11 +8224,11 @@ msgstr "ファイルもしくはファイルマスクを無視リストから削 msgid "Rena&me..." msgstr "名前を変更(&M)..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "名前変更" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "%s の名前を変更" @@ -8120,20 +8237,20 @@ msgstr "%s の名前を変更" msgid "Rename - TortoiseGit" msgstr "名前の変更 - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "\"%s\" の名前を変更:" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "名前変更/移動" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "バージョン管理内のファイル/フォルダーの名前を変更" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8143,7 +8260,7 @@ msgstr "直前に行った操作を繰り返す\n繰り返し" msgid "Replace &All" msgstr "すべて置換(&A)" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8157,12 +8274,12 @@ msgstr "置換後の文字列:" msgid "Replace:" msgstr "置換:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "一致した %d 件を置換しました" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "置換" @@ -8186,11 +8303,11 @@ msgstr "プルリクエスト" msgid "Requests a username and a password" msgstr "ユーザー名とパスワードが必要です" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "解決する(&O)..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "リセット" @@ -8202,25 +8319,25 @@ msgstr "すべてリセット(&A)" msgid "Reset Type" msgstr "リセットの種類" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "\"%s\" をここへリセット..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "現在のブランチのリセット" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "列をリセット" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "現在のブランチ \"%s\" をリセット: " -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "競合の解決" @@ -8228,126 +8345,122 @@ msgstr "競合の解決" msgid "Resolve Submodule Conflict" msgstr "サブモジュールの競合の解決" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "「こちら側」を使用して競合を解決する" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "「あちら側」を使用して競合を解決する" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "解決済み" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "%sの競合を解決しました。" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "ファイルの競合を解決する" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "リベース再開" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "復元" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "デフォルトを復元" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "コミット後に復元" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "ウィンドウを通常のサイズに復元" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "復元" -#. Resource IDs: (73) -msgid "Retry" -msgstr "再試行" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "2秒後に再実行..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "変更の取り消し" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "コミットを取り消す" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "コミット %s を取り消す" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "親リビジョンに変更の取り消し" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "リビジョン %s へ戻す" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "変更の取り消し" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "最後の更新以降のすべての変更を取り消す" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "バージョン管理への追加を取り消す" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "TortoiseGitMergeでパッチをレビュー" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "TortoiseGitMergeでUnified形式の差分ファイルをレビュー/適用" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "パッチをレビュー/適用(&P)..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "リビジョン" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "リビジョン %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "リビジョン %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "リビジョングラフ(&G)" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "リビジョンファイル" @@ -8363,31 +8476,31 @@ msgstr "リビジョングラフのフィルター" msgid "Revision graph" msgstr "リビジョングラフ" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "リビジョンが取り消されました。変更はすべてワーキングツリーに今統合されました。" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "リビジョン:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "巻き戻し" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "後退 %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text （RTF）\nフォントと段落情報を含むテキスト" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "右ビュー: " @@ -8395,21 +8508,21 @@ msgstr "右ビュー: " msgid "Right image" msgstr "右側の画像" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "行 %d / %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "行 %d-%d / %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "一行下へ" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "一行上へ" @@ -8417,11 +8530,11 @@ msgstr "一行上へ" msgid "S&elect..." msgstr "選択(&E)..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "ボタンを1行で表示(&H)" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "ボタンを2行で表示(&H)" @@ -8429,15 +8542,23 @@ msgstr "ボタンを2行で表示(&H)" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "リボンの下にクイックアクセスツールバーを表示(&H)" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "非選択をスキップ(&K)" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "非選択を融合(&Q)" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "統計(&T)" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "切り替え(&W)..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8457,7 +8578,7 @@ msgstr "SMTP サーバーが認証を必要な場合" msgid "SMTP Server:" msgstr "SMTP サーバー:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTPで直接宛先のサーバーへ" @@ -8465,11 +8586,11 @@ msgstr "SMTPで直接宛先のサーバーへ" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8477,19 +8598,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN コミットタイプ" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVNへコミット(リモートへ反映)..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVNからフェッチ" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVNリベース(ローカルへ反映)" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN Rev" @@ -8501,15 +8622,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "同じ" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "同じコミット時刻" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8527,35 +8648,39 @@ msgstr "Bugtraq の正規表現をテストするための、サンプルログ msgid "Sample text:" msgstr "サンプルテキスト:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "保存" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "名前を付けて保存(&A)..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "名前を付けて保存(&A)...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "名前を付けて保存" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "下側のファイルを名前をつけて保存\nファイルを保存する場所を指定してください。" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "ファイルを保存" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "左側のファイルを名前をつけて保存\nファイルを保存する場所を指定してください。" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8563,13 +8688,13 @@ msgid "" "%s" msgstr "左側のファイルを保存\n以下の場所へ保存します。%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "右側のファイルを名前をつけて保存\nファイルを保存する場所を指定してください。" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8577,74 +8702,74 @@ msgid "" "%s" msgstr "右側のファイルを保存\n以下の場所へ保存します。%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "すべてを保存\n両方のファイルを保存" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "マーク以外を採用して保存\nマークされていないブロックは変更後の内容で、マークされたブロックは変更前の内容で保存します。いずれの場合も、手動の変更は保存します。" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "マークは無視して保存\n手動の変更を除いて、変更前の内容を保存します。" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "マークを採用して保存\nマークされたブロックは変更後の内容(右/下のビューの内容)で、マークされていないブロックは変更前の内容(左/上のビューの内容)で保存します。いずれの場合も、TortoiseGitMergeウィンドウ上で手動で変更した内容は保存します。" +msgstr "マークを採用して保存\nマークされたブロックは変更後の内容(右/下のビューの内容)で、マークされていないブロックは変更前の内容(左/上のビューの内容)で保存します。いずれの場合も、TortoiseGitMergeウィンドウ上で手動で変更した内容(ペンシルマークの行)は保存します。" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "名付けて保存" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "名前を付けて保存 ..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "名前を付けて保存\nファイルを保存する場所を指定してください。" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "変更を %1 へ保存しますか？" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "変更を保存する。" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" -msgstr "" +msgstr "パッチファイルを保存" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "リビジョンを保存(&T)..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "名前を付けてドキュメントを保存\n名前を付けて保存" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "ドキュメントを保存\n保存" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8666,13 +8791,13 @@ msgstr "Unified形式の差分を保存" msgid "Save unified diff since HEAD" msgstr "HEADからのUnified形式差分を保存" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "保存\n衝突のマーク付きでファイルを保存する。" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8684,12 +8809,12 @@ msgstr "保存\n以下の場所へ保存します。%s" msgid "Saved Data" msgstr "保存されたデータ" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "設定の保存に失敗しました(キー: 「%s」, 値: 「%s」)。" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "ノートの保存に失敗しました。" @@ -8701,19 +8826,19 @@ msgstr "スキャン" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "左へスクロール" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "右へスクロール" #. Resource IDs: (32779) msgid "Se&ttings..." -msgstr "" +msgstr "設定(&T)..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "ログメッセージを検索(&L)..." @@ -8725,20 +8850,20 @@ msgstr "上へ検索(&U)" msgid "Search for:" msgstr "検索する文字列:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "パッチ適用のよりよいパスを検索..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "%1 のシークに失敗しました。" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "選択" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "すべて選択(&A)" @@ -8754,59 +8879,59 @@ msgstr "コンテキストメニューを選択(&C):" msgid "Select &window:" msgstr "ウィンドウを選択(&W):" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "色選択ツール\n色を選択" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "ファイルを選択..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "SSHクライアントを選択" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "ボタンを選択してください。" -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "ヘルプを表示するために、オブジェクトを選択する" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "変更リストを選択" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "差分用アプリケーションを選択" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "ファイルを選択" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "課題追跡システムに関連付けるフォルダーを選択してください" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "エクスポート先のフォルダーを選択してください。\nこれを実行する前に新しいフォルダーを作成する必要があるかもしれません。" -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "スクリプトを実行するフォルダーを選択" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "選択したファイルを保存するフォルダーを選択してください" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "フックスクリプトファイルを選択" @@ -8814,20 +8939,20 @@ msgstr "フックスクリプトファイルを選択" msgid "Select items automatically" msgstr "項目を自動的に選択する" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "マージ用アプリケーションを選択" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "マージするターゲットを選択" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "処理終了時の進行状況ダイアログの動作を選択します。" -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8839,15 +8964,19 @@ msgid "" "checker used for commit messages." msgstr "このプロジェクトで使用している言語を選択してください。この設定は、コミットメッセージを入力する際のスペルチェッカーに影響します。" -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "追跡するブランチを選択" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "ファイルの差分を表示するビューアーを選択" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "どのファイルを名前を付けて保存するか選択してください" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8857,7 +8986,7 @@ msgstr "どのファイルを名前を付けて保存するか選択してくだ msgid "Select/deselect &all" msgstr "すべてを選択/解除(&A)" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "選択履歴" @@ -8865,7 +8994,7 @@ msgstr "選択履歴" msgid "Send" msgstr "送信" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "メールを送信" @@ -8873,11 +9002,11 @@ msgstr "メールを送信" msgid "Send Mail after create" msgstr "作成後にメール送信" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Send Mail はメッセージの送信に失敗しました。" -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "メールを送信..." @@ -8885,19 +9014,19 @@ msgstr "メールを送信..." msgid "Send Patch" msgstr "パッチを送信" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "パッチをメール送信" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "パッチをメール送信" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "コンテンツを送信" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "送信中..." @@ -8917,28 +9046,28 @@ msgstr "作者を設定(&T)" msgid "Set author &date" msgstr "著述日時を設定する(D)" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "選択したローカルブランチでリモートを「pushremote」としてセットする。" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "選択したローカルブランチでリモートブランチを「pushbranch」としてセットする。" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "プロパティを設定..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "設定" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "設定 - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "シェル" @@ -8946,7 +9075,7 @@ msgstr "シェル" msgid "Shell Extended" msgstr "拡張したシェル" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "シェルのアイコンキャッシュは再構築されました。" @@ -8958,7 +9087,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "ログメッセージに短い日付/時刻形式を使用する(&D)" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "プロパティリストを短縮する" @@ -8970,7 +9099,7 @@ msgstr "表示" msgid "Show &Accelerator for:" msgstr "アクセラレータを表示(&A):" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Reflogを表示(&R)" @@ -8978,15 +9107,15 @@ msgstr "Reflogを表示(&R)" msgid "Show &Unversioned Files" msgstr "バージョン管理外のファイルを表示(&U)" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "プロジェクト全体を表示(&W)" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "変更を表示(&C)" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "ログを表示(&L)" @@ -8994,15 +9123,19 @@ msgstr "ログを表示(&L)" msgid "Show &log..." msgstr "ログを表示(&L)..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "ネストした ref を表示 (&N)" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "エクスプローラー上でのみオーバーレイとコンテキストメニューを表示(&O)" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "リボンの上に表示" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "リボンの下に表示" @@ -9010,35 +9143,35 @@ msgstr "リボンの下に表示" msgid "Show Environment Variables" msgstr "環境変数を表示" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "少しのボタンを表示" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "HEADリビジョンのノードを表示" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "単語単位での行内差分を表示する\n単語単位 行内差分" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "行内差分を表示\n行内差分" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "多くのボタンを表示" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "リボンの上にクイックアクセスツールバーを表示" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "リボンの下にクイックアクセスツールバーを表示" @@ -9046,11 +9179,11 @@ msgstr "リボンの下にクイックアクセスツールバーを表示" msgid "Show Screen&Tips on toolbars" msgstr "ツールバーの上にスクリーンチップを表示(&T)" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "空白類 を表示" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "グラフ全体の概要を表示" @@ -9058,7 +9191,7 @@ msgstr "グラフ全体の概要を表示" msgid "Show asterisk log prefix" msgstr "ログのプレフィックスのアスタリスクを表示する" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "ログダイアログにおいて、ログのプレフィックスのアスタリスクを表示する" @@ -9066,11 +9199,11 @@ msgstr "ログダイアログにおいて、ログのプレフィックスのア msgid "Show author" msgstr "作者を表示" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "このコミットを含むブランチを表示" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "&Unified 形式で変更を表示" @@ -9090,15 +9223,15 @@ msgstr "日付を表示" msgid "Show describe in log" msgstr "ログに describe を表示する" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "ログダイアログに git-describe で得られる describe を表示します" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "宛先のフォルダーを表示" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "相違点を表示" @@ -9110,11 +9243,15 @@ msgstr "最後のコミットとの差分を表示" msgid "Show excluded folders as normal" msgstr "除外されたフォルダーを修正なしとして表示する" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "マージ後の追加の変更を表示" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "少しの遅延の後にすべてのメニューを表示(&U)" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "ファイル名を表示" @@ -9130,7 +9267,7 @@ msgstr "無視ファイルを表示(&G)" msgid "Show ignore local changes flagged files" msgstr "ローカルの変更無視のフラグの付いたファイルを表示" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "ラベルの付いたコミットのみ(&B)" @@ -9138,90 +9275,90 @@ msgstr "ラベルの付いたコミットのみ(&B)" msgid "Show linenumber&s" msgstr "行番号を表示する(&S)" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "ログを表示" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "名前変更/コピーする前のログを表示(&B)" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "%s のログを表示" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "サブモジュールのログを表示" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "このフォルダーのログを表示" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "ログを表示..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "該当コミットにタグがあっても、長いフォーマットで表示する" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "作業ツリーにおいて変更されたファイルを表示" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "選択したコミットの次の変更を表示\n次を表示" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "最も古いノードをトップに表示" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "行差分バーを表示/非表示\n行差分バーをトグル" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "ロケーターバーを表示/非表示にする\nロケーターバーを表示/非表示" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "ステータスバーを表示/非表示にする\nステータスバーを表示" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "ツールバーを表示/非表示にする\nツールバーを表示" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "ツールバーを表示/非表示にする\nツールバーを表示" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "オリジナルの行番号を表示" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "選択したコミットの直近の変更を表示\n１つ前を表示" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "リビジョンプロパティを表示" @@ -9229,7 +9366,7 @@ msgstr "リビジョンプロパティを表示" msgid "Show shortcut &keys in ScreenTips" msgstr "スクリーンチップ上にショートカットキーを表示(&K)" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9237,9 +9374,9 @@ msgstr "ホワイトスペースと改行を表す特殊文字を表示\n空白 #. Resource IDs: (1314) msgid "Show status of subrepositories in parent folders" -msgstr "" +msgstr "サブリポジトリの状態を親に反映" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "refラベルで、ref名の一部を記号で表示する" @@ -9251,45 +9388,43 @@ msgstr "変更されていないファイルを表示(&M)" msgid "Show un&versioned files" msgstr "バージョン管理外のファイルを表示(&V)" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "表示/非表示" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "%1!d!個のrefを表示中。%2!d!個のrefを選択しています。" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "%ld 個のリビジョンを表示中(リビジョン %s から %s まで)。 %ld 個のリビジョンを選択、 %ld 個のファイルを選択しています。\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "複製/タグ/ブランチの関連をグラフィカルに表示" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "最後の更新後に、ローカルおよびリポジトリ上で変更されたすべてのファイルを表示" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "最後のコミットの後で変更された全てのファイルを表示" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "TortoiseGitについての情報表示" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "リファレンスログの表示" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "デフォルトのテキストエディターで、アクションログを表示します。" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "選択したファイル/フォルダーのログを表示" @@ -9299,9 +9434,9 @@ msgstr "署名(&G)" #. Resource IDs: (65535) msgid "Significant contributions by: (see Git repository for a complete list)" -msgstr "" +msgstr "主な貢献者: (完全なリストはGitのリポジトリを参照してください)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "シルバースタイル" @@ -9309,20 +9444,20 @@ msgstr "シルバースタイル" msgid "Since" msgstr "このコミットから" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "サイズ" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "スキップ" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "パッチをスキップ: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "作業ツリーを保持 (skip-worktree)" @@ -9330,23 +9465,23 @@ msgstr "作業ツリーを保持 (skip-worktree)" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "\"skip-worktree\" (TortoiseSVNでは\"ロック\")" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "スキップ" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "ターゲットが見つからないのでスキップ" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "スライド" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "タブ/スペース を推測" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "ソフト" @@ -9354,13 +9489,13 @@ msgstr "ソフト" msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作業ツリーとインデックスは現状を維持" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "TortoiseGitMerge外でいくつかファイルに変更がありました。\nそれらの変更を読み込みますか？" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9374,7 +9509,7 @@ msgstr "コミット数でソート" msgid "Sort tag list in reversed order" msgstr "タグリストを逆順にソート" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9384,49 +9519,53 @@ msgstr "最近のログメッセージを表示するダイアログで、表示 msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "行を分割" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "アクティブなウィンドウを分割する\n分割" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "融合" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "融合 (下のコミットと)" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "積み重ね棒グラフ" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "積み重ね面グラフ" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "標準" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "スタート(ファストフォワード)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "チェリーピック開始" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "コミットフックを開始" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "リベース開始" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "二分探索モードを開始..." @@ -9434,7 +9573,7 @@ msgstr "二分探索モードを開始..." msgid "Start registry editor" msgstr "レジストリエディターを起動する" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "gitプロトコルで稼働するgitサーバーを起動" @@ -9446,39 +9585,47 @@ msgstr "スタッシュ" msgid "Stash &Message" msgstr "スタッシュメッセージ(&M)" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "隠した変更を再現" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "スタッシュ一覧" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "隠した変更を戻す" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "スタッシュへ変更を隠す" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "スタッシュ処理中です..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Static" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "統計" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "状態" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "ステータスバーの設定" @@ -9490,32 +9637,32 @@ msgstr "状態とアクションの色" msgid "Status cache" msgstr "状態のキャッシュ" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "１つのフォルダーに対してのみ状態をキャッシュします。オーバーレイを再帰的に表示します。" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "状態のキャッシュは、ファイルの変更を検出する外部プロセスに保存されます。オーバーレイを再帰的に表示できます。" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "１つのフォルダーに対してのみ状態をキャッシュし、再帰的なオーバーレイは行いません" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "二分探索モードを停止" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "後で右クリックしたときに差分を取るパスを記憶します。Ctrlキーを押しながらクリックすると、記憶しているパスを削除します。" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "方針" @@ -9523,15 +9670,15 @@ msgstr "方針" msgid "Strip lines starting with \"#\" in commit message" msgstr "コミットメッセージにおいて、\"#\" で始まる行を取り除く" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "スタイル" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "件名" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "件名:" @@ -9539,7 +9686,7 @@ msgstr "件名:" msgid "Submodule" msgstr "サブモジュール" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "サブモジュールのアップデート(&U)..." @@ -9547,7 +9694,7 @@ msgstr "サブモジュールのアップデート(&U)..." msgid "Submodule Add" msgstr "サブモジュールの追加" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "サブモジュールの追加..." @@ -9555,15 +9702,15 @@ msgstr "サブモジュールの追加..." msgid "Submodule Diff" msgstr "サブモジュールの差分" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "サブモジュールの初期化" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "サブモジュールの同期" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "サブモジュールを更新" @@ -9571,7 +9718,7 @@ msgstr "サブモジュールを更新" msgid "Submodule Update Options" msgstr "サブモジュールの更新オプション" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9580,21 +9727,21 @@ msgstr "サブモジュール \"%1!s!\"\nリビジョン %2!s!" #. Resource IDs: (1585) msgid "Submodule of Project: " -msgstr "" +msgstr "プロジェクトのサブモジュール:" #. Resource IDs: (1708) msgid "Submodules" msgstr "サブモジュール" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "成功" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "切り替え" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "%s を %s のリビジョン%sに切り替え" @@ -9603,43 +9750,43 @@ msgstr "%s を %s のリビジョン%sに切り替え" msgid "Switch To" msgstr "切り替え先" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "前のウィンドウ区画に切り替える\n前の区画" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "1画面/2画面表示 の切り替え" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "1画面・2画面表示を切り替える\n1画面/2画面表示の切り替え" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "左右のビュー を入れ替え" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "左と右のビューの内容を入れ替える\n左右のビューを入れ替え" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "次のドキュメントウィンドウに切り替える" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "次のウィンドウ区画に切り替える\n次の区画" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "前のドキュメントウィンドウに切り替える" @@ -9647,19 +9794,19 @@ msgstr "前のドキュメントウィンドウに切り替える" msgid "Switch/Checkout" msgstr "切り替え" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "切り替え:" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "ここへ切り替え..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "ワーキングツリーを別のブランチ/タグに切り替え/チェックアウト" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "比較対象を入れ替える" @@ -9671,23 +9818,23 @@ msgstr "ref名の記号化" msgid "Symlink" msgstr "シンボリックリンク" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "リモートリポジトリと同期します(プル、プッシュ、パッチの送信などを行います)" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "同期..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "システム" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "システムはオフラインモードです。Internet Explorerをチェックしてください。" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9697,13 +9844,13 @@ msgstr "システムレジストリのエントリー、およびINIファイル msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9717,7 +9864,7 @@ msgstr "タブプレースホルダー" msgid "Tab size:" msgstr "タブ幅:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "タグ" @@ -9725,16 +9872,16 @@ msgstr "タグ" msgid "Tag (FF)" msgstr "タグ(FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "タグ情報" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "作業ツリーを %s へタグ付けしました。" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "タグ" @@ -9742,11 +9889,11 @@ msgstr "タグ" msgid "Tags:" msgstr "タグ:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "タスク" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "タスク領域" @@ -9758,11 +9905,11 @@ msgstr "一時ファイル（Gravatarの画像を含む）" msgid "Test" msgstr "テスト" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "テストのみ" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "テキストファイル (*.txt)|*.txt|すべてのファイル (*.*)|*.*||" @@ -9770,13 +9917,19 @@ msgstr "テキストファイル (*.txt)|*.txt|すべてのファイル (*.*)|*. msgid "Thai" msgstr "タイ語" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "リモート設定は変更されました。\n変更を保存しますか？または破棄しますか？" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "\"最後のN\" オプションの N の数。0より大きい値を指定してください。" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9784,64 +9937,78 @@ msgid "" "Do you really want to delete it?" msgstr "\"%s\" は リモートブランチです。\n\n本当に削除しますか？" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "チャンクサイズが追加・削除された行数と合いませんでした。" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "コミットする際はメッセージは何らかのメッセージを入力して下さい。" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "資格情報ヘルパーのURL \"%s\" は、既に存在しています。上書きしてもよろしいですか？" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "資格情報ヘルパーが変更されました。変更を保存しますか？または破棄しますか？" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "作業ツリーにコミットしていない変更があります。スタッシュに隠しますか？" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "ログメッセージダイアログを開いた時に、デフォルトで表示する範囲を制限します。\n参考: ログメッセージダイアログで全てのコミットを表示するには、\n\"From\" の日付部分を右クリックし、\"制限しない\" を選択してください。" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "次のエラーにより、差分ツールは中止されました:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "入力されたソースのref が曖昧です。\n一意に指定する必要があります(例えば、ブランチのプレフィックスとして「refs/heads/」を追加したり、タグに「refs/tags/」を追加したりします)。" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "フェッチしたブランチは、現在のブランチからファストフォワードで到達できます。\n\nマージするか、リベースダイアログを開きますか？" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "ファイル %s は存在していません。" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "ファイル %s はパッチファイル内で見つかりませんでした。" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "ファイル \"%s\" は作業ツリーに存在しません。他のファイルとの差分を取りますか？" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9850,15 +10017,15 @@ msgid "" "Do you want to remove the file?" msgstr "ファイル\n%s\nは空です。\nファイルを削除してもよろしいですか？" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "ファイルが大きすぎます" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "ファイルが大きすぎて開けません。" -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9866,7 +10033,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "ファイル\n%s\nはすでに存在しています。上書きしてもよろしいですか？" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9874,14 +10041,14 @@ msgid "" "is not a valid text file!" msgstr "ファイル\n%s\nはテキストファイルではありません。" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "フォルダー %s は、\nバージョン管理外のファイルもしくは変更されたファイルを含んでいます。本当に削除してもよろしいですか？" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9890,78 +10057,78 @@ msgid "" "Would you like to create it first?" msgstr "フォルダー \n%s\nは存在していません。\n作成しますか？" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "フックスクリプトはエラーを返しました:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "画像を表示することができません。" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "課題追跡システムのプロバイダーを作成することができませんでした。正しくインストールされているかどうかを確認してください。" -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "課題追跡システムのプロバイダーは、パラメーター文字列の確認ができませんでした。" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "新しいファイルを示している行は、%d行目だと思われます。" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "行番号は、%d から %d の間で指定してください。" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "ローカルブランチの「%s」は、リモートブランチの「%s」にファストフォワードされません。" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "ローカルブランチ名とリモートブランチ名が空です。\n続けますか?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "ローカルのブランチ/タグ名が入力されていません。リモートが削除されます。\n継続しますか?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "アクションログ内で保持する最大の行数。\nこの行数を超えて追加された場合は、古い行から順に削除されます。" -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "操作に失敗しました。" -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "パラメーターの「/path」と「/pathfile」の両方を指定することはできません。\nどちらか一方だけを指定してください。" -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "このパッチファイルは、%s に正しく適用できません。バージョン情報が提供されていません。\nパッチ適用は不可能です!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9971,7 +10138,7 @@ msgid "" "do not match!" msgstr "パッチは古いと思われます。ファイル内の行\n%s\nとパッチ内の行\n%s\nが一致しません。" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9982,7 +10149,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "このパスや URL は、 Windows では不正です。\nこのまま続行すると、後でエラーが発生するかもしれません。\n\nWindows では、パスに「<>|\"?*:」のいずれかの文字や、次のデバイス名を含めることはできません。\ncom1～com9、lpt1～lpt9、prn、aux、con、nul、clock$\n\n続行してもよろしいですか？" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9993,36 +10160,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "パス\n%s\nはパッチファイル内のものと一致していないようです。\nしかし、TortoiseGitMerge は\n%s\nのパスがより適合している判断しました。こちらのパスを代わりに使用しますか？" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "プロセスは実行中です。中止してよろしいですか?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "正規表現が無効です!\n正しい正規表現を入力してください。" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "リモートの「%s」は既に存在しています。\n上書きしますか？" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "リモートブランチは変更されていません。\n\nともかくリベースダイアログを開きますか？" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "リポジトリの作成に成功しました。" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "選択されたファイル内には、まだ競合状態のファイルがあります。\n本当に、ファイルを解決済みにしてもよろしいですか？" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10030,7 +10204,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "サブモジュール \"%s\" にコミットしていない変更があります。サブモジュールの変更をコミットしないと、親プロジェクトはこの変更を記録できません。サブモジュールへコミットしますか？ それとも、この変更を無視しますか？" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10039,7 +10213,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "対象のフォルダー\n%s\nは、特別なフォルダーであり、リポジトリのルートとしてサポートされません!\nそのフォルダーをgitのレポジトリフォルダーとして初期化していいですか？" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10048,26 +10222,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "指定のフォルダー\n%s\nは、空ではありません!\nそのフォルダーをgitのレポジトリフォルダーとして初期化していいですか？" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "テキストは一致しましたが、ファイルとしては一致しません！\n次の違いが見つかりました:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "選択ファイルの構文解析を停止するまでの秒数を指定します。\r\n小さい値を指定すると、すぐに自動補完リストが使用可能になります。\r\nしかし、すべてのファイルのスキャンが終了しないかもしれません。" -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "選択された2つのURLは同じルートから作成されたものではありません。\nそのため、これら2つの間のログメッセージを表示することはできません。" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10077,34 +10251,34 @@ msgstr "作業ツリーに変更が残っています。この変更をレビュ msgid "Their file:" msgstr "Their ファイル:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "あちら側" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "サブモジュールに変更もしくはバージョン管理外のファイルがあります。このようなファイルはリストに表示されていません。これらのファイルは、サブモジュールの中でコミットする必要があります。" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Tortoise以外で、現在 %d 個のオーバーレイハンドラーがインストールされています。" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "他にも編集可能なビューがあります。\nどのビューを保存しますか？" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "使用可能な課題追跡システムのプロバイダーが見つかりませんでした。" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10113,85 +10287,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "未解決の競合が%d行目に存在しています。\n保存する前に、まずそれらの競合を解決してください。\n競合が存在する状態のままで、ファイルの保存を行ってもよろしいですか？\n「はい」をクリックすると、他のエディターを使用して手作業で編集する必要があります。" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "保存されていない変更が存在します。\n変更を保存しますか？" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "追加するファイルがありません。すべてのファイルとフォルダーはバージョン管理されているか、無視リストに加えられています。" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "シソーラス" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "アプリケーションを閉じる前に作成した変更を含んでいて、現在開いているドキュメントよりも後に保存されているものがあります。" -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "このフィールドは入力が必須です。" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "これは有効なURLではありません。\nここにURLを入力してください。" -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "パスの指定が無効です。\nWindows のパスには、「<>|\"?*:」のいずれかの文字や、次のデバイス名を含めることはできません。\ncom1～com9、lpt1～lpt9、prn、aux、con、nul、clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." -msgstr "" +msgstr "この操作は、ログダイアログがコミットを読み込んでいる最中は開始できません" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "このプログラムは不明な %s （ファイル %s）へリンクされています。 この計算機は %s とは互換性のないバージョンの可能性があります。" -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "このプログラムはファイル %s を必要としますが、このシステム上で見つけることができませんでした。" -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "このプロパティはフォルダーに対してのみ有効で、ファイルに対しては有効ではありません。" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "このリモート名は、他のリモートのフェッチの refspec と衝突します。\n他の名前を使用してください。" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "作業ツリーにコミットされていない変更が残っているため、実行できません。" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "このアプリケーションで使用しているコマンドのレコードを削除し、メニューとツールバーのコマンドをデフォルトに復元します。カスタマイズしたものは元に戻りません。本当に実行してもよろしいですか？" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "3-Way差分" @@ -10207,14 +10381,14 @@ msgstr "水平方向に並べる(&Z)" msgid "To" msgstr "To" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "もしこれが公式なリモートではないなら、不適切なタグを取得しない為に、\nこのリモートに対するタグの取得を無効にすることをお勧めします。\nタグの取得を無効にしますか？" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10226,13 +10400,13 @@ msgstr "テンポラリファイルを削除するには、他の TortoiseGit msgid "To:" msgstr "To:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "1ページ表示/2ページ表示を切り替え\n1ページ表示/2ページ表示を切り替え" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "フィルターを反転" @@ -10244,11 +10418,11 @@ msgstr "ツールバー" msgid "Toolbar Name" msgstr "ツールバー名" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "ツールバーオプション" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "ツールバーの内部エラー。アプリケーションの配布元に問い合わせてください。" @@ -10264,16 +10438,16 @@ msgstr "ツール" msgid "Tools:" msgstr "ツール:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10283,20 +10457,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "ファイル \"%s\" は存在しませんが、\"追加\" と記録されています。\nコミットダイアログでは、処理する事が出来ません。\n\nインデックスから、それを削除しますか？" +"Do you want to restore or remove it from the index?" +msgstr "ファイル \"%s\" は存在しませんが、\"追加\" または \"変更\" と記録されています。\nコミットダイアログでは、処理する事が出来ません。\n\nインデックスから、それを復元または削除しますか？" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit は類似する名前を持つファイルを検出しました。ファイル:%s\nの名前も変更しますか？" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit は次のオーバーレイを表示しません: %s" @@ -10305,18 +10479,18 @@ msgstr "TortoiseGit は次のオーバーレイを表示しません: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGitUDiff(&U)" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame はすでにリポジトリ \"%s\" のために初期化されています。他のリポジトリ (\"%s\") へ変更できません。" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10332,7 +10506,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10340,7 +10514,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - 画像差分ツール, TortoiseGitのツールの一つ" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10354,16 +10528,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10372,18 +10546,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMergeは、このパッチファイルを適用できません。ファイル名 \"%s\" が2回以上出現します。" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10392,7 +10566,7 @@ msgid "" "/title:\"title to show for the viewer\"\n" "/? - this help dialog\n" "/p - read diff input from console pipe" -msgstr "" +msgstr "TortoiseGitUDiff: TortoiseGit のためのunified形式差分ビューア\n\nコマンドラインオプション:\n/patchfile:\"unified形式差分ファイルへのパス\"\n/title:\"ビューのタイトルに表示する名前\"\n/? - このヘルプダイアログ\n/p - 入力の差分ファイルをコンソールパイプラインから読み込む" #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" @@ -10422,11 +10596,11 @@ msgstr "追跡" msgid "Tracked Remote Branch:" msgstr "追跡中のリモートブランチ:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "追跡しているブランチ" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "%s を転送中" @@ -10435,39 +10609,35 @@ msgstr "%s を転送中" msgid "Transparent &color..." msgstr "透明色(&C)..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "行末の空白を削除" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "もし、新たにチェックアウトする必要があるが、上手くいかない場合、「クリーンナップ」を実行してみてください。" -#. Resource IDs: (73) -msgid "Try again" -msgstr "やり直し" - #. Resource IDs: (65535) msgid "Turkish" msgstr "トルコ語" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "TortoiseGit を調整" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "タイプ" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "タイプ:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL とディレクトリーに空白を指定する事はできません。" @@ -10491,24 +10661,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "メールシステムサポートをロードできません。" -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "コマンドを処理することができません。サーバーがビジー状態です。" -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "%1 から読み込めません。他の誰かが開いています。" -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "書き込み専用プロパティのため読み込めません。" -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10516,91 +10686,95 @@ msgid "" "from the top pane in the log dialog." msgstr "作業ツリーのパスを再構築できません。\nファイル名が変更されているかもしれません。\nこのファイルのログダイアログを表示し、一番上のリストから\n変更の取り消しを行ってください。" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "読み込み専用プロパティのため書き込めません。" -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "%1 に書き込めません。読み取り専用か、他の誰かが開いています。" -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "未チェック" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "元に戻す" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "%d のアクションを元に戻す" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "アクションを1つ元に戻す" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "追加を取り消す..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "直前に行った操作を取り消します\n元に戻す" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "直前に行った変更を取り消す\n元に戻す" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "想定外のファイル形式です。" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "フラグ assume-unchanged と skip-worktree を削除" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "展開する" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "書式が設定されていないテキスト\n書式設定の無いテキスト" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "HEADリビジョン同士のUnified形式の差分(&D)" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "管理外" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "把握外の深さ" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "このブロックのマークを外す" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "未解決の競合!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "ブランチを追跡しない" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "未タイトル" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "バージョン管理外" @@ -10608,7 +10782,7 @@ msgstr "バージョン管理外" msgid "Unversioned files mark parent folder as modified" msgstr "バージョン管理外のファイルを含むフォルダーに変更マークを付ける" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "%s をバージョン管理から除外中" @@ -10621,23 +10795,23 @@ msgstr "上へ" msgid "Update" msgstr "更新" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Ref を更新" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "モジュールを更新" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "更新" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "ActiveX オブジェクトを更新しています" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "インデックスを更新中" @@ -10649,30 +10823,26 @@ msgstr "デフォルトの画像を使用(&D): " msgid "Use &one-pane view as default for 2-file diff" msgstr "2つのファイルの差分に、デフォルトで1画面表示を使用する(&O)" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "他のテキストブロックを使用(&O)" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "「こちら側」のテキストブロックを使う" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "「こちら側」のテキストブロックを使用してから、「あちら側」を使用" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "「あちら側」のテキストブロックを使用" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "「あちら側」のテキストブロックを使用してから、「こちら側」を使用" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "ブロック を使用" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "HTTP path を要素として利用" @@ -10693,15 +10863,15 @@ msgstr "Thin&Packを使用 (遅いネットワーク接続用)" msgid "Use Unified Diff from &clipboard" msgstr "クリップボードのUnified形式の差分を使用(&C)" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "違う名前を使うか、上書きするために「強制」オプションを使ってください。" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "違う名前を使うか、「ブランチを上書き」 オプションを使ってください。" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10711,7 +10881,7 @@ msgstr "すべて左ビューの内容を使用する\n左側のファイルを msgid "Use block from left before right" msgstr "左→右の順でブロックを使用" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10721,25 +10891,25 @@ msgstr "右ビューのブロックの前に左ビューのブロックを使用 msgid "Use block from right before left" msgstr "右→左の順でブロックを使用" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "左ビューのブロックの前に右ビューのブロックを使用する\n右→左の順でブロックを使用" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "両方のテキストブロックを使用（こちらを前にする）" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "両方のテキストブロックを使用（こちらを後にする）" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "設定済サーバーを使用" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "左側のブロックを使用" @@ -10755,15 +10925,15 @@ msgstr "ローカルブランチの色をカレントブランチに使用" msgid "Use recycle bin when reverting" msgstr "変更を取り消す際にごみ箱を使用する" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "正規表現を使用する" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "右側のブロックを使用" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "スペース を使用" @@ -10771,61 +10941,61 @@ msgstr "スペース を使用" msgid "Use system locale for date/time" msgstr "日付/時刻にシステムロケールを使用する" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "「こちら側」のテキストブロックを使用(&M)" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "「あちら側」のテキストブロックを使用(&T)" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "「あちら側」の前に「こちら側」のテキストブロックを使用(&I)" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "「あちら側」の前に「こちら側」のテキストブロックを使用する\n「こちら側」、「あちら側」の順にテキストブロックを使用" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "「こちら側」のテキストブロックを使用する\n「こちら側」のテキストブロックを使用" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "「こちら側」の前に「あちら側」のテキストブロックを使用(&H)" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "「こちら側」の前に「あちら側」のテキストブロックを使用する\n「あちら側」のテキストブロックを使用してから、「こちら側」を使用" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "「あちら側」のテキストブロックを使用する\n「あちら側」のテキストブロックを使用" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "左ビューのテキストブロックを使用する\n左側のブロックを使用" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "このテキストブロックを使用(&I)" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." -msgstr "" +msgstr "現在の時刻をコミット時刻として使用します" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10833,7 +11003,7 @@ msgid "" "%s" msgstr "発見したパスを利用します。\nパッチを以下に適用\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10845,19 +11015,19 @@ msgstr "元々のパスを利用します。\nパッチを以下に適用\n%s" msgid "Use this" msgstr "これを使う" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "このファイル全体を使用する(&W)" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "このブロックを左側に使用" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "他のファイル全体を使用する(&F)" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "現在のブランチの先端のコミットをやり直す。" @@ -10873,11 +11043,11 @@ msgstr "ユーザー情報" msgid "User Name:" msgstr "ユーザー名:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "キャンセルされました" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10887,11 +11057,11 @@ msgstr "コミット前にユーザー名とメールアドレスの設定が必 msgid "User&name:" msgstr "ユーザー名(&N):" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "ユーザー名:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10908,9 +11078,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "コマンドラインオプション:\n/base:\n/basename:<ビューのタイトルに表示する名前>\n/theirs:<あちら側ファイルへのパス>\n/theirsname:<ビューのタイトルに表示する名前>\n/mine:<こちら側ファイルへのパス>\n/minename:<ビューのタイトルに表示する名前>\n/merged:<マージ結果の出力ファイルへのパス>\n/mergedname:<ビューのタイトルに表示する名前>\n/diff:\n/patchpath:<フォルダーへのパス>\n/saverequired\n/saverequiredonconflicts\n/oneway <強制的に1画面ビューにする>\n/line:<ジャンプ先の行番号>" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "値" @@ -10918,24 +11088,24 @@ msgstr "値" msgid "Version" msgstr "バージョン" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "バージョン %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "バージョン1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "バージョン1 (コミット日時がより新しい)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "バージョン2 (ベース)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "バージョン2 (ベース) (コミット日時がより新しい)" @@ -10943,11 +11113,11 @@ msgstr "バージョン2 (ベース) (コミット日時がより新しい)" msgid "Version Information" msgstr "バージョン情報" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "バージョン:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "バージョン管理下" @@ -10959,23 +11129,27 @@ msgstr "ベトナム語" msgid "View" msgstr "表示" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr " .tgitconfigを表示" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "パッチを表示" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "パッチを表示>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "パスのリビジョンをウェブビューアーで表示(&W)" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "外部エディターでこのリビジョンを表示" @@ -10987,11 +11161,11 @@ msgstr "全ユーザ共通設定を表示(&W)" msgid "Visit our website" msgstr "ウェブサイトを見るにはこの行をクリックして下さい。" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11002,7 +11176,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "警告:\r\n何をしているか分からない場合はこれらの設定を変更しないでください。\r\nデフォルト値に設定するには、値を削除してください。" -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "待機" @@ -11010,7 +11184,7 @@ msgstr "待機" msgid "Wait for the script to finish" msgstr "スクリプトが終了するまで待機する" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "入力待ち" @@ -11018,15 +11192,15 @@ msgstr "入力待ち" msgid "Walk Be&haviour" msgstr "ツリーの探索(&H)" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "警告" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "警告" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11034,7 +11208,7 @@ msgid "" "Do you really want to continue?" msgstr "警告: \"%s\" は完全に削除されます。 削除後は取り消す事はできません！\n\n本当に続行しますか？" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11042,56 +11216,56 @@ msgstr "Web" msgid "Western European" msgstr "西ヨーロッパ" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "有効にすると、シフトキーを押しながら右クリックしたときに限り、TortoiseGitのメニューがコンテキストメニューに現れるようになります。" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "パッチの適用において、もし必要ならば、コンテキスト行のホワイトスペースの変更を無視する" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "gitプロセスの実行中に進行ダイアログを閉じる場合、プロセスを強制停止する前にユーザーに確認する" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "有効にすると、ファイルやフォルダーをドラッグした時のコンテキストメニューを拡張します。" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "有効にすると、バージョン番号が大きい物が最初になるようになります。大抵の場合、最新バージョンがより重要だろう、ということで導入されました。" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "有効にすると、コミットダイアログに表示されるバージョン管理中の項目が自動的に選択されるようになります。" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "パッチが正しく適用されなかった場合にも、適用できそうなバイナリーオブジェクトでありローカルで利用できる場合には、3-wayマージを試みる。" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "URLを入力すると、リモート名が空ならば自動的に \"origin\" に設定されます。" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "「注釈付きタグ (annotated tag)」「すべてのタグ」「すべてのRef」のどれを参照するか指定します。" @@ -11101,15 +11275,15 @@ msgid "" "authentication and/or encryption." msgstr "デーモンでバックグラウンド稼働中は、このレポジトリのすべてのデータが、認証とまたは暗号化無しに公開されます。" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "ホワイトスペースの変更(タブ,スペース)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "ホワイトスペース" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "ウィンドウ位置" @@ -11117,15 +11291,15 @@ msgstr "ウィンドウ位置" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11169,11 +11343,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "ファイル内:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "ファイルの中で" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "作業ツリー" @@ -11181,29 +11355,25 @@ msgstr "作業ツリー" msgid "Working Tree Path:" msgstr "作業ツリーのパス:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "作業ディレクトリーの変更" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "長い行を 折り返す" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "長い行をビューの右端で折り返す\n長い行を折り返す" -#. Resource IDs: (73) -msgid "Yes" -msgstr "はい" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "すべて「はい」" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "最新バージョンがインストールされています。" @@ -11213,51 +11383,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "特定のオーバーレイハンドラーを無効にすることができます。\nハンドラーを無効化すると、使用するオーバーレイスロットが減るので、その分、他のシェルエクステンションがオーバーレイ表示できるようになります。" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "%d × %d サイズのビットマップ画像のみ貼り付けることができます。" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "ユーザー定義ツールバーは %d 個までしか作成できません。" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "このプロパティはファイルに対してのみ設定可能であり、フォルダーに対して設定することはできません。\nフォルダー内のすべてのファイルに設定したい場合は、「再帰」チェックボックスをオンにしてください。" -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "リネームでリファレンス(ref)のタイプを変えることは出来ません。" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." -msgstr "" +msgstr "セキュリティ上の問題のある、古いバージョンの Git for Windows (https://msysgit.github.io/) がインストールされています。\n\n1.9.5 以降にアップグレードすることを推奨します。" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "あなたは「バージョン管理外のファイルを含む」を有効にしました。これは、「git clean -fd」の呼び出しを含むので、無視ファイルとディレクトリが、ごみ箱に入ることなく削除されます。" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "マークされた変更ブロックがあります。それらをどう保存しますか?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "保存する前にプロパティの変更を行いました。\n今すぐ保存しますか？" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11265,67 +11435,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "%d 個のファイルを選択して差分表示しようとしています。それぞれのファイル毎に新しく差分ビュアーが起動します。本当に、そんなに沢山のファイルの差分を一度に表示してよろしいですか？" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "課題番号が入力されていません。\n課題番号なしでコミットを行ってもよろしいですか？" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Signed-off-by 行がありません。" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "「コミット後に復元」といくつかのファイルがマークされました。\n今、それらを復元しますか？ マークした後の、このファイルに対するすべての変更が失われるかもしれません。" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "%d 個までしかツールを定義することができません。" -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "コミットに対してログメッセージを入力して下さい。" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "変更を反映させるためには、システムを再起動してください。" -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "zipファイルのファイル名を選択してください。" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "ディレクトリが選択されました。\nエクスポートは、(zip)ファイルにのみ可能です。" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "バージョン管理されていないファイルを選択しています。\nコミットする前にバージョン管理に追加してください。" -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "テキストを入力してください。" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "画像を選択してください。" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "アイコンセットを %s から %sへ変更しました。\nこの変更はコンピュータを再起動するか、ログオフしてログオンするまで適用されません。" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11335,7 +11505,7 @@ msgstr "以前に入力したログメッセージは保存されています。 msgid "Your version is:" msgstr "現在使用中のバージョン:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "現在使用中のバージョン: %d.%d.%d.%d" @@ -11345,10 +11515,10 @@ msgid "Zip File" msgstr "zipファイル" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "ズームアウト(&M)" +msgid "Zoo&m out\t-" +msgstr "ズームアウト(&M)\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "ズーム" @@ -11360,80 +11530,80 @@ msgstr "ズームイン(&I)" msgid "Zoom &Out" msgstr "ズームアウト(&O)" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "100%にズーム" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "ズームイン\nズームイン" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "ズームアウト\nズームアウト" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "ズームイン(&N)" +msgid "Zoom i&n\t+" +msgstr "ズームイン(&N)\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "ズームイン" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "ズームアウト" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "フィットするようにズーム" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "高さがフィットするようにズーム" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "幅がフィットするようにズーム" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[デフォルト]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Unassigned]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "\"%s\" はgitのリポジトリを含んでいます。これは、Box外ではサブモジュールとして機能しません。\n.git-entryを削除して、すべてのファイルをトップのレポジトリに追加しますか？　それとも、サブディレクトリの中の切り離されたリポジトリとして維持しますか？" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" は、gitのサブモジュールを含んでいます。コピーした先では、もう動かないと思われます。\n.git-entryを削除してすべてのファイルをトップのレポジトリに追加しますか？　それとも、問題になるかもしれない課題を無視して保持しますか？" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" は無効です。" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" は Git リポジトリではありません" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11447,7 +11617,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "「ここからチェリーピック」を追加" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "追加" @@ -11455,7 +11625,7 @@ msgstr "追加" msgid "added files" msgstr "追加されたファイル" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "名前無しファイル" @@ -11463,14 +11633,19 @@ msgstr "名前無しファイル" msgid "and support the developers" msgstr "そして、開発者たちをサポートしてください。" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "assume-unchanged (変更なしとみなす)" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "作者" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "作者 (0.5%以上)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "TortoiseSVN (http://www.tortoisesvn.net/)　を基に製作されました。" @@ -11503,32 +11678,32 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "コミット" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "競合" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "コピー元\r\n%s - リビジョン %ld!ld!" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "日" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "削除" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" -msgstr "" +msgstr "パイプからの差分" #. Resource IDs: (58116) msgid "dummy" @@ -11538,7 +11713,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "eMailの設定" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11547,16 +11722,16 @@ msgid "" "%s" msgstr "エクスポート終了\n%s\nから\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "外部" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "gitは正常に終了しませんでした (終了コード %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "無視" @@ -11564,15 +11739,15 @@ msgstr "無視" msgid "include &untracked" msgstr "バージョン管理外のファイルを含む(&U)" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "未完了" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "引き継ぐ" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "ローカルに保持される項目" @@ -11580,7 +11755,7 @@ msgstr "ローカルに保持される項目" msgid "keep the file lists in English" msgstr "ファイルリストは英語を維持する" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11589,7 +11764,7 @@ msgid "" "%s = %ld" msgstr "行数: %d増 %d減、ファイル: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11604,11 +11779,11 @@ msgstr "行数: %d増 %d減、ファイル: %s = %ld\n%s = %ld\n%s = %ld\n%s = % msgid "master" msgstr "マスター" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "マージ" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "行方不明" @@ -11616,7 +11791,7 @@ msgstr "行方不明" msgid "missing/deleted/replaced" msgstr "行方不明/削除/置換" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "変更" @@ -11624,7 +11799,7 @@ msgstr "変更" msgid "modified/copied" msgstr "変更/コピー" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "月" @@ -11632,40 +11807,44 @@ msgstr "月" msgid "new branch" msgstr "新しいブランチ" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "いいえ" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "このコマンドへのすべての記述は無効です" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "バージョン管理外" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "無し" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "通常" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "見つかりません" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "妨害" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "on %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "画素" @@ -11673,11 +11852,11 @@ msgstr "画素" msgid "possible or real conflict/obstructed" msgstr "競合/障害が発生もしくはその可能性がある" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "四半期" @@ -11685,35 +11864,35 @@ msgstr "四半期" msgid "renamed" msgstr "名前変更" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "置換" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "パスをスキャン中:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "skip-worktree (作業ツリーを保持)" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "%s に切り替え" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "サブモジュールの変更を管理" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "to %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "%s へ" @@ -11722,35 +11901,35 @@ msgstr "%s へ" msgid "u&nknown changes" msgstr "把握外の変更(&N)" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "週" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - すべてのWindows利用者" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - 現在のWindows利用者" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - このレポジトリのみ" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - 現在のWindowsユーザー" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - このレポジトリのみ" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "年" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "はい" diff --git a/Languages/Tortoise_ko_KR.po b/Languages/Tortoise_ko_KR.po index 754adb704..ef3545784 100644 --- a/Languages/Tortoise_ko_KR.po +++ b/Languages/Tortoise_ko_KR.po @@ -20,6 +20,7 @@ # Ian Yoon , 2012 # Lübbe TortoiseSVN , 2011 # Lübbe TortoiseSVN , 2011 +# Mandy Cho , 2013 # omniavinco , 2012 # omniavinco , 2012 # pCsOrI , 2014 @@ -33,9 +34,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/tortoisegit/language/ko_KR/)\n" "MIME-Version: 1.0\n" @@ -44,7 +45,7 @@ msgstr "" "Language: ko_KR\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -66,138 +67,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "개별적으로 표시되는 작성자 수:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MBytes 전송됨" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1에 알 수 없는 객체가 있습니다." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1이/가 잘못된 경로를 가지고 있습니다." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1이/가 잘못된 스키마를 가지고 있습니다." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1은 잘못된 포맷입니다." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1을 찾을 수 없습니다." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d!일 전" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d!일 전" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d!시간 전" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d!시간 전" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d!분 전" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d!달 전" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d!달 전" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d!초 전" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d!초 전" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d!주 전" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d!주 전" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d!년 전" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d!년 전" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d!개 선택" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d!분 전" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\r\n파일 %2!d!개, 서브모듈 %3!d!개, 폴더 %4!d!개, 총 %5!d!개 항목" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\r\n크기: %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\n스크립트를 계속 수행할까요?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -205,52 +206,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\n위 파일을 찾을 수 없습니다.\n주어진 경로나 파일명을 확인하십시오." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig 또는 %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d바이트 전송함" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d Bytes 전송됨" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d개 \"%s\"에 푸시할 커밋 있음" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d개 파일 변경 됨" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d개 파일 삭제 됨" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d개 파일은 %s(으)로 복귀되었습니다." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "총 %d 개의 파일중, %d 파일이 선택되었습니다." -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "가장 활동적인 작성자(들) %d, 최소 %d 개의 커밋함 (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -258,78 +259,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% 알파\n클릭하면 알파값을 토글합니다.\n더블클릭하면 알파값을 자동으로 토글합니다." -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld분 %ld초" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld / %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - 수정: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [충돌해결됨]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s in %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s 필요 Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, at %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: 작업 공간" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) of %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Export of %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nCould not be cleanly patched." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\n정말로 삭제할까요?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -345,6 +346,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3 way merge" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "TortoiseGitBlame 정보(&A)..." @@ -373,15 +378,15 @@ msgstr "필터 추가(&A)" msgid "&Add New/Save" msgstr "추가하고 저장(&A)" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Add it" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "버튼 추가 및 제거(&A)" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "버전관리에 추가(&A)..." @@ -421,7 +426,7 @@ msgstr "할당(&A)" msgid "&Associate double-click event with:" msgstr "더블클릭 이벤트를 다음과 연결하기(&A):" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "자동으로 숨김(&A)" @@ -437,15 +442,15 @@ msgstr "Putty 인증 키 자동 불러오기(&A)" msgid "&Backup original file" msgstr "원본 파일을 백업 (&B)" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "수정한 사람 보기(&B)" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "변경에 대해 수정한 사람 보기(&B)" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "두 리비전에 대한 수정한 사람 보기(&B)" @@ -469,7 +474,7 @@ msgstr "브랜치(&B):" msgid "&Browse Dir" msgstr "&Browse Dir" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "저장소 보기(&B)" @@ -505,7 +510,7 @@ msgstr "분류(&C):" msgid "&Choose commands from:" msgstr "다음으로부터 명령 선택하기(&C):" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "정리하기(&C)" @@ -529,7 +534,7 @@ msgstr "창 닫기(&C)" msgid "&Command:" msgstr "명령(&C):" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "커밋(&C)" @@ -537,23 +542,27 @@ msgstr "커밋(&C)" msgid "&Commit submodule..." msgstr "&Commit submodule..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Commit w/o" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "커밋(&C)..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "리비전 비교(&C)" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "그래프 줄이기(&C)" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "복사(&C)" @@ -573,11 +582,11 @@ msgstr "사용자 지정(&C)" msgid "&Default" msgstr "기본(&D)" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "삭제(&D)" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "버전관리에서 제외(&D)" @@ -585,7 +594,7 @@ msgstr "버전관리에서 제외(&D)" msgid "&Delete Filter" msgstr "필터 삭제(&D)" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Delete remote && local" @@ -597,11 +606,11 @@ msgstr "이동하거나 복사한 줄 감지(&D)" msgid "&Detect moved or copied lines:" msgstr "이동하거나 복사한 줄 감지(&D):" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "비교(&D)" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "이전 버전과 비교(&D)" @@ -613,7 +622,7 @@ msgstr "폴더(&D):" msgid "&Disabled" msgstr "비활성화(&D)" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Discard" @@ -621,7 +630,7 @@ msgstr "&Discard" msgid "&Do the same for the rest" msgstr "&Do the same for the rest" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "붙이기(&D)" @@ -629,11 +638,15 @@ msgstr "붙이기(&D)" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Down" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "다운로드(&D)" @@ -641,11 +654,11 @@ msgstr "다운로드(&D)" msgid "&Edit" msgstr "편집(&E)" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr ".git/config 편집(&E)" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "모두 편집 (&E)" @@ -653,7 +666,7 @@ msgstr "모두 편집 (&E)" msgid "&Edit Filter" msgstr "필터 편집(&E)" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "충돌 상황 편집(&E)" @@ -678,10 +691,10 @@ msgid "&Enable edit" msgstr "&Enable edit" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "선택한 것을 내보내기(&E)..." @@ -693,27 +706,27 @@ msgstr "다른 프로그램(&E)" msgid "&File" msgstr "파일(&F)" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "찾기(&F)" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "찾기\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "윈도우에 이미지 맞춤(&F)" +msgid "&Fit images in window\tF" +msgstr "윈도우에 이미지 맞춤(&F)\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "고정된 드라이브(&F)" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "띄우기(&F)" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "이름 변경 추적(&F)" @@ -725,7 +738,7 @@ msgstr "로그 메시지 폰트(&F):" msgid "&Font:" msgstr "폰트(&F):" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "강제로(&F)" @@ -745,7 +758,7 @@ msgstr "&Git Style Commit (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "이동\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "관련없는 변경 경로는 회색으로 표시(&G)" @@ -757,7 +770,7 @@ msgstr "녹색(&G):" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "도움말(&H)" @@ -765,7 +778,7 @@ msgstr "도움말(&H)" msgid "&Help Topics" msgstr "&Help Topics" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "숨기기(&H)" @@ -773,11 +786,11 @@ msgstr "숨기기(&H)" msgid "&Icon Set:" msgstr "아이콘 모음(&I):" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "무시(&I)" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "이름에 따라 %d개 아이템을 무시하기(&I)" @@ -791,14 +804,14 @@ msgid "&Image" msgstr "이미지(&I)" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "이미지 정보(&I)" +msgid "&Image info\tI" +msgstr "이미지 정보(&I)\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "이미지만(&I)" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "가져오기(&I)..." @@ -810,7 +823,7 @@ msgstr "초기 디렉토리(&I):" msgid "&Initialize submodules (--init)" msgstr "&Initialize submodules (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "설치(&I)" @@ -822,11 +835,11 @@ msgstr "모두 읽었으면 처음 차이점으로 이동(&J)" msgid "&Keep CR" msgstr "&Keep CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Keep current state" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "라벨(&L)" @@ -854,7 +867,7 @@ msgstr "제한(&L):" msgid "&Line number" msgstr "줄번호(&L)" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "줄번호(&L) (%d - %d)" @@ -871,7 +884,7 @@ msgstr "목록 보기(&L)" msgid "&Local Branch:" msgstr "로컬 브랜치(&L):" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "로컬 브랜치(&L)" @@ -895,11 +908,11 @@ msgstr "메뉴 애니메이션(&M):" msgid "&Menu contents:" msgstr "메뉴 내용(&M):" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "병합(&M)" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "병합(&M)..." @@ -949,12 +962,16 @@ msgstr "새로 만들기(&N)..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "다음(&N) >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "다음 페이지(&N)" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "더블클릭 이벤트 없음(&N)" @@ -969,13 +986,13 @@ msgstr "없음(&N)" #. Resource IDs: (1661) msgid "&Notepad2" -msgstr "Notepad2(&N)" +msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "확인(&O)" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "한 페이지(&O)" @@ -983,19 +1000,15 @@ msgstr "한 페이지(&O)" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "열기(&O)" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "Git for Windows 웹 사이트 열기(&O)" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "열기...\tCtrl+O" @@ -1008,18 +1021,18 @@ msgid "&Overlay Icon:" msgstr "오버레이 아이콘(&O)" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "오버레이 이미지들(&O)" +msgid "&Overlay images\tO" +msgstr "오버레이 이미지들(&O)\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "비밀번호(&P):" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "붙여넣기(&P)" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "모두 고르기(&P)" @@ -1027,7 +1040,7 @@ msgstr "모두 고르기(&P)" msgid "&Port:" msgstr "포트(&P):" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "인쇄 미리보기(&P)" @@ -1035,11 +1048,15 @@ msgstr "인쇄 미리보기(&P)" msgid "&Print..." msgstr "인쇄(&P)..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "인쇄(&P)...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "계속(&P)" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "가져와 병합하기(&P)" @@ -1047,10 +1064,14 @@ msgstr "가져와 병합하기(&P)" msgid "&Push all branches" msgstr "모든 브랜치 푸시(&P)" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "한번 더(&R)" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "최근 메시지(&R)" @@ -1063,7 +1084,7 @@ msgstr "&Recursive" msgid "&Red:" msgstr "빨강색(&R):" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "다시 실행(&R)" @@ -1079,7 +1100,7 @@ msgstr "새로고침(&R)" msgid "&Regular Expression" msgstr "정규 표현식(&R)" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1087,7 +1108,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "원격 브랜치(&R):" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "원격 브랜치(&R)" @@ -1095,7 +1116,7 @@ msgstr "원격 브랜치(&R)" msgid "&Remote:" msgstr "원격(&R):" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "삭제(&R)" @@ -1107,7 +1128,7 @@ msgstr "&Remove this file from index" msgid "&Replace" msgstr "바꾸기(&R)" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "저장소 탐색기(&R)" @@ -1115,7 +1136,7 @@ msgstr "저장소 탐색기(&R)" msgid "&Reset" msgstr "다시 설정(&R)" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "툴바 다시 설정(&R)" @@ -1131,23 +1152,27 @@ msgstr "내 사용 데이터 다시 설정(&R)" msgid "&Reset to Default" msgstr "기본상태로 다시 설정(&R)" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "해결됨(&R)" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "복원(&R)" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "이전 상태로 복원(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "이 커밋 변경을 취소(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "이 커밋 변경들을 취소(&R)" @@ -1159,7 +1184,7 @@ msgstr "SSH 클라이언트(&S)" msgid "&Saturation:" msgstr "포화(&S)" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "저장(&S)" @@ -1167,15 +1192,19 @@ msgstr "저장(&S)" msgid "&Save authentication" msgstr "인증 정보 저장(&S)" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "그래프를 다른 이름으로 저장(&S)..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "선택된 파일 리스트를 저장(&S)..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "저장(&S)\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "Git 경로 설정(&S)" @@ -1183,7 +1212,7 @@ msgstr "Git 경로 설정(&S)" msgid "&Set upstream/track remote branch" msgstr "&Set upstream/track remote branch" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "설정(&S)" @@ -1203,7 +1232,7 @@ msgstr "텍스트 라벨 보이기(&S)" msgid "&Signing key ID:" msgstr "서명 키 ID(&S):" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Skip" @@ -1211,7 +1240,7 @@ msgstr "&Skip" msgid "&Squash" msgstr "통합(&S)" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "모두 통합(&S)" @@ -1223,7 +1252,7 @@ msgstr "시작(&S)" msgid "&Start Group" msgstr "그룹 시작(&S)" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "임시 보관(&S)" @@ -1243,7 +1272,7 @@ msgstr "아이콘 뷰(&S)" msgid "&Tab size:" msgstr "탭 크기(&T):" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "탭으로 나열된 문서(&T)" @@ -1251,7 +1280,7 @@ msgstr "탭으로 나열된 문서(&T)" msgid "&Tag" msgstr "꼬리표(&T)" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "꼬리표(&T)" @@ -1287,7 +1316,7 @@ msgstr "&Toolbars and Docking Windows" msgid "&Toolbars:" msgstr "도구 막대(&T)" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1299,7 +1328,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "두 페이지(&T)" @@ -1307,15 +1340,15 @@ msgstr "두 페이지(&T)" msgid "&URL:" msgstr "URL(&U):" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "실행 취소(&U)" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Unified Diff 보기(&U)" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Unified diff with" @@ -1327,7 +1360,7 @@ msgstr "알 수 없는 드라이브(&U)" msgid "&Up" msgstr "위로(&U)" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "특정 리비전으로 업데이트하기(&U)" @@ -1339,11 +1372,11 @@ msgstr "업스트림(&U):" msgid "&Use auto-completion of file paths and keywords" msgstr "파일 경로와 키워드의 자동 완성기능을 이용합니다.(&U)" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "사용자명(&U):" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "보기(&V)" @@ -1351,7 +1384,7 @@ msgstr "보기(&V)" msgid "&View:" msgstr "보기(&V):" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "커밋할 때 서명을 빠뜨리면 경고하기(&W)" @@ -1367,6 +1400,10 @@ msgstr "전체 단어(&W)" msgid "&Within file" msgstr "파일 안에서만(&W)" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&ignore space change" @@ -1375,46 +1412,46 @@ msgstr "&ignore space change" msgid "&known changes" msgstr "변경을 알 수 없음(&K)" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit 기본값)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(%s에서)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(변경 목록 없음)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(줄 번호 없음)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(값이 없음)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(찾을 수 없음)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(알 수 없음)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- all -" @@ -1422,13 +1459,14 @@ msgstr "- all -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1436,13 +1474,13 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "저장소 루트에 있는 .git/config" #. Resource IDs: (1691) msgid ".git/info/exclude" -msgstr ".git/info/exclude 파일" +msgstr ".git/info/exclude" #. Resource IDs: (1690) msgid ".gitignore in the containing directories of the items" @@ -1452,7 +1490,7 @@ msgstr "선택한 항목 폴더의 .gitignore 파일" msgid ".gitignore in the repository root" msgstr "저장소 최상위 .gitignore 파일" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "저장소 루트에 있는 .tgitconfig" @@ -1468,31 +1506,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<모든 브랜치>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "<로컬 분기>" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<브랜치 없음>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "<구분자>" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "<제목 없음>" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1501,66 +1539,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit 은 쉘 프로그램 입니다.\n즉, 윈도우 탐색기에 통합됩니다.\nTortoiseGit을 사용하기 위해서는, 탐색기를 열고 아무 폴더에서나 오른쪽 마우스 클릭을 하면.\nTortoiseGit 의 모든 명령들을 사용할 수 있습니다.\n기타사항은 매뉴얼을 참조하세요!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "경고: 이 브랜치들이 HEAD와 완전히 병합됐는지 확인되지 않았습니다." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "경고: 이 작업은 원격 저장소에 있는 브랜치를 삭제합니다." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "경고: 이 브랜치는 HEAD와 완전히 병합되지 않았습니다." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "현재 헤드 분리, 작업에서 (분기 없음).\n비금 분기를 생성하시겠습니까?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "임시 보관소를 정말 비우겠습니까?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "임시 보관 적용에 실패했습니다!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "임시 보관 꺼내기에 실패했습니다!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "임시 보관 실패!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "previous rebase directory rebase-apply still exists but mbox given\n\nDo you want to" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "임시 보관 적용에 실패했습니다!!!" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "임시 보관 꺼내기에 실패했습니다. 충돌이 있습니다." -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "임시 보관 적용에 성공했습니다" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "임시 보관 꺼내기에 성공했습니다" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "임시 보관 성공" @@ -1568,7 +1606,7 @@ msgstr "임시 보관 성공" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<새로운 변경 리스트>" @@ -1580,71 +1618,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "같은 이름을 가진 브랜치가 이미 있습니다 (이러면 짧은 별명을 쓸 때 애매해집니다).\n계속 진행하면 문제를 일으킬 수도 있으므로 가능하면 피해야 합니다." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "같은 이름을 가진 브랜치가 이미 있습니다." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "지금 병합 중이므로 이 커밋은 병합커밋이 됩니다. 병합을 중지하려면 리셋이나 되돌리기를 해야 합니다." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "새로운 버전이 나왔습니다. 최신 버전을 받아주세요!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "아이콘 오버레이를 표시할 경로를 한 줄씩 적습니다..\n'*'을 경로의 마지막에 붙이면 그 경로의 모든 파일과 하위 폴더들도 포함합니다." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "컨텍스트 메뉴를 보여주지 않을 경로들의 리스트입니다. 한 줄에 하나씩 기술합니다.\r\n'*' 문자를 경로뒤에 추가하면, 그 디렉토리의 모든 파일들과 서브디렉토리들도 제외됩니다.\r\n리스트를 비워둘 경우 모든 경로에서 컨텍스트 메뉴를 보여줍니다.." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "아이콘 오버레이를 표시하지 않을 경로를 한 줄씩 적습니다.\r\n'*'을 경로의 마지막에 붙이면 그 경로의 모든 파일과 하위 폴더들도 제외됩니다.\r\n빈 목록은 모든 경로에서 오버레이를 허용합니다." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "지정하신 자원은 유효하지 않습니다." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "같은 이름을 가진 꼬리표가 이미 있습니다 (이러면 짧은 별명을 쓸 때 애매해집니다).\n계속 진행하면 문제를 일으킬 수도 있으므로 가능하면 피해야 합니다." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "같은 이름을 가진 꼬리표가 이미 있습니다." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "GNU diff(patch 파일) 파일을 보기 위한 뷰어 프로그램.\r\n적절한 것이 없으면 메모장을 사용하십시오." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "중단(&B)" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "프로그램 정보(&B)" @@ -1660,11 +1698,11 @@ msgstr "파일 이름 바꾼 로그 줄이기" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "중단" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "병합 취소(&M)" @@ -1672,11 +1710,11 @@ msgstr "병합 취소(&M)" msgid "Abort Merge" msgstr "병합 취소" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Aborts a running merge." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "제품 정보" @@ -1696,12 +1734,12 @@ msgstr "TortoiseGitMerge 정보" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "%1에 대한 액세스가 거부되었습니다." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "행동" @@ -1709,26 +1747,26 @@ msgstr "행동" msgid "Action log" msgstr "행동 기록" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "행동" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "작업 목록 활성화" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "활성화된 파일" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX 객체는 창을 빠져나가는 중에는 저장될 수 없습니다!\n%1의 모든 변경사항을 버리겠습니까?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "추가" @@ -1736,7 +1774,7 @@ msgstr "추가" msgid "Add &Signed-off-by" msgstr "메시지에 서명 넣기(&S)" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "사전에 '%s' 추가" @@ -1749,15 +1787,15 @@ msgstr "원격 저장소 추가" msgid "Add \"&Signed-off-by\"" msgstr "Add \"&Signed-off-by\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "확장자에 따른 비교 프로그램 등록" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "확장자에 따른 병합 프로그램 등록" @@ -1765,15 +1803,15 @@ msgstr "확장자에 따른 병합 프로그램 등록" msgid "Add new files automatically to Git" msgstr "새 파일을 자동으로 Git에 추가하기" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "무시목록에 추가(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "빠른 접근 툴바에 추가하기" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "추가..." @@ -1781,11 +1819,11 @@ msgstr "추가..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "확장자에 따른 비교/병합 프로그램 추가/수정" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "추가됨" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1793,25 +1831,25 @@ msgid "" "to the ignore list." msgstr "다음 파일 패턴\n%s\n(을)를 무시 목록에 추가하였습니다." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "추가됨" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Git에 파일 등록하기" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "선택된 파일 또는 파일 마스크를 무시 목록에 추가" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "설정 조정\n설정" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "고급 설정" @@ -1819,43 +1857,43 @@ msgstr "고급 설정" msgid "Advanced Diff/Merge Settings" msgstr "비교/병합 고급 설정" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "비교 고급 설정" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "병합 고급 설정" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "모두" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "모든 명령들" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "모든 파일 (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "모든 파일 (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "모든 부모" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "모든 로컬 브랜치" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1863,47 +1901,47 @@ msgstr "" msgid "All tags only" msgstr "All tags only" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "모든 변경사항을 잃을 것입니다! 정말로 모든 툴바와 메뉴를 리셋하시겠습니까?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "모든 변경사항을 잃을 것입니다! 정말로 키보드 할당을 리셋하시겠습니까?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "모든 변경사항을 잃을 것입니다! 정말로 메뉴 '%s'를 리셋하시겠습니까?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "모든 변경사항을 잃을 것입니다! 정말로 툴바 '%s'를 리셋하시겠습니까?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Allow Editing for this view\nAllow Edit" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "커스텀 그라바타 URL을 허용합니다" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "이미 최신입니다." @@ -1919,11 +1957,11 @@ msgstr "Always push to the selected remote branch for this local branch" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "날짜와 시간을 나타내기 위해 항상 시스템 국가 설정을 사용합니다" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "수정" @@ -1931,12 +1969,12 @@ msgstr "수정" msgid "Amend &Last Commit" msgstr "마지막 커밋 수정(&L)" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "An alternative editor. Which should preferably support *nix line endings." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1947,7 +1985,7 @@ msgid "" "%mine: the modified file" msgstr "An external diff program used\r\nfor comparing different revisions of files\r\n\r\nYou can specify the following parameters to the path:\r\n%base: the base file\r\n%mine: the modified file" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1960,34 +1998,34 @@ msgid "" "%base: the original file without your changes" msgstr "An external merge program used\r\nto resolve conflicted files.\r\n\r\nYou can specify the following parameters to the path:\r\n%merged: the conflicted file, where to save\r\n%theirs: the file as it is in the repository\r\n%mine: your own file, with your changes\r\n%base: the original file without your changes" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "%1에 잘못된 파일 핸들이 열려있습니다." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "알 수 없는 오류가 발생했습니다." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "%1에 접근 중에 알 수 없는 오류가 발생했습니다." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "알 수 없는 라인 종류가 발견되었습니다. 라인번호 %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Append right block" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Append this block to left" @@ -1999,11 +2037,11 @@ msgstr "어플리케이션 프레임 메뉴:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "패치 적용하기..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "패치 적용..." @@ -2011,7 +2049,7 @@ msgstr "패치 적용..." msgid "Apply Patches" msgstr "패치 적용하기" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Apply a series of patches from a mailbox" @@ -2019,7 +2057,7 @@ msgstr "Apply a series of patches from a mailbox" msgid "Apply unified diff" msgstr "Unified Diff 적용" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Aqua Style" @@ -2027,39 +2065,39 @@ msgstr "Aqua Style" msgid "Arabic" msgstr "아랍어" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "URL(&U):" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "컬럼을 재설정하시겠습니까?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "재배치를 정말 중단하겠습니까?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "충돌한 파일들을 해결되었음으로 처리하는 것이 확실합니까?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "정말 %d개 항목을 되돌리겠습니까? 마지막 업데이트 이후의 모든 변경사항이 사라집니다!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "정말 \"%s\"에 저장하겠습니까?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "수직 정렬(&V)" +msgid "Arrange &vertical\tV" +msgstr "수직 정렬(&V)\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "변경 리스트 '%s'로 할당됨" @@ -2068,11 +2106,11 @@ msgstr "변경 리스트 '%s'로 할당됨" msgid "Assigned to:" msgstr "다음에 할당됨:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "변경사항 무시" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "변경 사항 무시" @@ -2084,34 +2122,34 @@ msgstr "변경 사항 무시 (TortoiseSVN의 \"읽기 전용\" 아이콘)" msgid "At file &creation" msgstr "파일 생성 시(&C)" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "파일 생성 시" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "리비전: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "At the moment, you can only rename branches." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "지원하지 않는 명령을 시도하였습니다." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "%1에 대한 접근이 마지막을 지남." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "%1 을/를 쓰는 중 읽기 시도함" -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "%1 을/를 읽는 중 쓰기 시도함" @@ -2128,11 +2166,11 @@ msgstr "인증" msgid "Authentication data" msgstr "인증 정보" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "작성자" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "작성자 이메일" @@ -2140,7 +2178,7 @@ msgstr "작성자 이메일" msgid "Author:\t\t\t\tStefan Kueng" msgstr "작성자:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "작성자" @@ -2162,35 +2200,35 @@ msgstr "자동 CR/LF 변환" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "자동으로 숨기기" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "모두 자동으로 숨기기" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "자동&CR/LF" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "충돌하지 않았으면 자동으로 닫습니다" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "오류가 없으면 자동으로 닫습니다" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "선택지가 없으면 자동으로 닫습니다" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "병합, 추가, 삭제가 되지 않으면 자동으로 닫습니다." -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2204,7 +2242,7 @@ msgstr "자동으로 Putty 키 불러오기(&K)" msgid "Autoload Putty &Key" msgstr "자동으로 Putty 키 불러오기(&K)" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "자동으로" @@ -2224,19 +2262,19 @@ msgstr "평균" msgid "B&rowse..." msgstr "찾아보기(&R)" -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "뒤로" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "배경" #. Resource IDs: (65535) msgid "Baltic" msgstr "Baltic" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "막대 그래프" @@ -2256,7 +2294,7 @@ msgstr "베이스 파일:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Based on TortoiseIDiff of TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Basic Info" @@ -2268,45 +2306,45 @@ msgstr "다른 파일 간:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bisect bad" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bisect good" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Bisect reset" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "이분검색 시작" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "비트맵\n비트맵" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Black Style" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "수정한 사람 보기" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Blame error" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Blame previous revision" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "소스 파일의 각 행에 대해 마지막으로 수정한 사람을 보여줍니다." @@ -2314,26 +2352,30 @@ msgstr "소스 파일의 각 행에 대해 마지막으로 수정한 사람을 msgid "Blend alpha" msgstr "알파 혼합" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Blue Style" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "내용" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg, /logmsgfile을 동시에 사용했습니다!\n둘 중 하나만 사용하세요." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "패치 파일 및 대상 경로는 모두 절대 경로로 지정하십시오." -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Bottom View:" @@ -2345,30 +2387,30 @@ msgstr "찾아보기(&O)" msgid "Branc&h:" msgstr "브랜치(&H):" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "브랜치" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Branch %s behind %s\r\n%s will fastforward to %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "분기 (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "브랜치 이름" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Branch/Tag name is invalid." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Branch/Tag name must not be empty or is invalid." @@ -2380,11 +2422,11 @@ msgstr "브랜치:" msgid "Bro&wse" msgstr "찾아보기(&W)" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "참조 탐색" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "외부 비교 프로그램 찾아보기..." @@ -2396,7 +2438,7 @@ msgstr "참조 탐색" msgid "Browse..." msgstr "찾아보기..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "버그 ID" @@ -2408,7 +2450,7 @@ msgstr "버그-ID 표현식(&X) :" msgid "Bug-ID/Issue-Nr:" msgstr "버그-ID/이슈-No:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "버그 ID" @@ -2424,13 +2466,13 @@ msgstr "Bugtraq 정규식 테스터 - TortoiseGit" msgid "Button Appearance" msgstr "버튼 모양" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" -msgstr "버튼1" +msgstr "Button1" #. Resource IDs: (1383) msgid "Button3" -msgstr "버튼3" +msgstr "Button3" #. Resource IDs: (1215, 1216) msgid "C&heck now" @@ -2440,7 +2482,7 @@ msgstr "지금 확인(&H)" msgid "C&ommands:" msgstr "명령(&O):" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "리비전으로부터 꼬리표/브랜치 생성(&R)" @@ -2448,11 +2490,11 @@ msgstr "리비전으로부터 꼬리표/브랜치 생성(&R)" msgid "C&urrent Keys:" msgstr "현재 키(&U):" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "잘라내기(&U)" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2468,11 +2510,11 @@ msgstr "계산" msgid "Can double-click in log list to compare with previous revision" msgstr "로그 리스트에서 더블 클릭하면 이전 리비전과 비교할 수 있습니다" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "정적인 ActiveX 객체를 활성화할 수 없습니다." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2481,80 +2523,80 @@ msgid "" "%s" msgstr "%s\n에서\n%s\n로 복사할 수 없습니다" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "비트맵 이미지를 클립보드로 복사할 수 없습니다!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "새 이미지를 만들 수 없습니다." -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "메뉴를 커스터마이즈할 수 없습니다!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "클립보드로부터 비트맵 이미지를 붙여 넣을 수 없습니다!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "취소" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Cancel\nDon't quit TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Cancel\nDon't switch the views" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Cancel\nKeep the empty file." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Cancel\nResolve the conflicts first." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Cancel\nStay with current files" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Cancel\nStay with current settings" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Cannot combine commits now.\r\nMake sure you are viewing the log of your current branch and no filters are applied." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "현재 브랜치를 갱신할 수 없습니다. 갱신하려면 리셋해 주세요." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Cannot show blame. \"%s\" is not under version control by git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "개행 문자가 같은 종류로 되어 있지 않아 차이점을 보일 수 없습니다." @@ -2566,9 +2608,9 @@ msgstr "중첩(&D)" msgid "Cascaded context menu" msgstr "하위 컨텍스트 메뉴에 넣을 항목" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "대소문자 구분" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2590,33 +2632,33 @@ msgstr "" msgid "Change log" msgstr "변경 사항" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Change the printer and printing options\nPrint Setup" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Change the printing options\nPage Setup" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "어플리케이션의 스타일을 변경\n스타일 변경" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "윈도우 위치 이동" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "윈도우 크기 조정" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "변경 유형" @@ -2624,38 +2666,38 @@ msgstr "변경 유형" msgid "Changed Files" msgstr "변경된 파일" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "%s 및 %s 사이에 변경된 파일" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Changed files between %s, %s and %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "바뀐 파일 수: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "추가하거나 삭제한 파일도 계산한 줄 수 변화" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "추가하거나 삭제한 파일도 계산한 날짜별 줄 수 변화" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "추가하거나 삭제한 파일을 제외한 줄 수 변화" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "추가하거나 삭제한 파일을 제외한 날짜별 줄 수 변화" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "변경 리스트 %s 이동됨" @@ -2664,7 +2706,7 @@ msgstr "변경 리스트 %s 이동됨" msgid "Changes made (double-click on file for diff):" msgstr "변경된 파일 (변경 내용확인은 더블 클릭):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "어플리케이션의 스타일 변경" @@ -2672,7 +2714,7 @@ msgstr "어플리케이션의 스타일 변경" msgid "Char position where to show a border line in commit text boxes:" msgstr "커밋 텍스트 상자의 경계선에 표시하려는 문자 위치:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "체크" @@ -2684,31 +2726,31 @@ msgstr "TortoiseGit 업데이트 확인" msgid "Check For Updates..." msgstr "업데이트 확인..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "수정사항 확인(&F)" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "입력한 경로나 URL을 확인하십시오." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "TortoiseGit 하위 메뉴가 아닌 최상위 컨텍스트 메뉴에서 볼 항목을 체크하세요." -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "확장 컨텍스트 메뉴(시프트+우클릭)에서 볼 항목을 체크하세요" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "체크하면 로그가 얼마나 지났는지 상대적으로 보여줍니다" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "체크하면 로그에서 날짜, 시간을 간략하게 표시합니다" @@ -2716,31 +2758,31 @@ msgstr "체크하면 로그에서 날짜, 시간을 간략하게 표시합니다 msgid "Check:" msgstr "체크:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "체크아웃" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "병합없이 로그 아웃" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Cherry Pick" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Cherry Pick failed" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Cherry Pick selected commits..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Cherry Pick this commit..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Cherry-pick failed! Skip this commit?" @@ -2748,11 +2790,11 @@ msgstr "Cherry-pick failed! Skip this commit?" msgid "Chinese" msgstr "중국어" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Choose Repository" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "시간 내림차순 (깃 기본값)" @@ -2764,78 +2806,78 @@ msgstr "정리하기" msgid "Clean Type" msgstr "정리 방법" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "영구적으로 정리" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "휴지통으로 정리" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Clean up stale remote branches" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "정리 중" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Cleaning up." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "다음 경로에 대해 정리하지 못하였습니다:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "다음 경로에 대해 정리하였습니다:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "초기화" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "지우기 툴\n지우기" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Clears %ld URLs stored for %ld working trees" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Clears %ld log messages stored for %ld working trees" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "%ld 저장소에서 캐시된 로그를 지웁니다" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "저장된 인증정보를 제거합니다.\r\n다음 보관소에 접속할 때, 사용자명과 암호를 넣어야 합니다." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "%ld 개 대화상자의 크기와 위치 정보를 삭제합니다." @@ -2844,7 +2886,7 @@ msgstr "%ld 개 대화상자의 크기와 위치 정보를 삭제합니다." msgid "Click here to go to the website" msgstr "웹사이트로 이동하려면 여기를 클릭하십시오." -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "최근에 입력한 메시지를 사용하시려면 여기를 누르세요." @@ -2860,17 +2902,17 @@ msgid "" "extension" msgstr "파일 확장자별로 병합하는 프로그램을 등록하려면 고급 설정을 누르십시오." -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "텍스트 블럭을 이동하는 명령어 보기\n텍스트 블럭 사용" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "클립보드" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Clone" @@ -2878,7 +2920,7 @@ msgstr "Clone" msgid "Clone Existing Repository" msgstr "이미 있는 저장소 복제" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "저장소 복제" @@ -2886,49 +2928,49 @@ msgstr "저장소 복제" msgid "Clone into Bare Repo" msgstr "기본 저장소로 복제" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "복제하기..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "닫기" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "전체 화면 닫기" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "프린트 미리보기 닫기\n닫기(&C)" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "수동으로 닫습니다." -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Close print preview mode\nCancel Preview" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Close the active document\nClose" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "활성화된 윈도우를 닫고, 문서를 저장할지 물어 봅니다." -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "축소" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2954,7 +2996,7 @@ msgstr "색상들:" msgid "Combine One Mail" msgstr "메일 하나로 통합" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "커밋 하나로 합치기" @@ -2962,11 +3004,11 @@ msgstr "커밋 하나로 합치기" msgid "Comman&ds:" msgstr "명령들(&D):" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "명령" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "명령 행" @@ -2974,7 +3016,7 @@ msgstr "명령 행" msgid "Command Line To Execute:" msgstr "실행할 명령:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "명령 오류." @@ -2982,41 +3024,41 @@ msgstr "명령 오류." msgid "Commands" msgstr "명령" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "커밋" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "커밋 %s을(를) 지금 볼 수 있습니다." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "커밋 %s은(는) \"%s\"에서 찾을 수 없습니다. 지금 하위 모듈을 갱신하시겠습니까?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "커밋 날짜" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "커미터 이메일" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Commit Finish" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Commit Info" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "커밋 메시지" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "커미터 이름" @@ -3024,7 +3066,7 @@ msgstr "커미터 이름" msgid "Commit Ordering:" msgstr "커밋 순서:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "슈퍼 프로젝트 커밋" @@ -3032,19 +3074,19 @@ msgstr "슈퍼 프로젝트 커밋" msgid "Commit to:" msgstr "커밋 위치: " -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "커밋..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "작성자에 따른 커밋 수" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "날짜별 커밋 수" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "%s 각각을 커밋" @@ -3053,15 +3095,15 @@ msgstr "%s 각각을 커밋" msgid "Commits each week:" msgstr "각 주 단위의 커밋 수:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "바뀐 내용을 저장소에 반영합니다." -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "커미터 이메일" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3073,52 +3115,52 @@ msgstr "폴더를 추가할 때 그 하위 내용은 자동으로 추가되지 msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "&HEAD 리비전 비교" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Compare selected refs" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "두 파일 " -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "공백 비교" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "작업 공간과 비교(&W)" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "작업하기 위해 꺼냈던 것과 비교(&A)" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "이전 리비전 비교" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "차이점을 비교할 때 모든 공백문자를 비교\n공백문자 비교" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "작업한 내용을 마지막으로 커밋한 리비전과 비교해 보여줍니다." -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Comparing %s to %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "완료" @@ -3134,7 +3176,7 @@ msgstr "설정 저장 위치" msgid "Config type:" msgstr "설정 종류:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "필터 정규 표현식 구성" @@ -3168,11 +3210,11 @@ msgstr "패치파일(GNU diff파일)을 볼 뷰어 고르기" msgid "Confirm to kill running git process" msgstr "git 작업 종료할 때 확인하기" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "충돌" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "충돌 파일" @@ -3180,15 +3222,15 @@ msgstr "충돌 파일" msgid "Conflict resolved" msgstr "충돌 상황 해결됨" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "충돌" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflicts" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "충돌: %d" @@ -3201,124 +3243,124 @@ msgstr "컨텍스트 메뉴:" msgid "Context lines for patches" msgstr "패치를 위한 문맥 행" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "계속" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "붙어있는 윈도우를 줄이기" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Convert spaces to tabs" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Convert tabs to spaces" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "복사(&Y)" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "복사됨" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "복사" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copy %s to %s, Revision %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "SHA-1해시를 클립보드에 복사" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "복사 툴\n복사" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "모든 정보를 클립보드에 복사" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "복사하고 이름 변경" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "로그 메시지만 클립보드에 복사" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Copy log to clipboard" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "경로를 클립보드에 복사" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Copy ref names" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "선택한 내용을 클립보드에 복사(&P)" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "선택한 부분을 복사하고 클립보드에 넣음\n복사" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "클립보드에 복사" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "복사: %s의 새 이름" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Copying %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "복사 중..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "수정" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "무시 목록에 %s를 추가할 수 없습니다!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "새 버전을 확인할 수 없습니다!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "새 버전을 확인할 수 없음! %s (오류 코드: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3326,76 +3368,76 @@ msgid "" "%s" msgstr "Could not copy the files!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "디렉토리가 꽉 차서 %1을 생성할 수 없습니다." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "마지막으로 커밋한 리비전을 알 수 없습니다!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Could not find Super-project" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "상태를 얻을 수 없습니다!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "너무 많은 파일이 열린 상태라서, %1을 열 수 없습니다." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "파일을 열 수 없습니다.\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "현재 디렉토리(%1)는 지울 수 없습니다." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "무시 목록에서 %s를 제거할 수 없습니다." -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Could not reset to first commit (first step). Aborting..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Could not reset to last commit (second step). Aborting..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Could not reset to original HEAD." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "파일의 URL을 가져올 수 없습니다.\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Could not retrieve revision %s of the file %s.\nPatching is not possible!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "TortoiseGitBlame을 실행할 수 없습니다" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3403,7 +3445,7 @@ msgid "" "%s" msgstr "Could not start diff viewer!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3411,7 +3453,7 @@ msgid "" "%s" msgstr "Could not start external diff program!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3419,11 +3461,11 @@ msgid "" "%s" msgstr "Could not start external merge program!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "프린트 작업을 시작할 수 없습니다." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3431,11 +3473,11 @@ msgid "" "%s" msgstr "Could not start text viewer!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Could not start the Putty Agent (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "스레드를 시작하지 못 했습니다!" @@ -3443,7 +3485,7 @@ msgstr "스레드를 시작하지 못 했습니다!" msgid "Coun&t" msgstr "수(&T)" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "개수: %u 일치." @@ -3456,15 +3498,15 @@ msgstr "라이브러리 생성(&L)" msgid "Create .gitignore file" msgstr "Create .gitignore file" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "브랜치 만들기" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "이 버전을 기준으로 브랜치 만들기..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "브랜치 만들기..." @@ -3476,29 +3518,29 @@ msgstr "변경 리스트 생성" msgid "Create New Branch" msgstr "새 브랜치 만들기" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "패치 만들기..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "꼬리표 달기" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "이 버전에 꼬리표 달기..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "꼬리표 달기..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Create a new document\nNew" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3507,49 +3549,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "지정한만큼의 커밋만 가져오는 얕은 깊이의 복사를 합니다. 이 얕은 저장소는 (이 저장소에서 복사나 가져오기를 못한다거나, 푸시도 못 하는) 여러 제한이 있습니다. 하지만 규모가 큰 프로젝트에서 최근 수정부분만 관심이 있거나, 패치를 만들 생각이라면 이게 적절합니다." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "패치 파일 만들기" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "가져오기(&R)" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "저장소 여기에 만들기(&Y)..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Created" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Creates a branch or tag" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Creates a library folder with special settings for Git working trees" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "두 파일의 차이점으로부터 패치 파일 생성하기\n패치 파일 생성" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "현재 위치에 저장소 DB를 만듭니다." -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "바뀐 모든 부분에 대해 Unified diff를 생성합니다" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Creating pull-request..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "자격 증명 도우미는 빈 칸일 수 없습니다." @@ -3561,7 +3603,7 @@ msgstr "자격 증명 도우미:" msgid "Credentials" msgstr "자격 증명" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "잘라내기(&T)" @@ -3569,7 +3611,7 @@ msgstr "잘라내기(&T)" msgid "Current" msgstr "현재" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "현재 브랜치" @@ -3577,7 +3619,7 @@ msgstr "현재 브랜치" msgid "Current Branch:" msgstr "현재 브랜치:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3589,7 +3631,7 @@ msgstr "Current branch %s is up to date\r\n\r\n If you want to force the rebase msgid "Current version is:" msgstr "최신 버전:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "최신 버전: %s" @@ -3602,7 +3644,7 @@ msgstr "커스터마이즈(&T)..." msgid "Custom" msgstr "커스텀" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "커스터마이즈" @@ -3610,19 +3652,19 @@ msgstr "커스터마이즈" msgid "Customize Keyboard" msgstr "키보드 커스터마이즈하기" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "빠른 접근 툴바 커스터마이즈하기" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "빠른 접근 툴바 커스터마이즈하기..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Customize..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3636,88 +3678,92 @@ msgstr "러시아어" msgid "DCommit Type" msgstr "DCommit Type" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "공개하기" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "날짜" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "마지막 커밋날짜" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "기본" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "기본 메뉴" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "기본 어플리케이션 메뉴. 열려진 문서가 하나도 없을 때 보여줍니다." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "기본적으로 UTF-8 인코딩" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "삭제" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Delete %d branches" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Delete %d remote branches" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Delete %d tags" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Delete &local" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "참조 삭제..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "모든 꼬리표 제거" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "파일 이름에 따라 %d 개 아이템을 삭제하고 무시하기(&I)" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "삭제하고 무시 목록에 넣기(&I)" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "확장자에 따라 %d 개 아이템을 삭제하고 무시하기(&E)" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "브랜치 제거" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "브랜치/꼬리표 제거" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "원격 브랜치 제거" @@ -3725,34 +3771,34 @@ msgstr "원격 브랜치 제거" msgid "Delete remote tag - TortoiseGit" msgstr "원격 꼬리표 제거 - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "\"%s\"에서 원격 태그 삭제" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "원격 꼬리표 제거..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "서브모듈 제거" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "꼬리표 제거" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Delete the existing branch or use a different name." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Delete\nThe file is removed." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "삭제됨" @@ -3760,36 +3806,36 @@ msgstr "삭제됨" msgid "Deleted merge conflict" msgstr "Deleted merge conflict" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "선택된 파일(들) 혹은 파일 마스크를 삭제하고 '무시' 리스트에 추가하기" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Deletes files/folders from version control" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Deletes files/folders from version control but keeps the file" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "명령 로그 파일을 삭제" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "삭제" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "캐시된 데이타 삭제" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "파일 삭제" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Deleting remote refs..." @@ -3809,7 +3855,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "설명" @@ -3817,7 +3863,7 @@ msgstr "설명" msgid "Description:" msgstr "설명:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "변경 리스트 선택하지 않음" @@ -3825,33 +3871,33 @@ msgstr "변경 리스트 선택하지 않음" msgid "Destination" msgstr "대상" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "목적지 디스크가 꽉 찼습니다." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "이동된 블럭을 검출하고 밝게 표시합니다." -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "모든 커밋에 존재하는 파일의 이동 및 복사된 행 감지" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "대상 파일이 생성된 커밋 위치에 존재하는 파일의 이동 및 복사된 행 감지" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "동일한 커밋의 수정 파일에서 이동 및 복사된 행 감지" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "파일간 이동 또는 복사된 행 감지" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3865,11 +3911,15 @@ msgstr "대화상자의 크기와 위치" msgid "Dialogs" msgstr "대화상자" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "차이점 옵션" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "두 커밋 비교하기" @@ -3901,7 +3951,7 @@ msgstr "비교 파일:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "나중에 비교" @@ -3913,12 +3963,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "\"%s\"와 비교" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Diff with parent %d" @@ -3931,19 +3981,19 @@ msgstr "차이점 보기" msgid "Diffing" msgstr "비교 중" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "커밋 비교 중" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Diffs the working tree file with the one before the last commit" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Diffs two any commits" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "폴더..." @@ -3955,26 +4005,26 @@ msgstr "경로:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Disable this option if you have really big working trees and experience\r\ntoo much disk access when browsing the working tree." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "비활성화" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "%1에 접근하는 동안 디스크 꽉참." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "가져오기 예외: %1" @@ -3983,44 +4033,52 @@ msgstr "가져오기 예외: %1" msgid "Display &buttons in this order" msgstr "이 순서로 버튼 보여주기(&B)" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Display full pages\nPrint Preview" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "버튼, 메뉴, 창에서 클릭하면 도움말을 보여줍니다.\n도움말" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "현재 작업이나 명령의 도움말을 보여줍니다.\n도움말" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "도움말 사용방법을 보여줍니다.\n도움말" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "프로그램 정보 표시, 버전 번호, 저작권\n프로그램 정보" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "앞으로 이 경고를 띄우지 않습니다 (계속을 선택했을 시)(&N)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "앞으로 이 경고를 띄우지 않습니다 (무시를 선택했을 시)(&N)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "자동으로 서브모듈 선택하지말기" @@ -4033,54 +4091,71 @@ msgstr "다음 경로에선 컨텍스트 메뉴를 보여주지 않습니다:" msgid "Do not use recycle bin" msgstr "휴지통 안 쓰기" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "정말 %s을 삭제하겠습니까?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "'%s' 툴바를 정말로 삭제하시겠습니까?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "선택한 파일을 수정하지 않은 파일로 간주하겠습니까?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "선택한 파일을 '처리 안 함' 상태로 만들겠습니까?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "이 파일/폴더를 정말 이동하시겠습니까?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "정말 참조 %d개를 완전히 삭제하겠습니까? 삭제하면 복구가 불가능합니다!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "\"%s\"를 정말 지우겠습니까?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Do you really want to restore the copy? You will lose all changes that you have done after creating the copy." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4088,7 +4163,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Do you really want to revert all changes in\n%s\nand go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4096,21 +4171,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Do you really want to revert all changes in\n%s\nwhich were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "건너뛰기-작업 트리 또는 변경-가정으로 선택한 파일을 언플래그 하시겠습니까?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Do you want to fetch remote branches from the newly added remote?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "바뀐 파일들을 불러오겠습니까?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4118,21 +4193,21 @@ msgid "" "as resolved?" msgstr "파일\n%s\n를(을) 해결된 것으로 표시하시겠습니까?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "자동으로 저장된 문서를 복구하시겠습니까?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "다시 읽어들이시겠습니까?\n주의: 바뀐 설정 내용이 모두 사라집니다." -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "변경 사항을 보시겠습니까?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Do you want to stash pop now?" @@ -4140,28 +4215,28 @@ msgstr "Do you want to stash pop now?" msgid "Document :" msgstr "문서 :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Don't know what will push because unknown branch \"%s\"" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Don't know what will push because you enter URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "자동으로 저장된 문서를 복구하지 않음\n명시적으로 저장된 이 문서의 마지막 버전을 사용합니다." -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Don't save\nClose the views without saving the modifications" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4171,11 +4246,11 @@ msgstr "Don't save\nReload the views without saving the modifications" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "이 메시지를 다시 표시하지 않음" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "완료" @@ -4187,7 +4262,7 @@ msgstr "아래로" msgid "Download" msgstr "다운로드" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "이 메뉴를 띄우기 위해서 드래그하십시오" @@ -4215,6 +4290,10 @@ msgstr "Dummy Button Form " msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "제외 경로(&X):" @@ -4223,7 +4302,7 @@ msgstr "제외 경로(&X):" msgid "E&xit" msgstr "종료(&X)" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "파일로 내보내기(&X)..." @@ -4243,11 +4322,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Eastern European" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "편집" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "전역 .gitconfig 편집하기(&G)" @@ -4263,23 +4342,23 @@ msgstr ".tgitconfig 편집하기" msgid "Edit Button Image" msgstr "버튼 이미지 편집하기" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "메모하기" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "작성자 수정" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "설명 편집" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "확장자별 비교 프로그램 편집" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "확장자별 병합 프로그램 편집" @@ -4291,11 +4370,11 @@ msgstr "TGit .gitconfig 편집하기(&O)" msgid "Edit global &XDG git/config" msgstr "전역 XDG git/config 편집(&X)" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Edit local git config" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "로그 메시지 수정" @@ -4315,25 +4394,25 @@ msgstr "" msgid "Effective" msgstr "결과" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "프록시 서버 이름이나 IP를 입력하십시오." -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "타원 툴\n타원" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "이메일" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "받는 사람이나 참조(CC)할 사람이 적어도 하나는 있어야 합니다." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "이메일" @@ -4341,7 +4420,7 @@ msgstr "이메일" msgid "Empty" msgstr "비어있음" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "편집하기" @@ -4357,7 +4436,7 @@ msgstr "그라바타 보기" msgid "Enable drag context menu" msgstr "드래그 컨텍스트 메뉴 활성화" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "tortoisegit.data, tortoisegit.index 파일을 만들어서 로그를 캐시합니다." @@ -4366,10 +4445,14 @@ msgstr "tortoisegit.data, tortoisegit.index 파일을 만들어서 로그를 캐 msgid "Enable log cache" msgstr "로그 캐시 사용" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "로그 대화상자에서 그라바타 이미지를 보여줍니다" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "활성화된 오버레이 핸들러" @@ -4378,35 +4461,35 @@ msgstr "활성화된 오버레이 핸들러" msgid "Encode" msgstr "문자 집합" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "인코딩" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "%1에 접근하는 동안 하드웨어 I/O 오류가 보고 되었습니다." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "%1에 접근하는 동안 잠금 오류가 발생하였습니다." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "%1을 접근하는 중에 공유 위반이 발생하였습니다." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "잘못된 인자를 받았습니다." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "%1을 읽는 중에 예기치 않은 오류가 발생하였습니다." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "%1을 쓰는 중에 예기치 않은 오류가 발생하였습니다." @@ -4419,11 +4502,11 @@ msgstr "암호화" msgid "End" msgstr "끝" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "End of Line Style" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "윈도우를 최대 크기로 늘입니다." @@ -4431,23 +4514,23 @@ msgstr "윈도우를 최대 크기로 늘입니다." msgid "Enter Log Message" msgstr "로그 메시지를 입력하세요" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "URL 입력" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "GUID를 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "금액을 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "날짜, 시간을 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "날짜를 입력하십시오." @@ -4455,33 +4538,33 @@ msgstr "날짜를 입력하십시오." msgid "Enter a name for the changelist:" msgstr "Enter a name for the changelist:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "%1 ~ %2사이의 값을 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "숫자를 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "양의 정수를 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "시간을 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "%1 ~ %2 사이의 정수를 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "0 ~ 255 사이의 정수를 입력하십시오." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "정수를 입력하십시오." @@ -4493,7 +4576,7 @@ msgstr "아래에 테스트할 파일 내용 입력:" msgid "Enter log &message:" msgstr "로그 메시지 입력(&M):" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "글자 %1개까지만 입력하십시오." @@ -4502,43 +4585,43 @@ msgstr "글자 %1개까지만 입력하십시오." msgid "Enter the regex string below:" msgstr "아래에 정규식 문자열 입력:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "모든 것을 지웁니다.\n모두 지우기" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "선택한 것 지우기\n지우기" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "오류" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "쉘 아이콘 캐쉬 새로만들기에 실패하였습니다." -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Error while reading/writing the registry key %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Everything updated." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4548,28 +4631,28 @@ msgstr "실행 파일 (*.exe)|*.exe|COM 파일 (*.com)|*.com|PDF 문서 (*.pdf)| msgid "Executable (+x)" msgstr "실행파일 (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "존재하는" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "종료" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "확장하기 (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "붙어있는 윈도우를 확장하기" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "탐색" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "내보내기" @@ -4577,36 +4660,36 @@ msgstr "내보내기" msgid "Export Zip File" msgstr "Zip 파일로 압축하여 내보내기" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "디렉토리 익스포트:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Export selection to..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "이 버전을 파일로 내보내기..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "버전관리 대상이 아닌 파일도 내보내기" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "%s 내보내는 중" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "내보내는 중..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exports a revision to a zip file" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "확장자" @@ -4622,7 +4705,7 @@ msgstr "확장:" msgid "Extern DLL Path:" msgstr "외부 DLL 경로:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "외부" @@ -4630,101 +4713,101 @@ msgstr "외부" msgid "External Program:" msgstr "외부 프로그램:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "페이드" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "실패" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "되돌리기 실패" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Failed to checkout file \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Failed to checkout file \"%s\" of revision %s to \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "연결하는데 실패했습니다.\n링크가 깨진것 같습니다." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "ActiveX 객체를 변환하는데 실패했습니다." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "빈 문서 작성 실패." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "객체를 생성하는데 실패했습니다. 어플리케이션이 시스템 레지스트리에 들어있는지 확인하십시오." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Failed to create pull-request." -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Failed to get base file." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Failed to get merge file." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "도움말 시작 오류." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "서버 어플리케이션을 실행하는데 실패했습니다." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "문서 열기에 실패함." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "서버 동작을 수행하는데 실패했습니다." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "문서 저장 실패." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "변경 리스트 '%s'를 설정/제거에 실패함" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Failed to start the issue tracker COM provider '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Failed waiting for pageant to finish loading key." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "실패하였습니다" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Fast Forward" @@ -4732,62 +4815,62 @@ msgstr "Fast Forward" msgid "Fast Forward o&nly" msgstr "Fast Forward o&nly" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Fast forward to %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "가져오기(&H)" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "가져오기" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "SVN 저장소에서 가져오기" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "\"%s\"에서 가져오기" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "가져오기&&재배치(&B)" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "가져오기..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Fetching Status..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Fetching changed files..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "파일 가져오기..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "리비전 %s 가져오기 파일명:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "파일" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "파일 인코딩" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "파일 변경들 각각 %s" @@ -4796,27 +4879,27 @@ msgstr "파일 변경들 각각 %s" msgid "File changes each week:" msgstr "각 주단위의 변경된 파일 수:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "파일 비교" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "File has no conflicts" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "File is empty." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "파일 목록이 비어 있습니다" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "파일 패치" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4828,7 +4911,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "파일 크기:\t%s (%s)\n가로:\t\t%ld pixel\n세로:\t\t%ld pixel\n수평 해상도:\t%.1f dpi\n수직 해상도:\t%.1f dpi\n깊이:\t\t%d bit\n확대:\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4848,7 +4931,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "파일 크기:\t%s (%s)\n가로:\t\t%ld pixel\n세로:\t\t%ld pixel\n수평 해상도:\t%.1f dpi\n수직 해상도:\t%.1f dpi\n깊이:\t\t%d bit\n확대:\t\t%d%%\n\n파일 크기:\t%s (%s)\n가로:\t\t%ld pixel\n세로:\t\t%ld pixel\n수평 해상도:\t%.1f dpi\n수직 해상도:\t%.1f dpi\n깊이:\t\t%d bit\n확대:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4860,7 +4943,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "파일 크기:\t\t%s (%s)\n가로:\t\t%ld 픽셀\n세로:\t\t%ld 픽셀\n수평 해상도:\t%.1f dpi\n수직 해상도:\t%.1f dpi\n깊이:\t\t%d bit\n확대:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4880,7 +4963,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "파일 크기:\t\t%s (%s)\n가로:\t\t%ld pixel\n세로:\t\t%ld pixel\n수평 해상도:\t%.1f dpi\n수직 해상도:\t%.1f dpi\n깊이:\t\t%d bit\n확대:\t\t%d%%\n\n파일 크기:\t\t%s (%s)\n가로:\t\t%ld pixel\n세로:\t\t%ld pixel\n수평 해상도:\t%.1f dpi\n수직 해상도:\t%.1f dpi\n깊이:\t\t%d bit\n확대:\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "파일 이름" @@ -4888,17 +4971,17 @@ msgstr "파일 이름" msgid "Files" msgstr "파일" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "채우기 툴\n채우기" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "다음에 의한 필터" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "필터 경로" @@ -4910,11 +4993,11 @@ msgstr "필터:" msgid "Filter: " msgstr "필터:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "찾기" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4924,17 +5007,17 @@ msgstr "특정 문자열 찾기\n찾기" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "찾기: 텍스트 \"%s\"을(를) 찾을 수 없습니다" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "찾기: 하단에서 첫 번째 발생 항목 발견. 문서의 시작 위치에 도달했습니다." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "찾기: 상단에서 첫 번째 항목 발견. 문서의 끝에 도달했습니다." @@ -4942,23 +5025,23 @@ msgstr "찾기: 상단에서 첫 번째 항목 발견. 문서의 끝에 도달 msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "완료" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Finished rebasing." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "완료됨!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "First Parent" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "First Parent Only" @@ -4967,18 +5050,18 @@ msgid "First known &bad:" msgstr "검색 끝 버전(&B):" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Fit image &heights" +msgid "Fit image &heights\tH" +msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Fit image &widths" +msgid "Fit image &widths\tW" +msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "플로피 드라이브 (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "폴더" @@ -4990,38 +5073,34 @@ msgstr "Follow renames" msgid "Font" msgstr "폰트" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "도움말은 F1을 누르시고, 좌우 스크롤은 Ctrl을 누른 상태에서 휠을 움직이면 됩니다." -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "모든 로그를 보려면 '복사/이름변경 시점에서 중지'을 끄면 됩니다" -#. Resource IDs: (1521) -msgid "Force" -msgstr "강제로" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "같은 이름인 꼬리표가 브랜치나 있어도 강제로 만듭니다" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5039,20 +5118,20 @@ msgstr "" msgid "Format Patch" msgstr "패치 만들기" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "패치 만들기..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "다음" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "%d 앞으로" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5082,11 +5161,11 @@ msgstr "수정한 파일 중에서(&M)" msgid "From SVN Repository" msgstr "SVN 저장소에서 가져오기" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "존재하는 파일 중에서" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "수정한 파일 중에서" @@ -5094,7 +5173,7 @@ msgstr "수정한 파일 중에서" msgid "From:" msgstr "시작:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "전체 화면" @@ -5102,7 +5181,7 @@ msgstr "전체 화면" msgid "Full text search" msgstr "문자열 모두 검색" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "하위에 끝까지 적용" @@ -5110,7 +5189,7 @@ msgstr "하위에 끝까지 적용" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "대화상자 3에 커밋 대화상자 옵션이 더 있습니다." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "그라바타(&R)" @@ -5118,24 +5197,24 @@ msgstr "그라바타(&R)" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplified)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+의 초기화에 실패하였습니다!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+가 비트맵 개체를 만들 수 없습니다. 메모리가 부족합니다." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "정보 수집 중, 기다리세요..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "통계 생성 중" @@ -5179,57 +5258,57 @@ msgstr "일반::대화상자 3" msgid "General::Set Extend Menu Item" msgstr "일반::확장 메뉴" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "병합 로그 보기" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Getting file %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Getting file %s, revision %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "정보 얻는 중..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "필요한 정보 얻는 중..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "unified diff 만드는 중..." #. Resource IDs: (4569) msgid "Git" -msgstr "깃" +msgstr "Git" #. Resource IDs: (300) msgid "Git Command Progress" msgstr "깃 명령 경과" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Copy and add files to this WC" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Copy and rename versioned item here" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Copy versioned item(s) here" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Export all items here" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Export versioned items here" @@ -5237,35 +5316,35 @@ msgstr "Git Export versioned items here" msgid "Git Init" msgstr "깃 초기화" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "깃 설치 경로" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "깃 로그" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Move and rename versioned item here" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Move versioned item(s) here" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git Remote Settings" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "깃 리비전 목록" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "깃 SVN 재배치" @@ -5277,31 +5356,31 @@ msgstr "깃 동기화" msgid "Git clone - TortoiseGit" msgstr "저장소 복제 - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "깃 디렉토리를 정하지 않았습니다 (\"일반\"에서 확인해주세요)." #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "윈도우용 Git" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git for Windows (https://msysgit.github.io/)을 못 찾았습니다." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "깃 저장소를 만들던 중 에러가 발생했습니다!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Git 개정 목록은 전체 파일 기록을 포함" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Git 개정 목록으로 다음 파일 이름 바꾸기" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5322,7 +5401,7 @@ msgstr "깃::자격 증명" msgid "Git::Remote" msgstr "깃::원격" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "전역" @@ -5334,47 +5413,47 @@ msgstr "지정된 행으로 이동" msgid "Go to line" msgstr "줄 찾아가기" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "다음 충돌지점으로 이동\n다음 충돌지점" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "다음 차이점으로 이동\n다음 차이점" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "다음 차이나는 행으로 이동\n다음 행단위 차이" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "이전 충돌지점으로 이동\n이전 충돌지점" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "이전 차이점으로 이동\n이전 차이점" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "이전 차이나는 행으로 이동\n이전 행단위 차이" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "특정 행으로 이동" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "그래프" @@ -5390,11 +5469,11 @@ msgstr "회색" msgid "Greek" msgstr "그리스어" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "그룹 변경 목록" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "H&ide Unrelated Changed Paths" @@ -5410,7 +5489,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Hard" @@ -5422,7 +5501,7 @@ msgstr "세게: 작업 공간과 관리 영역 전부 되돌리기 (모든 변 msgid "Hebrew" msgstr "히브리어" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "도움말" @@ -5446,11 +5525,11 @@ msgstr "헥사" msgid "Hide Menus for unversioned paths" msgstr "버전관리되지 않는 경로에 대해서 메뉴를 숨깁니다." -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "패치 데이터 숨김<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "붙어있는 윈도우를 숨기기" @@ -5458,25 +5537,25 @@ msgstr "붙어있는 윈도우를 숨기기" msgid "Hide the script while running" msgstr "스크립트 수행 중 숨김" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "변경되지 않은 내용 숨기기" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "참조 비교 목록에서 바뀌지 않은 참조는 숨기기" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "패치 파일 목록 보이기/숨기기" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "패치 파일 목록을 보이거나 숨깁니다.\n패치 파일 목록을 보이거나 숨깁니다." -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "힌트" @@ -5486,7 +5565,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "힌트: 컨텍스트 메뉴를 선택하고, 페이지를 '명령'으로 변경한 후에 툴바 버튼을 메뉴 창으로 드래그하십시오." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "처음으로" @@ -5502,7 +5581,7 @@ msgstr "훅 스크립트::이슈 트래커 설정" msgid "Hook Scripts::Issue Tracker Integration" msgstr "훅 스크립트::이슈 트래커 통합" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "훅 종류" @@ -5516,9 +5595,9 @@ msgstr "포함 경로(&N):" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "BugTraqProvider" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5526,55 +5605,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5582,15 +5662,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5614,7 +5694,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5622,7 +5702,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5630,7 +5710,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5638,16 +5718,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5658,17 +5738,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5680,7 +5760,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5744,7 +5824,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "아이콘 오버레이" @@ -5756,7 +5836,7 @@ msgstr "아이콘 오버레이::아이콘 모음" msgid "Icon Overlays::Overlay Handlers" msgstr "아이콘 오버레이::아이콘 핸들" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5766,52 +5846,52 @@ msgstr "아이콘 (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;* msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "아이콘/디자인/코드:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "'다른 이름으로 저장...' 혹은 '열기' 대화 상자에서는 오버레이 아이콘과 컨텍스트 메뉴를 사용하지 않습니다." -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "체크하면 --track, 체크 안 하면 --no-track인자를 git에 전달하고, 중간 상태면 아무 인자도 전달하지 않습니다 (도움말 참고)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "로그 리스트에서 더블클릭하면 이전 리비전과 비교합니다" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "체크하면 에러로 커밋이 실패해도 " -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "이 항목을 활성화할 경우 일주일에 한번씩 사용 가능한 최신 버전이 있는지 확인합니다." -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "활성화하면 제외 경로에 포함된 깃 저장소를\n'일반(체크 아이콘)' 상태로 표시합니다." -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "설정하면, 버전관리 대상이 아닌 폴더도 상태 컨트롤에서 보여집니다.\r\n상태 컨트롤은 커밋 대화상자안의 예제로 사용됩니다." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5824,16 +5904,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "이 폴더에서 작업하려면 체크하지 마십시오. 일반적으로 기본 저장소는 '푸시된' 변경사항만 받아들일 수 있습니다. (관례상 기본 저장소 폴더는 이름이 '.git'으로 끝납니다)" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "무시" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "확장자에 따라 %d 개 아이템을 무시하기(&E)" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "주석 무시" @@ -5845,15 +5925,15 @@ msgstr "무시 기록 파일" msgid "Ignore Type" msgstr "무시 방법" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "모든 공백 무시" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "모든 공백문자의 변경을 무시" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "빈 줄 무시" @@ -5861,7 +5941,7 @@ msgstr "빈 줄 무시" msgid "Ignore case cha&nges" msgstr "대소문자 변경 무시(&N)" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5879,11 +5959,11 @@ msgstr "하위 폴더 전체에서 무시하기" msgid "Ignore line &endings (recommended)" msgstr "줄바꿈 문자 무시(권장)(&E)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "EOL 공백 무시" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "공백 변경 무시" @@ -5891,29 +5971,29 @@ msgstr "공백 변경 무시" msgid "Ignore whitespace" msgstr "공백 무시" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "공백의 차이는 무시함" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "상/하위 버전 비교 시 공백 무시 " -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "무시함" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "무시된 파일" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "차이점을 비교할 때 모든 공백문자의 변경을 무시\n모든 공백문자의 변경을 무시" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5931,24 +6011,24 @@ msgstr "이미지와 텍스트(&A)" msgid "Images" msgstr "이미지들" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "1차 파일 및 디렉토리에만 적용" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "임포트" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Import %s to %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "SVN 무시목록 가져오기" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "SVN 무시목록 가져오기..." @@ -5957,16 +6037,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "SVN ignore 파일을 .git/info/exclude 파일에 덮어씌웁니다." -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importing file %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "In ChangeList" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "In Commits" @@ -5990,24 +6070,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "다음 리비전 구간만 포함:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "잘못된 파일명." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "최초 임포트" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "%s에 빈 Git저장소를 만들었습니다." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "줄 안에서 비교" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "단어 단위로 줄 안에서 비교" @@ -6019,25 +6099,25 @@ msgstr "라인단위 비교" msgid "Input" msgstr "입력" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "클립보드 내용을 붙임\n붙여넣기" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "명령을 수행하기에 메모리가 충분하지 않습니다." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "내부 오류." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "유효하지 않은 단위" -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Invalid revision number!" @@ -6045,7 +6125,7 @@ msgstr "Invalid revision number!" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6068,7 +6148,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "유지" @@ -6076,11 +6156,11 @@ msgstr "유지" msgid "Keep changelists" msgstr "Keep changelists" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Keep file locally?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6094,7 +6174,7 @@ msgstr "키보드" msgid "Keyboard shortcuts:" msgstr "키보드 단축키:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "키" @@ -6138,19 +6218,39 @@ msgstr "선 8" msgid "Language:" msgstr "언어:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "마지막 작성자" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "마지막 커밋" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "마지막 수정시각" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "마지막 수정:" @@ -6158,7 +6258,11 @@ msgstr "마지막 수정:" msgid "Last known &good:" msgstr "검색 시작 버전(&G):" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Launches the external diff/merge program to solve the conflicts" @@ -6166,17 +6270,17 @@ msgstr "Launches the external diff/merge program to solve the conflicts" msgid "Least active author:" msgstr "활동이 적은 작성자:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Leave as conflicted\nThe conflict status of the file is kept" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "왼쪽: " @@ -6184,11 +6288,11 @@ msgstr "왼쪽: " msgid "Left image" msgstr "왼쪽 이미지" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "꺾은 선 그래프" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6202,12 +6306,12 @@ msgstr "Line diff bar" msgid "Line differences" msgstr "행별 비교" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "%ld 번째 라인에서 라인 이동" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "%ld 번째 라인으로 라인 이동" @@ -6220,26 +6324,26 @@ msgstr "선 굵기" msgid "Line:" msgstr "행:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "행: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "추가된 줄 수" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "삭제된 줄 수" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "도움말 주제 목록\n도움말 주제" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6247,7 +6351,7 @@ msgstr "파일명 변경을 \"긴/경로/이전/파일.txt (긴/경로/지금/ #. Resource IDs: (16631, 16992) msgid "List1" -msgstr "리스트1" +msgstr "List1" #. Resource IDs: (130) msgid "Load Images" @@ -6257,23 +6361,23 @@ msgstr "이미지 불러오기" msgid "Load Putty &Key" msgstr "Putty키 쓰기(&K)" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "변경사항 불러오기\nTortoiseGitMerge에서 편집한 것을 버리고 새로운 내용으로 교체합니다." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "변경사항 불러오기\n화면을 새 내용물로 갱신합니다." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Loading..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "로컬" @@ -6281,13 +6385,13 @@ msgstr "로컬" msgid "Local Branch" msgstr "로컬 브랜치" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "로컬 상태" @@ -6295,7 +6399,7 @@ msgstr "로컬 상태" msgid "Local:" msgstr "로컬:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6305,7 +6409,7 @@ msgstr "Location where the contents of the\nselected revision of the repository msgid "Locator Bar" msgstr "Locator Bar" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "로그" @@ -6345,12 +6449,12 @@ msgstr "로그 메시지 (로그 대화상자로 봄)" msgid "Login:" msgstr "로그인:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Lowest shown revision: %ld - Highest shown revision: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6361,7 +6465,7 @@ msgstr "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision msgid "Lum" msgstr "휘도" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6373,14 +6477,10 @@ msgstr "맥" msgid "Mail" msgstr "메일" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "메일 시스템 DLL이 유효하지 않습니다." -#. Resource IDs: (156) -msgid "Main" -msgstr "메인" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "기본 저장소로 만들기 (작업 공간이 없음)" @@ -6393,47 +6493,47 @@ msgstr "관리(&G)" msgid "Manage" msgstr "관리" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "원격 저장소 관리" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "충돌해결상태로 표시" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Mark as resolved\nThe file status is changed to modified" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "비교 대상으로 표시" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "이 블록 표시" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Marks a file as resolved in Git\nMark as resolved" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Marks revision as bad" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Marks revision as good" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "대소문자 구별(&C)" @@ -6457,7 +6557,7 @@ msgstr "메뉴는 가장 최근에 사용된 명령어들을 먼저 보여줍니 msgid "Menu" msgstr "메뉴" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "메뉴 바" @@ -6465,7 +6565,7 @@ msgstr "메뉴 바" msgid "Menu s&hadows" msgstr "메뉴 그림자(&H)" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "병합" @@ -6473,34 +6573,34 @@ msgstr "병합" msgid "Merge &Message" msgstr "병합 메시지(&M)" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Merge Point" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "재통합 병합" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "\"%s\"와 병합..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "병합됨" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "병합한 파일" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Merges another branch" @@ -6508,22 +6608,22 @@ msgstr "Merges another branch" msgid "Merging" msgstr "병합" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Merging from %s, revision %s to %s, revision %s into %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "'시작:' 과 '끝:'에는 다른 리비전 혹은 URL이 들어 있어야 병합가능합니다." -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Merging revisions %s of %s into %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "메시지" @@ -6533,9 +6633,9 @@ msgstr "메시지만 커밋(&Y)" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "메시지 파트 표현식(&E):" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "메시지" @@ -6543,11 +6643,11 @@ msgstr "메시지" msgid "Min" msgstr "최소" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "작업 사본" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "리본 최소화하기" @@ -6559,7 +6659,11 @@ msgstr "커밋 메시지 최소 글자 수:" msgid "Misc" msgstr "기타" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Mixed" @@ -6567,35 +6671,35 @@ msgstr "Mixed" msgid "Mixed: Leave working tree untouched, reset index" msgstr "중간: 작업 공간은 그대로 두고, 관리 영역만 되돌리기" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "수정일" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "수정됨" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "수정된 파일" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "더 보기" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "더 많은 버튼들" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "더 많은 명령들..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "다른 색상..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "더 보기..." @@ -6615,41 +6719,41 @@ msgstr "아래로 이동하기(&D)" msgid "Move &Up" msgstr "위로 이동하기(&U)" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "아이템을 아래로 이동" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "아이템을 위로 이동" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "이동하고 이름 변경" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "변경 리스트로 이동" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "이동/이름 바꾸기" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "이동: %s의 새 이름" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "되돌리기 전에 먼저 수정된 파일들을 휴지통으로 이동" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Moving %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "이동중..." @@ -6657,11 +6761,11 @@ msgstr "이동중..." msgid "My file:" msgstr "작업중인 파일:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "이름" @@ -6673,7 +6777,7 @@ msgstr "이름:" msgid "Navigate" msgstr "이동" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6683,11 +6787,11 @@ msgstr "뷰의 특정 행으로 이동\n행 이동" msgid "Navigation Pane Options" msgstr "네비게이션 창 옵션" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "네비게이션 창 옵션..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "중첩됨" @@ -6699,7 +6803,7 @@ msgstr "네트워크" msgid "Network::Email" msgstr "네트워크::이메일" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "New" @@ -6708,43 +6812,43 @@ msgid "New &name:" msgstr "새 이름(&N):" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "새 브랜치\\꼬리표" +msgid "New Branch/Tag" +msgstr "새 브랜치/꼬리표" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "새로운 메뉴" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "%s의 새 이름" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" -msgstr "" +msgstr "새 이름은 비어있거나 원래 이름과 동일해서는 안됩니다." -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "새 이름:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "New submodule" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Newer commit time" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "새 줄" @@ -6752,33 +6856,29 @@ msgstr "새 줄" msgid "Next" msgstr "다음" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "다음 페이지\n다음 페이지" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "다음 충돌 지점" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "다음 차이점" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "다음 줄단위 차이점" -#. Resource IDs: (73) -msgid "No" -msgstr "아니오" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "No &Fast Forward" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "병합 커밋 무시(&M)" @@ -6790,102 +6890,107 @@ msgstr "노 체크아웃" msgid "No Co&mmit" msgstr "No Co&mmit" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "No HEAD found" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "No command specified!\n\nTortoiseGitProc.exe is used by the Shell extension and should not be called directly!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "명령 값이 지정되지 않음" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "차이점이 없습니다!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "차이점이 없습니다! 서브모듈 업데이트가 필요 없을 것 같습니다. 지금 업데이트 하겠습니까?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "에러 메시지가 유효하지 않습니다." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "오류 발생하지 않음." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "되돌릴 파일, 폴더가 없습니다. 모든 것이 그대롭니다." -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "현재 설정으로는 어떤 파일도 보여지지 않습니다.\n버전관리가 아니거나, 무시목록에 있는 것 혹은 수정되지 않은 파일을 보고 싶으면,\n아래 중 하나 이상을 선택하십시오. 저장소파일의 변경 상태를 보려면 '저장소 확인'을 선택하세요" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "No files were changed or added since\nthe last commit. There's nothing\nfor TortoiseGit to do here..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "마지막 커밋 이후 변경하거나 추가한\n파일이 없습니다. 여기서 TortoiseGit이\n할 일이 없습니다...\n미관리 파일을 보겠습니까?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "사용할 수 있는 그래프가 없습니다." -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "%s의 이미지 인코더를 발견할 수 없습니다." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "No more revisions found." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "No previous version." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "No reference found" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "철자 교정 하지 않음" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "상태 캐시를 사용하지 않으며, 버전관리 대상인 폴더만 아이콘 오버레이가 표시됩니다." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "유의어 추천을 하지 않습니다." -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "No working directory found." @@ -6893,11 +6998,11 @@ msgstr "No working directory found." msgid "Node size" msgstr "Node size" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "없음" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "보통" @@ -6909,30 +7014,30 @@ msgstr "Normal &SVN Commit" msgid "North European" msgstr "North European" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "관리하지 않는 파일" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Not all files could be downloaded and verified." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "일부 레지스트리(혹은 INI파일)이 삭제되지 않았습니다." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "명령을 수행하기에 메모리가 충분하지 않습니다." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "메모리가 부족합니다!\n노드를 접거나 확대 비율을 줄여서\n리비전 그래프의 사이즈를 줄이도록 하십시오." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Not patches generated." @@ -6940,7 +7045,7 @@ msgstr "Not patches generated." msgid "Note node" msgstr "Note node" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6959,26 +7064,26 @@ msgstr "주의: 폴더가 버전관리되지 않는 아이템들을 포함하고 msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "주의: 이 설정은 TortoiseGit뿐만 아니라 다른 Tortoise클라이언트에도 적용됩니다!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notes" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "재배치할 필요가 없습니다\r\n%s가 %s와 같습니다" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "재배치할 필요가 없습니다" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "커밋할 것이 없습니다" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "주의" @@ -6986,7 +7091,7 @@ msgstr "주의" msgid "Number Commits" msgstr "Number Commits" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "%s의 수" @@ -6999,7 +7104,7 @@ msgstr "작성자 수:" msgid "Number of characters required for moved or copied line detection:" msgstr "옮겼거나 복사한 줄로 간주하기 위한 글자 수:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7071,41 +7176,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "확인" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "OLE 초기화를 못 했습니다. OLE 라이브러리의 버전을 확인해주세요." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "오피스 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "오피스 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "오피스 2007 색상" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "오피스 XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "이전 해시" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "이전 메시지" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Older commit time" @@ -7113,15 +7218,15 @@ msgstr "Older commit time" msgid "Older lines" msgstr "오래된 행" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "On demand" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "하나 이상의 자동으로 저장된 문서를 찾았습니다." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "한 개 이상의 파일이 충돌 상태입니다." @@ -7133,29 +7238,29 @@ msgstr "Only Current Branch" msgid "Only Local Branches" msgstr "로컬 분기만" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Only Merged Files" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "파일에 대해서만 적용" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "숫자만 허용됩니다!\n(숫자는 쉼표로 분리되어 나열될 수 있습니다)" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "이 아이템에만 적용" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "열기" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7165,51 +7270,52 @@ msgstr "Open an existing document\nOpen" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "패치를 적용하거나 보여줄 파일 열기\n파일 열기" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "클립보드로부터 열기" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "이미지 파일 열기..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "상위 폴더 열기" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "이 문서 열기" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "다른 프로그램으로 열기..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "도움말 열기\n도움말 주제" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Opens the Reference Browser dialog." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Opens the repository browser" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "옵션" @@ -7218,30 +7324,30 @@ msgid "Options" msgstr "옵션" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "원본 크기(&G)" +msgid "Ori&ginal size\tS" +msgstr "원본 크기(&G)\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "저장소 이름" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "다른 작업 창" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "기타" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "보낼 변경사항" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "보낼 커밋" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "메모리 부족." @@ -7249,7 +7355,7 @@ msgstr "메모리 부족." msgid "Output Directory" msgstr "저장할 폴더" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7257,20 +7363,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "브랜치가 이미 있으면 덮어쓰기" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "덮어쓰기" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "페이지 %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7281,15 +7391,15 @@ msgstr "페이지 %u\n페이지 %u-%u\n" msgid "Page :" msgstr "페이지 :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Pane 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Pane 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "파라메터들" @@ -7297,25 +7407,25 @@ msgstr "파라메터들" msgid "Parameters:" msgstr "파라메터들:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "상위 %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "부모 %d가 없습니다" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "부모 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "부모 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "부모" @@ -7327,39 +7437,39 @@ msgstr "Part of code come from TortoiseSVN Blame" msgid "Password" msgstr "암호" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "암호:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "붙여넣기" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "최근 메시지 붙여넣기..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "붙여넣기 툴\n붙여넣기" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "바뀐 파일 이름 붙이기" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Paste last commit message" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "클립보드에 있는 이동(잘라내기) 혹은 복사의 결과인 SVN 경로를 붙여넣습니다." -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Patch" @@ -7375,32 +7485,32 @@ msgstr "선택된 아이템 패치(&S)" msgid "Patch As Attachment" msgstr "첨부파일로 패치 보내기" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "모든 파일들 패치" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "선택된 파일들 패치" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "패치 중" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Patching file '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "경로" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Path found that matches the patch better." @@ -7408,21 +7518,21 @@ msgstr "Path found that matches the patch better." msgid "Path:" msgstr "경로:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "경로" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "연필\n연필" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "작성자 퍼센트" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "퍼센트" @@ -7430,24 +7540,24 @@ msgstr "퍼센트" msgid "Personalized Menus and Toolbars" msgstr "개인화된 메뉴와 툴바" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Pick" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Pick up %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7457,56 +7567,56 @@ msgstr "그림 (메타 파일)\n그림" msgid "Picture:" msgstr "그림:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "사진 파일 (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|모든 파일 (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "사진 파일 (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|모든 파일 (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "파이 그래프" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "실행할 훅 스크립트를 넣으세요" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "훅 스크립트가 적용될 경로를 입력하세요" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "훅 종류를 선택하십시오." -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "분기를 선택하십시오" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "업스트림을 선택하십시오" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "건너뛴 커밋을 보십시오" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "취소 중입니다. 잠시 기다려주십시오..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "차이를 구하는 동안 잠시 기다려주십시오..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "잠시 기다려주십시오..." @@ -7522,11 +7632,11 @@ msgstr "포트 :" msgid "Port:" msgstr "포트:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "커밋 후 확인 훅" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Post-Push Hook" @@ -7534,23 +7644,23 @@ msgstr "Post-Push Hook" msgid "Pre&v Page" msgstr "이전 페이지(&V)" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "커밋 전 확인 훅" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Pre-Push Hook" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "커밋 준비 중..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Prepend right block" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Prepend this block to left" @@ -7562,11 +7672,11 @@ msgstr "새로운 단축키를 누르십시오(&N):" msgid "Press &new shortcut key:" msgstr "새로운 단축키를 누르십시오(&N):" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "미리보기" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "패치된 파일 미리보기" @@ -7578,51 +7688,51 @@ msgstr "미리보기:" msgid "Previous" msgstr "Previous" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "이전 페이지\n이전 페이지" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "이전 버전" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "이전 충돌 지점" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "이전 차이점" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "이전 줄단위 차이점" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "인쇄" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "문서 프린트하기\n프린트하기(&P)" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Print the active document using current options\nQuick Print" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Print the active document\nPrint" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "파일로 인쇄하기" @@ -7630,7 +7740,7 @@ msgstr "파일로 인쇄하기" msgid "Printer :" msgstr "프린터 :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "프린터 파일 (*.prn)|*.prn|모든 파일 (*.*)|*.*||" @@ -7638,11 +7748,11 @@ msgstr "프린터 파일 (*.prn)|*.prn|모든 파일 (*.*)|*.*||" msgid "Printing" msgstr "프린팅" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "프로그램" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "프로그램 (*.exe)|*.exe|모든 파일들 (*.*)|*.*||" @@ -7650,11 +7760,11 @@ msgstr "프로그램 (*.exe)|*.exe|모든 파일들 (*.*)|*.*||" msgid "Progress" msgstr "진행" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "프로젝트" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "속성" @@ -7662,7 +7772,7 @@ msgstr "속성" msgid "Property Page" msgstr "속성 페이지" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "공급자" @@ -7694,15 +7804,15 @@ msgstr "제거" msgid "Prune (All remotes)" msgstr "제거 (모두 원격)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "가져와 병합하기" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Pull requires the selected local branch to be the current branch." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "가져와 병합하기..." @@ -7710,19 +7820,19 @@ msgstr "가져와 병합하기..." msgid "Pull/Fetch" msgstr "가져오기/병합" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Pulled Diff" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Pulled Log" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "푸시(&H)" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "푸시" @@ -7738,11 +7848,11 @@ msgstr "URL 입력:" msgid "Push notes" msgstr "Push notes" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "꼬리표 푸시(&G)" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "푸시..." @@ -7750,22 +7860,22 @@ msgstr "푸시..." msgid "Putty Key:" msgstr "Putty 키:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty 개인 키(*.ppk)|*.ppk|모든 파일 (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "응용프르그램을 종료하십시오.\n종료" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7783,11 +7893,15 @@ msgstr "램 드라이브(&A)" msgid "R&eset" msgstr "리셋(&E)" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "이 리비전으로 되돌림(&E)" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "REBASE" @@ -7795,7 +7909,7 @@ msgstr "REBASE" msgid "Randomize Sync Dialog startup position" msgstr "동기화 대화상자 위치를 랜덤으로 합니다" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7817,7 +7931,7 @@ msgstr "Re&mote:" msgid "Re&movable drives" msgstr "이동식 디스크(&M)" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "이름 바꾸기(&N)..." @@ -7833,15 +7947,15 @@ msgstr "모두 리셋(&S)" msgid "Re&store defaults" msgstr "기본값으로 복원(&S)" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "되돌리기(&V)..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Reachable" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Daily Use Guide 읽기" @@ -7849,21 +7963,21 @@ msgstr "Daily Use Guide 읽기" msgid "Rebase" msgstr "재배치" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "\"%s\"를 여기에 재배치..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "재배치..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "재배치 중... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "최근" @@ -7875,21 +7989,21 @@ msgstr "최근 파일" msgid "Recently modified lines" msgstr "최근에 수정된 행" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "병합정보만 저장" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "자동으로 저장된 문서를 복구합니다.\n명시적으로 저장된 버전대신에 자동으로 저장된 버전을 엽니다." -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Recover to the status before rebase" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7903,17 +8017,21 @@ msgstr "서브모듈도 작업" msgid "Recursive" msgstr "하위에도 적용" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "취소시킨 이전 명령을 다시 수행합니다.\n다시 수행" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "아이콘으로 창을 최소화 시킵니다." -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "참조" @@ -7921,31 +8039,31 @@ msgstr "참조" msgid "Ref (Click it then go to)" msgstr "Ref (Click it then go to)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "참조 목록" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "RefBrowse" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "참조 기록" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "별명" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "새로고침" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Refreshing..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "정규식 필터" @@ -7957,7 +8075,7 @@ msgstr "필터 정규식" msgid "Regex:" msgstr "정규식:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7976,7 +8094,7 @@ msgid "" "\\s : whitespaces" msgstr "정규 표현식 필터:\r\n. : 임의의 문자\r\nc+ : 문자(c)한 개 이상\r\nc* : 문자(c)0개 이상\r\n^ : 문자열의 시작\r\n$ : 문자열의 끝\r\n(string){n} : 문자열(string) n번 반복\r\n(abcd) : 문자열 부분\r\n[aei0-9] : a,e,i 그리고 0..9 중 하나\r\n[^aei0-9] : a,e,i 그리고 0..9를 제외한 것 중 하나\r\n\r\n\\w : a-z,A-Z,0-9,_ 중 하나\r\n\\W : a-z,A-Z,0-9,_ 아닌 것 중 하나\r\n\\d : 숫자 0-9\r\n\\s : 공백문자" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "'%s'에 대해서 거부된 패치 조작들" @@ -7989,7 +8107,7 @@ msgstr "로그에 상대 시간 사용" msgid "Reload" msgstr "다시 읽기" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8023,19 +8141,19 @@ msgstr "Remote &tracking branch" msgid "Remote Branch" msgstr "원격 브랜치" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "Remote URL must not be empty." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Remote Update" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Remote name must not be empty." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "원격 상태" @@ -8047,12 +8165,12 @@ msgstr "원격:" msgid "Remove" msgstr "삭제" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "%ld 아이템을 삭제함" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "%s 삭제" @@ -8061,7 +8179,7 @@ msgstr "%s 삭제" msgid "Remove &all untracked files (-fx)" msgstr "버전관리하지 않는 모든 파일을 지우기 [-fx] (&A)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Remove &branch" @@ -8069,21 +8187,21 @@ msgstr "Remove &branch" msgid "Remove &non-ignored untracked files (-f)" msgstr "미관리 파일 중 무시목록에 없는 파일을 지우기 [-f] (&N)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "내부 주석의 변경으로 차이점이 표시되지 않으므로, 비교 작업을 하기 전에 모든 주석을 제거하십시오" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "무시 목록에서 제거(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "빠른 접근 툴바에서 제거하기" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "변경 리스트에서 제거" @@ -8095,7 +8213,7 @@ msgstr "무시목록에 있는 파일을 지우기 [-fX]" msgid "Remove untracked directories (-d)" msgstr "버전관리하지 않는 폴더를 지우기 [-d]" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Remove untracked files from the working tree, ..." @@ -8103,11 +8221,11 @@ msgstr "Remove untracked files from the working tree, ..." msgid "Removed" msgstr "삭제됨" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "변경 리스트에서 제거됨" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8115,7 +8233,7 @@ msgid "" "from the ignore list." msgstr "다음 파일 패턴\n%s\n(을)를 무시 목록에서 제거하였습니다." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "선택된 파일 또는 파일 마스크를 무시 목록에서 제거" @@ -8123,11 +8241,11 @@ msgstr "선택된 파일 또는 파일 마스크를 무시 목록에서 제거" msgid "Rena&me..." msgstr "이름 바꾸기(&M)..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "이름 바꾸기" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "%s 이름 바꾸기" @@ -8136,20 +8254,20 @@ msgstr "%s 이름 바꾸기" msgid "Rename - TortoiseGit" msgstr "이름 바꾸기 - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "\"%s\"의 이름 변경" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "이름변경/이동" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Renames files/folders inside version control" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8159,7 +8277,7 @@ msgstr "마지막 명령 반복수행\n반복" msgid "Replace &All" msgstr "모두 바꾸기(&A)" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8173,12 +8291,12 @@ msgstr "바꿀 내용:" msgid "Replace:" msgstr "바꾸기:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "%d 일치가 변경되었습니다" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "재배치" @@ -8202,11 +8320,11 @@ msgstr "Request pull" msgid "Requests a username and a password" msgstr "사용자 이름과 암호를 요구합니다" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "충돌 해결하기(&O)..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "재설정" @@ -8218,25 +8336,25 @@ msgstr "모두 리셋(&A)" msgid "Reset Type" msgstr "되돌릴 방법" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "\"%s\"를 여기로 재설정..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Reset active branch" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "열 리셋하기" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "지금 있는 \"%s\"를 다음으로 설정" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "충돌 해결하기" @@ -8244,126 +8362,122 @@ msgstr "충돌 해결하기" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "'작업 사본'의 내용으로 충돌 파일을 해결하기" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "'저장소'의 내용으로 충돌 파일을 해결하기" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "충돌 해결됨" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "충돌 해결됨:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "충돌 파일을 해결하기" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "재배치 재시작" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "복원" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "기본값으로 복원" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "커밋 후에 복원" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "윈도우를 보통 크기로 되돌리기" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "복구됨" -#. Resource IDs: (73) -msgid "Retry" -msgstr "재시도" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "2초 후에 재시도합니다..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "되돌리기" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Revert commit" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Revert commit %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Revert to parent revision" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Revert to revision %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "되돌림" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "마지막 업데이트 이후에 만들어진 모든 변경사항 되돌리기" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "버전 컨트롤에 추가된 사항 원상 복구" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Review Patch with TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Review/apply a unified diff file with TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Review/apply single &patch..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "리비전" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "리비전 %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "리비전 %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "리비전 그래프(&G)" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "이 리비전 파일" @@ -8379,31 +8493,31 @@ msgstr "리비전 그래프 필터" msgid "Revision graph" msgstr "리비전 그래프" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "리비전을 되돌렸습니다. 모든 변경사항이 작업 공간에 합쳐집니다." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "리비전:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Rewind" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "%d 되감기" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "리치 텍스트 (RTF)\n글꼴과 단락의 형태를 가지고 있는 텍스트" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "오른쪽: " @@ -8411,21 +8525,21 @@ msgstr "오른쪽: " msgid "Right image" msgstr "오른쪽 이미지" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "%d 행(전체 %d줄)" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "%d -%d행 (전체 %d줄)" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "행 아래로" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "행 위로" @@ -8433,11 +8547,11 @@ msgstr "행 위로" msgid "S&elect..." msgstr "선택하기(&E)..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "하나의 행에 버튼을 보여줍니다(&H)" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "두 개의 행에 버튼을 보여줍니다(&H)" @@ -8445,25 +8559,33 @@ msgstr "두 개의 행에 버튼을 보여줍니다(&H)" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "리본 아래에 빠른 접근 툴바 보여주기(&H)" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "통계(&T)" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "갈아타기/체크아웃(&W)..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8473,7 +8595,7 @@ msgstr "SMTP 서버 접속에 인증이 필요합니다" msgid "SMTP Server:" msgstr "SMTP 서버:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, 목적지 서버로 직접" @@ -8481,11 +8603,11 @@ msgstr "SMTP, 목적지 서버로 직접" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8493,19 +8615,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN Commit Type" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Fetch" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN 재배치" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN Rev" @@ -8517,15 +8639,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "같음" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Same commit time" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8543,35 +8665,39 @@ msgstr "" msgid "Sample text:" msgstr "견본:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "저장하기" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "다른 이름으로 저장(&A)..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "다른 이름으로 저장(&A)...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "다른 이름으로 저장" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Save Bottom File as\nYou're asked where to save the bottom file" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Save File" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Save Left File as\nYou're asked where to save the left file" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8579,13 +8705,13 @@ msgid "" "%s" msgstr "Save Left File\nThe modifications are saved to\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Save Right File as\nYou're asked where to save the right file" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8593,74 +8719,74 @@ msgid "" "%s" msgstr "Save Right File\nThe modifications are saved to\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "모두 저장\n두 파일 다 저장합니다" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "다른 이름으로 저장하기" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "다른 이름으로 저장..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Save as\nYou're asked where to save the file" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "변경된 것을 %1에 저장하시겠습니까?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Save modifications." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "이 리비전을 저장(&T)..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Save the active document with a new name\nSave As" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Save the active document\nSave" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8682,13 +8808,13 @@ msgstr "Save unified diff" msgid "Save unified diff since HEAD" msgstr "Save unified diff since HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Save\nSave the file with the conflict markers." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8700,12 +8826,12 @@ msgstr "Save\nThe modifications are saved to\n%s" msgid "Saved Data" msgstr "저장된 데이터" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Saving config failed (key: \"%s\", value: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Saving notes failed." @@ -8717,11 +8843,11 @@ msgstr "검사" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "왼쪽으로 스크롤하기" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "오른쪽으로 스크롤하기" @@ -8729,7 +8855,7 @@ msgstr "오른쪽으로 스크롤하기" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "로그 메시지 검색(&l)..." @@ -8741,20 +8867,20 @@ msgstr "위로 검색(&U)" msgid "Search for:" msgstr "찾을 대상:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "패치를 적용하기에 더 나은 경로를 찾는 중..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "%1 탐색 실패" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "선택하기" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "모두 선택(&A)" @@ -8770,59 +8896,59 @@ msgstr "컨텍스트 메뉴 선택하기(&C):" msgid "Select &window:" msgstr "윈도우 선택하기(&W):" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "색상 선택 툴\n색상 선택" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "파일 선택..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "SSH 클라이언트 선택" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "버튼을 선택하십시오." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "도움말을 보기 선택" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "변경 리스트 선택" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Diff 프로그램 선택" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "파일 선택" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "이 이슈 트래커와 연결할 폴더를 선택하십시오." -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "내보낼 폴더 선택.\n내보내기 전에 폴더를 새로 만들어야 할 수도 있습니다." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "스크립트를 수행할 폴더를 선택하세요" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "선택된 파일을 저장할 폴더를 선택하세요" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "훅 스크립트를 선택하세요" @@ -8830,20 +8956,20 @@ msgstr "훅 스크립트를 선택하세요" msgid "Select items automatically" msgstr "자동 선택" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "병합 프로그램 선택" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "병합 대상 선택" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "명령을 수행한 뒤 대화상자를 어떻게 할 것인지 선택합니다." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8855,15 +8981,19 @@ msgid "" "checker used for commit messages." msgstr "이 프로젝트에서 쓰는 언어를 선택해 주세요. 이 설정은 커밋 메시지 철자 검사를 할 때도 적용됩니다." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Diff 파일 보기 프로그램 선택" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Select what file you want to save as" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8873,7 +9003,7 @@ msgstr "Select what file you want to save as\nNote: There is unresolved conflict msgid "Select/deselect &all" msgstr "전체 선택/해제(&A)" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "기록 선택" @@ -8881,7 +9011,7 @@ msgstr "기록 선택" msgid "Send" msgstr "보내기" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "이메일 보내기" @@ -8889,11 +9019,11 @@ msgstr "이메일 보내기" msgid "Send Mail after create" msgstr "만든 다음 메일 보내기" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "에러 메시지를 메일로 보내십시오." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "메일 보내기..." @@ -8901,19 +9031,19 @@ msgstr "메일 보내기..." msgid "Send Patch" msgstr "패치 보내기" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "이메일로 패치 보내기" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "이메일로 패치 보내기" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "내용 전송" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "보내는 중..." @@ -8933,28 +9063,28 @@ msgstr "작성자 등록(&T)" msgid "Set author &date" msgstr "저자 날짜 설정(&d)" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Sets the remote as the \"pushremote\" for the selected local branch." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Sets the remote branch as the \"pushbranch\" for the selected local branch." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "속성 설정..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "설정" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "설정 - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "쉘" @@ -8962,7 +9092,7 @@ msgstr "쉘" msgid "Shell Extended" msgstr "쉘 확장" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "쉘 아이콘 캐시가 다시 생성되었습니다." @@ -8974,7 +9104,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "로그 메시지에 간략한 날짜/시간 형식 쓰기(&D)" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "짧은 속성 리스트" @@ -8986,7 +9116,7 @@ msgstr "보기" msgid "Show &Accelerator for:" msgstr "다음에 대한 바로가기키 보여주기(&A):" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "참조 기록 보기(&R)" @@ -8994,15 +9124,15 @@ msgstr "참조 기록 보기(&R)" msgid "Show &Unversioned Files" msgstr "관리하지 않는 파일 보기(&U)" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "전체 프로젝트 보기(&W)" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "변경내용 보기(&C)..." -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "로그 보기(&L)" @@ -9010,15 +9140,19 @@ msgstr "로그 보기(&L)" msgid "Show &log..." msgstr "로그 보기(&L)..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "탐색기에서만 오버레이와 컨텍스트 메뉴를 보입니다.(&O)" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "리본 위에 보이기" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "리본 아래에 보이기" @@ -9026,35 +9160,35 @@ msgstr "리본 아래에 보이기" msgid "Show Environment Variables" msgstr "환경 변수 보기" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "더 적은 버튼 보여주기" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "HEAD 리비전의 노드들을 보이기" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "단어 단위 비교를 보여줍니다\n라인내의 단어단위 비교" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Inline-Diff 보이기\nInline diff" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "더 많은 버튼 보여주기" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "리본 위에 빠른 접근 툴바 보여주기" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "리본 아래에 빠른 접근 툴바 보여주기" @@ -9062,11 +9196,11 @@ msgstr "리본 아래에 빠른 접근 툴바 보여주기" msgid "Show Screen&Tips on toolbars" msgstr "툴바에 스크린 팁 보여주기(&T)" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "공백 보기" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "그래프 전체에 대한 개관을 보여줌" @@ -9074,7 +9208,7 @@ msgstr "그래프 전체에 대한 개관을 보여줌" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9082,11 +9216,11 @@ msgstr "" msgid "Show author" msgstr "작성자 보기" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "이 커밋에 있는 브랜치 보기" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Unified diff 형식으로 차이점 보기(&U)" @@ -9106,15 +9240,15 @@ msgstr "날짜 보기" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Show destination folder" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Show diff" @@ -9126,11 +9260,15 @@ msgstr "수정할 커밋에 대한 차이점 보기" msgid "Show excluded folders as normal" msgstr "제외된 폴더를 일반 상태로 표시" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "짧은 지연후에 전체 메뉴를 보여줍니다(&U)" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "파일 이름 표시" @@ -9146,7 +9284,7 @@ msgstr "무시하는 파일도 보기(&G)" msgid "Show ignore local changes flagged files" msgstr "로컬 변경 플래그된 파일 무시 표시" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "이름이 붙은 커밋만 보기(&B)" @@ -9154,90 +9292,90 @@ msgstr "이름이 붙은 커밋만 보기(&B)" msgid "Show linenumber&s" msgstr "줄 번호 보기(&S)" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "로그 보기" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Show log &before rename/copy" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Show log of %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "서브모듈 로그 보기" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "이 폴더 로그 보기" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "로그 보기..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "작업 공간에서 수정된 파일 보기" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Show next change of selected commit\nShow next" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "오래된 노드를 맨 위에 출력" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "라인 비교 바 보이기/숨기기\n라인 비교 바 토글" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "위치 바 보이기/숨기기\n위치 바 토글" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Show or hide the status bar\nToggle Status Bar" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "상태 표시줄 보기/숨기기\n상태 표시줄 토글" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "툴바 보기/숨기기\n툴바 토글" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "원래 줄 번호 표시" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Show previous change of selected commit\nShow previous" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "리비전 속성 보기" @@ -9245,7 +9383,7 @@ msgstr "리비전 속성 보기" msgid "Show shortcut &keys in ScreenTips" msgstr "스트린 팁에 단축키를 보여줍니다(&K)" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9255,7 +9393,7 @@ msgstr "공백이나 줄바꿈 특수기호를 표시\n공백 보이기" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "라벨에서 참조 이름 일부를 기호로 바꿔 보여줍니다" @@ -9267,45 +9405,43 @@ msgstr "수정 안 한 파일 보기(&M)" msgid "Show un&versioned files" msgstr "관리하지 않는 파일 보기(&V)" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "보기/숨기기" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "%1!d!개의 참조 중 %2!d!개 참조 선택" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "총 %ld개 리비전(%s에서 %s까지) - %ld개 리비전과 %ld개 파일을 선택했습니다\r\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "복사/꼬리표/브랜치를 그래프로 보기" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "작업 사본과 저장소에서 마지막 업데이트 후에 변경된 모든 파일들 보기" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "TortoiseGit 정보를 봅니다" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Shows reference log" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "명령 로그 파일을 메모장으로 보기" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Shows the log for the selected file/folder" @@ -9317,7 +9453,7 @@ msgstr "Si&gn" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Silver Style" @@ -9325,20 +9461,20 @@ msgstr "Silver Style" msgid "Since" msgstr "Since" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "크기" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "생략" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Skip Patch: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "처리 안 함" @@ -9346,23 +9482,23 @@ msgstr "처리 안 함" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "처리 안 함 (TortoiseSVN의 \"잠김\" 아이콘)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "넘김" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "없는 개체는 건너뜀" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "슬라이드" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "스마트 탭 문자" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Soft" @@ -9370,13 +9506,13 @@ msgstr "Soft" msgid "Soft: Leave working tree and index untouched" msgstr "약하게: 작업 공간과 관리 영역을 그대로 남겨둠" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "TortoiseGitMerge외의 프로그램이 일부 파일을 바꿨습니다.\n변경사항을 불러오겠습니까?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9390,7 +9526,7 @@ msgstr "커밋 개수에 따라 정렬" msgid "Sort tag list in reversed order" msgstr "역순 순서로 태그 목록 정렬" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9400,49 +9536,53 @@ msgstr "사용된 로그는 저장되며, 몇 개까지 저장할 것인지를 msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "행을 분리함" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "활성화된 창을 두 개로 나누기\n분리" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Squash" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "누적 막대 그래프" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "누적 꺾은 선 그래프" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "표준" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "시작 (FastFwd)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Start Cherry Pick" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "커밋 시작 훅" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "재배치 시작" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Start bisect mode..." @@ -9450,7 +9590,7 @@ msgstr "Start bisect mode..." msgid "Start registry editor" msgstr "레지스트리 편집기 실행" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Starts a git server running git protocol" @@ -9462,39 +9602,47 @@ msgstr "임시 보관" msgid "Stash &Message" msgstr "임시 보관 메시지(&M)" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "임시 보관 적용" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "임시 보관 목록 보기" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "임시 보관 꺼내기 " -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "임시 보관" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "임시 보관소 작업 진행 중..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Static" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "통계정보" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "상태" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "상태 바 설정" @@ -9506,32 +9654,32 @@ msgstr "상태와 동작 색상" msgid "Status cache" msgstr "상태 캐시" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "한 폴더만 전체 상태를 캐싱하고 하위 항목을 반영한 오버레이를 표시합니다. " -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "파일변경을 감시하는 외부 프로세스에 상태 캐시를 저장하고,\r\n하위항목 상태도 반영해서 오버레이를 보여줄 수 있습니다." -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "재귀적이 아닌 하나의 디렉토리에 대한 상태를 캐시합니다." -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "이분검색 중지" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "방법" @@ -9539,15 +9687,15 @@ msgstr "방법" msgid "Strip lines starting with \"#\" in commit message" msgstr "커밋 메시지에서 \"#\"으로 시작하는 줄은 지우기" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "스타일" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "제목" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "제목:" @@ -9555,7 +9703,7 @@ msgstr "제목:" msgid "Submodule" msgstr "서브모듈" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "서브모듈 업데이트(&U)..." @@ -9563,7 +9711,7 @@ msgstr "서브모듈 업데이트(&U)..." msgid "Submodule Add" msgstr "서브모듈 추가" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "서브모듈 추가..." @@ -9571,15 +9719,15 @@ msgstr "서브모듈 추가..." msgid "Submodule Diff" msgstr "서브모듈 비교" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "서브모듈 초기화" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "서브모듈 동기화" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "서브모듈 업데이트" @@ -9587,7 +9735,7 @@ msgstr "서브모듈 업데이트" msgid "Submodule Update Options" msgstr "서브모듈 업데이트 옵션" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9602,15 +9750,15 @@ msgstr "" msgid "Submodules" msgstr "서브모듈" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "완료" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "스위치" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "%s에서 %s로 갈아탐, 리비전 %s" @@ -9619,43 +9767,43 @@ msgstr "%s에서 %s로 갈아탐, 리비전 %s" msgid "Switch To" msgstr "갈아타기" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "이전 윈도우로 전환\n이전 윈도우" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "1화면/2화면 전환" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "단일 또는 이중 윈도우로 보는 방식을 전환\n단일 또는 이중 윈도우로 보는 방식을 전환" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "좌/우 보기 전환" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "왼쪽과 오른쪽의 내용을 바꿉니다.\n왼쪽과 오른쪽 창을 바꿈" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "다음 문서창으로 전환" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "다음 윈도우로 전환\n다음 윈도우" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "이전 문서창으로 전환" @@ -9663,21 +9811,21 @@ msgstr "이전 문서창으로 전환" msgid "Switch/Checkout" msgstr "갈아타기/체크아웃" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "다음으로 갈아타기/체크아웃: " -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "이 버전으로 갈아타기/체크아웃..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Switch/Checkout working tree to another branch/tag" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "비교창의 좌<->우를 전환합니다" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9687,23 +9835,23 @@ msgstr "참조 이름에 기호 사용" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Sync Remote Repositories, including pull, push, email patch and so on" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "동기화..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "시스템" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9713,13 +9861,13 @@ msgstr "레지스트리 영역을 모두 삭제하였으며, INI 파일을 제 msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9733,7 +9881,7 @@ msgstr "탭 플레이스홀더" msgid "Tab size:" msgstr "탭 크기:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "꼬리표" @@ -9741,16 +9889,16 @@ msgstr "꼬리표" msgid "Tag (FF)" msgstr "Tag (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "꼬리표 정보" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Tagged the working tree to %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "꼬리표" @@ -9758,11 +9906,11 @@ msgstr "꼬리표" msgid "Tags:" msgstr "꼬리표:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "작업들" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "작업 창" @@ -9774,11 +9922,11 @@ msgstr "임시 파일 (그라바타 이미지 포함)" msgid "Test" msgstr "테스트" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "시험용" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9786,13 +9934,19 @@ msgstr "" msgid "Thai" msgstr "태국어" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "The Remote Config was changed.\nDo you want to save now or discard changes?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9800,64 +9954,78 @@ msgid "" "Do you really want to delete it?" msgstr "The branch \"%s\" is a remote branch.\n\nDo you really want to delete it?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "chunk 크기가 추가/제거된 줄 수와 일치하지 않습니다." -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "The commit message must not be empty." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "The credential helper URL \"%s\" already exists.\nDo you want to overwrite it?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "The credential helper was changed.\nDo you want to save now or discard changes?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "작업 공간이 깨끗하지 않습니다.\n변경 사항을 임시 보관하겠습니까?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "차이점을 찾는 엔진에서 오류가 발생하였습니다.\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "The entered source ref is ambiguous.\nYou have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "존재하지 않는 파일: %s" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "패치 파일에 없는 파일입니다.: %s" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "The file \"%s\" does not exist in your working tree.\nDo you want to select another file to diff?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9866,15 +10034,15 @@ msgid "" "Do you want to remove the file?" msgstr "삭제 시도하는 파일\n%s\n이/가 비어 있습니다\n파일을 삭제하시겠습니까?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "너무 커서 열 수 없습니다." -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "너무 커서 열 수 없습니다." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9882,7 +10050,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "이미 존재하는 파일입니다!\n%s\n덮어 쓰시겠습니까?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9890,14 +10058,14 @@ msgid "" "is not a valid text file!" msgstr "파일\n%s\n는(은) 유효한 텍스트 파일이 아닙니다." -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "%s 폴더는\n버전관리 대상이 아니거나 수정된 파일을 포함합니다. 정말 지우시겠습니까?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9906,78 +10074,78 @@ msgid "" "Would you like to create it first?" msgstr "존재하지 않는 폴더:\n%s 만드시겠습니까?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "훅 스크립트가 오류를 반환하였습니다:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "이미지를 볼 수 없습니다." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "이슈 트래커 프로바이더를 만들 수 없습니다. 정상적으로 설치되었는지 체크하십시오." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "이슈 트래커 공급자가 문자열 인자가 유효한지 확인하기 위해 비활성화되었습니다." -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "새 파일을 지시하는 곳은 %d 행 입니다." -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "줄 번호는 %d ~ %d 사이에 있어야 합니다" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "로컬 브랜치 \"%s\"가 원격 브랜치 \"%s\"의 최신 판에서 갈라지지 않았습니다." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "The local branch name and the remote branch name are empty.\nContinue?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "The local branch/tag name is empty. This results in a remote removal.\r\nContinue?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "명령 로그를 저장할 최대 개수\n가장 오래된 것부터 파일에서 제거 됩니다." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "명령이 실패하였습니다" -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "파라미터 '/path' 와 '/pathfile' 는 동시에 사용할 수 없습니다.\n둘 중 하나만 사용하세요." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "The patch does not apply cleanly to %s and no version information is given.\nPatching is not possible!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9987,7 +10155,7 @@ msgid "" "do not match!" msgstr "The patch seems outdated! The file line\n%s\nand the patchline\n%s\ndo not match!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9998,7 +10166,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "The path/URL you've entered seems to be illegal on Windows!\nYou can try it anyway, but you might get an error later.\n\nA valid path on windows must not contain '<<>|\"?*:' or one of the following device names:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nDo you want to proceed anyway?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -10009,36 +10177,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "The path\n%s\nseems not to match the paths in the patchfile.\nBut TortoiseGitMerge found the path\n%s\nmatches it better. Do you want to use the suggested path instead?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "프로세스가 아직 실행중입니다.\n중단하시겠습니까?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "정규 표현식이 유효하지 않습니다!\n유효한 정규 표현식을 입력해 주십시오." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "The remote \"%s\" already exists.\nDo you want to overwrite it?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "The repository was successfully created." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "선택된 파일에 아직도 충돌 표시가 있습니다.\n강제로 해결되었다는 표시를 하겠습니까?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10046,7 +10221,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "The submodule \"%s\" is dirty.\nMerely committing the superproject cannot track or save such changes to the submodule.\nCommit the submodule now or ignore dirty changes?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10055,7 +10230,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10064,26 +10239,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "The target folder \n%s\nis not empty!\nAre you sure you want to initialize a git repository inside that folder?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "선택한 파일들을 분석하는 시간을 설정합니다.\r\n작은 값일 수록 자동완성 목록이 바로 만들어지지만,\r\n모든 파일을 검사하지 않을 수 있습니다." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "선택된 두 URL은 같은 루트로부터 생성된것이 아닙니다.\n둘 간의 로그를 보는 것은 불가능합니다." -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10093,34 +10268,34 @@ msgstr "" msgid "Their file:" msgstr "저장소 파일:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "저장소" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "There are changes or unversioned items inside one or more submodule.\nThose files are not listed for commit. You need to commit those files in submodule" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "현재, Tortoise에서 사용하는 것들을 제외하면 %d개의 오버레이 핸들러가 있습니다." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "There are more editable views.\nWhat view do you want to save?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "이용 가능한 이슈 트래커 공급자가 없습니다." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10129,85 +10304,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "%d 행에 아직 해결되지 않은 충돌이 발생 하였습니다.\n저장하기 전에 먼저 해결해야합니다.\n만약 충돌한 것을 그대로 유지하여 저장하고 싶으면\n'확인'을 누르고, 다른 에디터를 사용하여 수동으로 해결해야합니다." -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "바뀐 내용이 저장되지 않았습니다.\n저장하시겠습니까?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "There is nothing to add. All the files and folders are either under version control, have been ignored or the global ignore configuration setting." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "색인" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "이 문서는 최근에 열린 문서보다 더 최근에 저장되었습니다. 그리고 프로그램이 닫히기 전에 만들어진 변경사항을 포함하고 있습니다." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "This field is required and must not be empty." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "유효한 URL이 아닙니다.\n올바른 URL을 입력하세요." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "This is not a valid path!\nA valid path must not contain '<<>|\"?*:' or one of the following device names:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "This program is linked to the missing export %s in the file %s. This machine may have an incompatible version of %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "프로그램을 실행하는 데 필요한 파일을 못 찾았습니다: %s" -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "이 속성은 폴더에만 적용되며, 파일에는 적용되지 않습니다." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "작업을 하기 전에 작업 공간을 깨끗이 해 주세요." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "이 프로그램에서 사용한 명령을 저장한 것을 삭제하고 메뉴와 툴바에서 보이는 명령을 기본 값으로 되돌립니다. 명시적으로 설정한 것을 되돌리지는 않습니다. 정말로 수행하겠습니까?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Three way diff" @@ -10223,14 +10398,14 @@ msgstr "수평으로 붙이기(&Z)" msgid "To" msgstr "To" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "To avoid fetching wrong tags, if this is not an official remote,\nyou are advised to disable tag fetching for this remote.\nDisable tag fetching?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10242,13 +10417,13 @@ msgstr "" msgid "To:" msgstr "끝:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "하나/두개의 페이지 보기 토글하기\n하나/두개의 페이지 보기 토글하기" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "필터 전환" @@ -10260,11 +10435,11 @@ msgstr "툴바" msgid "Toolbar Name" msgstr "툴바 이름" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "툴바 옵션" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "툴바 내부 에러. 어플리케이션 제조자에게 연락하십시오." @@ -10280,16 +10455,16 @@ msgstr "도구" msgid "Tools:" msgstr "도구:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" -msgstr "TortoiseGit %d.%d.%d, 빌드 %d - %s, %s" +msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10299,20 +10474,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\nThe commit dialog cannot handle this.\n\nDo you want to remove it from the index?" +"Do you want to restore or remove it from the index?" +msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit has detected similar filenames. Do you want the files:%s\nto be renamed too?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit은 다음 오버레이를 보여주지 않습니다: %s" @@ -10321,18 +10496,18 @@ msgstr "TortoiseGit은 다음 오버레이를 보여주지 않습니다: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot switch to another repository (\"%s\") at runtime." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10348,7 +10523,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10356,7 +10531,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10370,16 +10545,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10388,18 +10563,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears more than once." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10438,11 +10613,11 @@ msgstr "Track" msgid "Tracked Remote Branch:" msgstr "Tracked Remote Branch:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "전송 중 %s" @@ -10451,39 +10626,35 @@ msgstr "전송 중 %s" msgid "Transparent &color..." msgstr "투명색(&C)..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Trim right" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "'정리' 하십시오. 정리되지 않는다면 깨끗이 다시 체크아웃하셔야합니다." -#. Resource IDs: (73) -msgid "Try again" -msgstr "다시 시도하십시오." - #. Resource IDs: (65535) msgid "Turkish" msgstr "터키어" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Tweak TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "종류" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Type:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL 및 디렉터리는 비워 둘 수 없습니다." @@ -10507,24 +10678,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "메일 시스템 지원을 읽을 수 없습니다." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "명령을 진행할 수 없습니다. 서버가 바쁩니다." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "다른 사람이 열고 있어서 파일을 열 수 없습니다: %1" -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "쓰기전용 속성이라 읽을 수 없습니다." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10532,91 +10703,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Unable to reconstruct working tree path!\nThis can happen if the file has been renamed.\nPlease start the log dialog on this specific file alone and then revert the changes\nfrom the top pane in the log dialog." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "읽기전용 속성이라 쓸 수 없습니다." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "읽기전용 속성이거나 다른 사람이 열고 있어서 %1에 쓸 수 없습니다." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "선택 해제" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "실행취소" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "%d 액션 되돌리기" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "1 액션 되돌리기" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Undo Add..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Undo the last action\nUndo" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "마지막 수정 사항 되돌리기\n되돌리기" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "기타 파일 형식" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "펼치기" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "포매팅되지 않은 텍스트\n포매팅 정보가 없는 텍스트" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "HEAD 리비전에 대한 Unified diff 보기 (&D)" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "알 수 없음" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "알 수 없는 깊이" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Unresolved conflicts!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "제목 없음" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "버전관리아님" @@ -10624,7 +10799,7 @@ msgstr "버전관리아님" msgid "Unversioned files mark parent folder as modified" msgstr "버전관리 대상이 아닌 파일들이 있으면 상위 폴더를 수정된 것으로 표시합니다." -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Unversioning %s" @@ -10637,23 +10812,23 @@ msgstr "위로" msgid "Update" msgstr "업데이트" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Update Ref" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "서브모듈 업데이트" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "업데이트 됨" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "ActiveX 객체 업데이트" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "관리목록 갱신 중" @@ -10665,30 +10840,26 @@ msgstr "기본 이미지 사용하기(&D):" msgid "Use &one-pane view as default for 2-file diff" msgstr "두 파일 비교시 기본값으로 같은 창으로 비교(&O)" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "다른 텍스트 블록 사용(&o)" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "'mine' 텍스트 블럭을 사용" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "'mine'→'theirs'의 순서로 텍스트 블럭을 사용" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "'theirs' 테스트 블럭을 사용" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "'theirs'→'mine'의 순서로 텍스트 블럭을 사용" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "블럭 사용" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Use HTTP path component" @@ -10709,15 +10880,15 @@ msgstr "최소한의 데이터만 전달(느린 네트워크 용도) (&P)" msgid "Use Unified Diff from &clipboard" msgstr "클립보드로부터 Unified diff를 사용(&C)" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Use a different name or use the \"Force\" option to overwrite it." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Use a different name or use the \"Override branch\" option." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10727,7 +10898,7 @@ msgstr "왼쪽 창의 모든 내용을 사용합니다.\n왼쪽 파일 사용" msgid "Use block from left before right" msgstr "오른쪽 전에 왼쪽의 블럭을 사용합니다." -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10737,25 +10908,25 @@ msgstr "오른쪽 창의 블럭 전에 왼쪽 창의 블럭을 사용합니다.\ msgid "Use block from right before left" msgstr "왼쪽 전에 오른쪽 블럭을 사용합니다." -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "왼쪽 창의 블럭 전에 오른쪽 창의 블럭을 사용합니다.\n왼쪽 전에 오른쪽 블럭을 사용" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "두 블럭 모두 사용 (이것을 원본으로 사용)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "두 블럭 모두 사용 (이것을 비교본으로 사용)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "왼쪽 블럭을 사용" @@ -10771,15 +10942,15 @@ msgstr "현재 브랜치에 로컬 브랜치 색상 쓰기" msgid "Use recycle bin when reverting" msgstr "되돌릴 때 휴지통 사용" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "정규표현식을 사용" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Use right block" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "" @@ -10787,61 +10958,61 @@ msgstr "" msgid "Use system locale for date/time" msgstr "날짜/시간을 위해 시스템 국가설정을 사용" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "'작업 사본'의 텍스트 블럭 사용(&M)" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "'저장소'의 텍스트 블럭 사용(&T)" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "'저장소' 텍스트를 사용하기 전에 '작업사본'의 텍스트 블럭 사용(&I)" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "'저장소'의 텍스트를 사용하기 전에 '작업사본'의 텍스트 블럭 사용\n'작업사본'의 텍스트 사용 후에 '저장소'의 텍스트를 사용" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "'작업 사본'의 텍스트 블럭 사용\n'작업 사본'의 텍스트 블럭 사용" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "'작업 사본' 텍스트를 사용하기 전에 '저장소'의 텍스트 블럭을 사용(&H)" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "'작업 사본' 텍스트를 사용하기 전에 '저장소'의 텍스트 블럭 사용\n'저장소'의 텍스트 블럭을 사용후에 '작업 사본'의 텍스트를 사용" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "'저장소'의 텍스트 블럭 사용\n'저장소'의 텍스트 블럭 사용" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "왼쪽 창의 텍스트 블럭을 사용합니다.\n왼쪽 블럭 사용" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "이 텍스트 블록 사용(&i)" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10849,7 +11020,7 @@ msgid "" "%s" msgstr "Use the found path.\nApply the patch to\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10861,19 +11032,19 @@ msgstr "Use the original path.\nApply the patch to\n%s" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "전체파일 사용(&W)" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Use this block on left" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "전체파일 사용(&F)" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Used to amend the tip of the current branch." @@ -10889,11 +11060,11 @@ msgstr "사용자 정보" msgid "User Name:" msgstr "사용자 이름:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "사용자가 취소함" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10903,11 +11074,11 @@ msgstr "User name and email must be set before commit.\r\n Do you want to set th msgid "User&name:" msgstr "계정이름(&N):" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "사용자명:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10926,7 +11097,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "값" @@ -10934,24 +11105,24 @@ msgstr "값" msgid "Version" msgstr "버전" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "버전 %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Version 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Version 1 (Newer commit time)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Version 2 (Base)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Version 2 (Base) (Newer commit time)" @@ -10959,11 +11130,11 @@ msgstr "Version 2 (Base) (Newer commit time)" msgid "Version Information" msgstr "버전 정보" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "버전:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "버전관리됨" @@ -10975,23 +11146,27 @@ msgstr "베트남어" msgid "View" msgstr "표시" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr ".tgitconfig 보기" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "패치 보기" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "패치 데이터 보기>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "웹 브라우저에서 해당 경로의 리비전 보기(&W)" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "이 리비전을 다른 편집기로 보기" @@ -11003,11 +11178,11 @@ msgstr "시스템 전역 gitconfig 보기(&W)" msgid "Visit our website" msgstr "웹 사이트 방문" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11018,7 +11193,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "경고:\r\n무엇을 하는지 절대적으로 확신할 수 있는 경우에만, 이 설정을 변경하십시오!\r\n기본값으로 되돌리려면 값을 삭제하십시오." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "대기" @@ -11026,7 +11201,7 @@ msgstr "대기" msgid "Wait for the script to finish" msgstr "스크립트가 끝날 때까지 기다리세요" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "입력을 기다리고 있습니다." @@ -11034,15 +11209,15 @@ msgstr "입력을 기다리고 있습니다." msgid "Walk Be&haviour" msgstr "보기 방법(&H)" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "경고" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "경고!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11050,7 +11225,7 @@ msgid "" "Do you really want to continue?" msgstr "경고: \"%s\"를 완전히 삭제합니다. 복구할 수 없게 됩니다.\r\n\r\nDo you really want to continue?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "웹" @@ -11058,56 +11233,56 @@ msgstr "웹" msgid "Western European" msgstr "유럽 서부" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "활성화하면 깃 저장소가 아닌 폴더에서는 시프트+우클릭으로 TortoiseGit 컨텍스트 메뉴를 볼 수 있습니다." -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "When applying a patch, ignore changes in whitespace in context lines if necessary" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "git 작업 진행 대화상자를 닫을 때 한 번 더 닫을지 물어봅니다." -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "활성화하면 TortoiseGit 이동 컨텍스트 메뉴가 파일이나 폴더를 우클릭 드래그 했을 때 나타납니다." -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "체크해두면 버전관리 중인 파일은 커밋 대화상자에서 알아서 선택합니다" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "When the patch does not apply cleanly, fall back on 3-way merge if the patch records the identity of blobs it is supposed to apply to and we have those blobs available locally." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "URL을 입력할 때, 원격 이름이 비어있는 경우, 원격 이름으로 \"origin\"이 자동으로 채워집니다." -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11117,15 +11292,15 @@ msgid "" "authentication and/or encryption." msgstr "저장소를 공개하면 인증이나 암호화없이 아무나 저장소의 모든 자료를 볼 수 있습니다." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "공백문자" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "윈도우 위치" @@ -11133,15 +11308,15 @@ msgstr "윈도우 위치" msgid "Windows" msgstr "윈도우" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11185,11 +11360,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "파일 안에서:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "파일 안에서" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "작업 공간 변경사항 비교" @@ -11197,29 +11372,25 @@ msgstr "작업 공간 변경사항 비교" msgid "Working Tree Path:" msgstr "작업 공간 경로:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "작업 공간 변경항목" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "긴 줄 보호" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "오른쪽 경계를 넘어가는 긴 줄을 줄 바꿈 하기\n긴 줄 보호" -#. Resource IDs: (73) -msgid "Yes" -msgstr "예" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "모두 예" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "이미 최신버전입니다." @@ -11229,51 +11400,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "여기에서 특정 오버레이 핸들러를 비활성화시킬 수 있습니다.\n비활성화된 핸들러는 오버레이 슬롯에서 사용되지 않을 것이며 오버레이를 보여줄 기회를 다른 쉘 확장에게 넘겨줍니다." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "단지 크기가 (%d x %d)인 비트맵만 붙여 넣을 수 있습니다!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "사용자 정의 툴바를 %d개 이상 생성할 수 없습니다!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "속성을 폴더아닌 파일에만 설정할 수 있습니다.\n폴더안의 모든 파일에 설정하시려면,\n재귀적으로 적용하도록 설정해야합니다." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "You cannot change the type of this ref with a rename." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "\"미관리 대상도 포함\"을 선택했습니다.\n이건 \"git clean -fd\"를 실행하기 때문에 무시된 파일이나 폴더는 휴지통으로 가지 않고 삭제됩니다." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "저장하지 않은 속성들이 있습니다.\n지금 저장하시겠습니까?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11281,67 +11452,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "You have selected %d items to show the diff for.\nFor every of these items a new instance of the diff viewer will be started.\nDo you really want to show the diff for so many items at once?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "이슈번호를 입력하지 않았습니다!\n이슈번호 없이 커밋하시겠습니까?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "You haven't entered your Signed-Off-By line!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "You marked some files as \"Restore after commit\".\nDo you want to restore them now? You might lose all changes to this file after marking it." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "%d개의 툴까지 정의했을지도 모릅니다." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "You must enter a log message for the commit" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "시스템을 재시작 해야 변경사항이 적용됩니다." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "압축 파일의 이름을 반드시 선택해야 합니다." -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "폴더를 선택했습니다.\n압축 파일(zip)로 내보내기만 가능합니다." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "선택한 파일은 관리 대상이 아닙니다.\n이 파일은 커밋할 때 관리 대상으로 추가됩니다." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "텍스트를 입력해야 합니다!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "이미지를 선택해야 합니다!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "You've changed the icon set from %s to %s.\nThat change won't take effect until you restart your computer or logoff and logon again!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11351,7 +11522,7 @@ msgstr "방금 작성한 로그는 저장되었습니다.\n다시 삽입하시 msgid "Your version is:" msgstr "현재 설치된 버전:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "현재 설치된 버전: %d.%d.%d.%d" @@ -11361,10 +11532,10 @@ msgid "Zip File" msgstr "파일 압축" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "축소(&M)" +msgid "Zoo&m out\t-" +msgstr "축소(&M)\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "확대/축소" @@ -11376,80 +11547,80 @@ msgstr "확대(&I)" msgid "Zoom &Out" msgstr "축소(&O)" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "100%로 보기" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "크게 보기\n크게 보기" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "작게 보기\n작게 보기" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "확대(&N)" +msgid "Zoom i&n\t+" +msgstr "확대(&N)\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "확대" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "축소" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "화면에 맞춰 보기" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "높이에 맞추어서 확대" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "폭에 맞추어서 확대" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[기본]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[할당되지않음]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" is invalid." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" - 깃 저장소가 아닙니다" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11463,7 +11634,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "add \"cherry picked from\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "추가됨" @@ -11471,7 +11642,7 @@ msgstr "추가됨" msgid "added files" msgstr "추가된 파일" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "제목 없음" @@ -11479,14 +11650,19 @@ msgstr "제목 없음" msgid "and support the developers" msgstr "개발자 후원" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "변경사항 무시" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "작성자" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "based on TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11519,30 +11695,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "커밋" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "충돌" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copied from\r\n%s - revision %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "일" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "삭제됨" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11554,7 +11730,7 @@ msgstr "더미" msgid "eMail settings" msgstr "이메일 설정" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11563,16 +11739,16 @@ msgid "" "%s" msgstr "내보냄\n%s\n로\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "외부" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git did not exit cleanly (exit code %d)\n에러가 발생했습니다!!" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "무시됨" @@ -11580,15 +11756,15 @@ msgstr "무시됨" msgid "include &untracked" msgstr "미관리 대상도 포함" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "미완성" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "상속" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "작업사본에서 유지하는 아이템" @@ -11596,7 +11772,7 @@ msgstr "작업사본에서 유지하는 아이템" msgid "keep the file lists in English" msgstr "영어로 파일 목록 유지" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11605,7 +11781,7 @@ msgid "" "%s = %ld" msgstr "줄 수: %d(+) %d(-) 파일 수: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11620,11 +11796,11 @@ msgstr "줄 수: %d(+) %d(-) 파일 수: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\ msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "병합됨" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "빠진 것" @@ -11632,7 +11808,7 @@ msgstr "빠진 것" msgid "missing/deleted/replaced" msgstr "없앰/삭제함/대체함" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "수정됨" @@ -11640,7 +11816,7 @@ msgstr "수정됨" msgid "modified/copied" msgstr "수정함/복사함" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "월" @@ -11648,40 +11824,44 @@ msgstr "월" msgid "new branch" msgstr "새 브랜치" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "아니오" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "이 명령에 대한 설명이 없습니다." -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "버전관리 대상 아님" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "일반" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "not found" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "차단됨" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "%1 " -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "픽셀" @@ -11689,11 +11869,11 @@ msgstr "픽셀" msgid "possible or real conflict/obstructed" msgstr "충돌을 일으킬 수 있음/일으킴" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "분기" @@ -11701,35 +11881,35 @@ msgstr "분기" msgid "renamed" msgstr "이름을 바꿈" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "바뀜" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "경로 스캔 중:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "처리 안 함" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "전환됨:\r\n%s 로" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "take care of submodule changes" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "%1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "%s" @@ -11738,35 +11918,35 @@ msgstr "%s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "주" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - all Windows users" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - current Windows user" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - this repository only" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - current Windows user" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - this repository only" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "년" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "예" diff --git a/Languages/Tortoise_nl_NL.po b/Languages/Tortoise_nl_NL.po index 7a562c65a..a4d73fa64 100644 --- a/Languages/Tortoise_nl_NL.po +++ b/Languages/Tortoise_nl_NL.po @@ -24,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/tortoisegit/language/nl_NL/)\n" "MIME-Version: 1.0\n" @@ -35,7 +35,7 @@ msgstr "" "Language: nl_NL\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -57,138 +57,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# individueel getoonde auteurs:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB verstuurd" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 bevatte een onverwacht object." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 bevat een onjuist pad." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 bevat een onjuist schema." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 heeft een verkeerd formaat." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 is niet gevonden." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! dag geleden" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! dagen geleden" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! uur geleden" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! uren geleden" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! minuut geleden" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! maand geleden" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! maanden geleden" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! seconde geleden" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! seconden geleden" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! week geleden" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! weken geleden" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! jaar geleden" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! jaren geleden" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! items geselecteerd" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minuten geleden" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nEr worden %2!d! bestanden, %3!d! submodules en %4!d! mappen getoond, %5!d! items in totaal" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nGrootte %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nDoorgaan met uitvoeren van script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -196,52 +196,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nBestand niet gevonden.\nControleer of het juiste pad en bestandsnaam zijn opgegeven." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes verstuurd" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB verstuurd" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d commits vóór \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d bestanden gewijzigd" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d bestanden verwijderd." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d bestanden hersteld naar %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d bestanden geselecteerd, %d bestanden totaal" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d meest actieve auteur(s) met elk minstens %d vastleggingen (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -249,78 +249,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nclick om alpha te wissellen\ndubbelklik om alpha automatisch te wissellen" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minuten en %ld seconden" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld van %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - huidige revisie: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Herstelt]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s in %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s vereist Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, met %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Werkmap" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) van %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Export van %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nKon niet foutloos gepatched worden." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nWilt u het toch verwijderen?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -336,6 +336,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-weg samenvoeging" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "Over TortoiseGitBlame..." @@ -364,15 +368,15 @@ msgstr "Filter &toevoegen" msgid "&Add New/Save" msgstr "Voeg toe/Opsl&aan" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Toevoegen" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "Knoppen &toevoegen of verwijderen" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Toevoegen..." @@ -412,7 +416,7 @@ msgstr "&Toekennen" msgid "&Associate double-click event with:" msgstr "&Dubbelklik event toewijzen aan:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Automatisch Verbergen" @@ -428,15 +432,15 @@ msgstr "&Automatisch laden Putty key" msgid "&Backup original file" msgstr "&Maak reservekopie van origineel" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Annotatie" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Verklaar wijzigingen" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "Ver&klaar revisies" @@ -460,7 +464,7 @@ msgstr "&Branch:" msgid "&Browse Dir" msgstr "&Blader in Map" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Archief bekijken" @@ -496,7 +500,7 @@ msgstr "&Categorie:" msgid "&Choose commands from:" msgstr "Kies &commando's uit:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "Ops&chonen..." @@ -520,7 +524,7 @@ msgstr "&Sluit venster(s)" msgid "&Command:" msgstr "&Commando:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Vastleggen" @@ -528,23 +532,27 @@ msgstr "&Vastleggen" msgid "&Commit submodule..." msgstr "Submodule &committen..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Commit zonder" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Vastleggen..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "Ver&gelijk revisies" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "Ge&comprimeerde Grafiek" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopiëren" @@ -554,7 +562,7 @@ msgstr "&Beeld van kopiëerknop" #. Resource IDs: (57634) msgid "&Copy\tCtrl+C" -msgstr "&Kopiëren⇥Ctrl+C" +msgstr "&Kopiëren\tCtrl+C" #. Resource IDs: (1662) msgid "&Custom" @@ -564,11 +572,11 @@ msgstr "&Aangepast" msgid "&Default" msgstr "&Standaard" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Verwijderen" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Verwijderen (lokaal behouden)" @@ -576,7 +584,7 @@ msgstr "&Verwijderen (lokaal behouden)" msgid "&Delete Filter" msgstr "Filter verwij&deren" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "Verwij&der extern && lokaal" @@ -588,11 +596,11 @@ msgstr "&Detecteer verplaatste of gekopieerde regels" msgid "&Detect moved or copied lines:" msgstr "&Detecteer verplaatste of gekopieerde regels:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Verschil" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Vergelijk met vorige revisie" @@ -604,7 +612,7 @@ msgstr "&Map:" msgid "&Disabled" msgstr "Uitgeschakel&d" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "Onge&daan Maken" @@ -612,7 +620,7 @@ msgstr "Onge&daan Maken" msgid "&Do the same for the rest" msgstr "&Doe hetzelfde voor de rest" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Docking" @@ -620,11 +628,15 @@ msgstr "&Docking" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Omlaag" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Downloaden" @@ -632,11 +644,11 @@ msgstr "&Downloaden" msgid "&Edit" msgstr "Wijzig&en" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "B&ewerk .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "B&ewerk ALLES" @@ -644,7 +656,7 @@ msgstr "B&ewerk ALLES" msgid "&Edit Filter" msgstr "Filter B&ewerken" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Bewerk conflicten" @@ -669,10 +681,10 @@ msgid "&Enable edit" msgstr "B&ewerken inschakelen" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "E&xporteer selectie naar..." @@ -684,27 +696,27 @@ msgstr "&Extern" msgid "&File" msgstr "&Bestand" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Zoeken" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" -msgstr "&Zoeken⇥Ctrl+F" +msgstr "&Zoeken\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Pas afbeeldingen in venster" +msgid "&Fit images in window\tF" +msgstr "&Pas afbeeldingen in venster\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Vaste schijven" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Zwevend" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Volg hernoemingen" @@ -716,7 +728,7 @@ msgstr "&Lettertype voor logboek:" msgid "&Font:" msgstr "&Lettertype:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Forceer" @@ -734,9 +746,9 @@ msgstr "" #. Resource IDs: (220) msgid "&Go to\tCtrl+G" -msgstr "&Ga naar⇥Ctrl+G" +msgstr "&Ga naar\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -748,7 +760,7 @@ msgstr "&Groen:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Help" @@ -756,7 +768,7 @@ msgstr "&Help" msgid "&Help Topics" msgstr "Help &onderwerpen" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Verbergen" @@ -764,11 +776,11 @@ msgstr "&Verbergen" msgid "&Icon Set:" msgstr "&Pictogrammenset:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Negeren" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "%d zaken &negeren op naam" @@ -782,14 +794,14 @@ msgid "&Image" msgstr "&Afbeelding" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Afbeeldingsinformatie" +msgid "&Image info\tI" +msgstr "&Afbeeldingsinformatie\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Alleen afbeelding" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importeren..." @@ -801,7 +813,7 @@ msgstr "&Startmap:" msgid "&Initialize submodules (--init)" msgstr "&Initialiseer submodules (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Installeren" @@ -813,11 +825,11 @@ msgstr "&Spring naar eerste verschil bij het laden" msgid "&Keep CR" msgstr "&Behoud CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Behoudt huidige staat" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -845,7 +857,7 @@ msgstr "&Limiet:" msgid "&Line number" msgstr "&Regelnummer" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Regelnummer (%d - %d)" @@ -862,7 +874,7 @@ msgstr "&Lijstweergave" msgid "&Local Branch:" msgstr "&Lokale Branch:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Lokale branches" @@ -886,11 +898,11 @@ msgstr "&Menu-animaties:" msgid "&Menu contents:" msgstr "&Menu-inhoud:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Samenvoegen" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Samenvoegen..." @@ -946,6 +958,10 @@ msgstr "" msgid "&Next Page" msgstr "&Volgende pagina" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Geen dubbelklik event" @@ -962,11 +978,11 @@ msgstr "&Geen" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Een pagina" @@ -974,21 +990,17 @@ msgstr "&Een pagina" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Openen" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "Git voor Windows Website &Openen" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" -msgstr "&Openen...⇥Ctrl+O" +msgstr "&Openen...\tCtrl+O" #. Resource IDs: (1382) msgid "&Options" @@ -999,18 +1011,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "Afbeeldingen &overlappen" +msgid "&Overlay images\tO" +msgstr "Afbeeldingen &overlappen\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Wachtwoord:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Plakken" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Selecteer ALLES" @@ -1018,7 +1030,7 @@ msgstr "&Selecteer ALLES" msgid "&Port:" msgstr "&Poort:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Afdrukvoorbeeld" @@ -1026,11 +1038,15 @@ msgstr "&Afdrukvoorbeeld" msgid "&Print..." msgstr "&Afdrukken..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Afdrukken...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Doorgaan" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1038,10 +1054,14 @@ msgstr "" msgid "&Push all branches" msgstr "&Push alle branches" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "He&rcommitten" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Recente berichten" @@ -1054,7 +1074,7 @@ msgstr "&Recursief" msgid "&Red:" msgstr "&Rood:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Opnieuw" @@ -1070,7 +1090,7 @@ msgstr "&Vernieuwen" msgid "&Regular Expression" msgstr "&Reguliere Expressie" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1078,7 +1098,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "Exte&rne Branch:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "Exte&rne branches" @@ -1086,7 +1106,7 @@ msgstr "Exte&rne branches" msgid "&Remote:" msgstr "Exte&rn Archief:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Verwijderen" @@ -1098,7 +1118,7 @@ msgstr "Ve&rwijder dit bestand uit de index" msgid "&Replace" msgstr "Ve&rvangen" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "A&rchiefverkenner" @@ -1106,7 +1126,7 @@ msgstr "A&rchiefverkenner" msgid "&Reset" msgstr "&Herstellen" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Werkbalk herstellen" @@ -1122,23 +1142,27 @@ msgstr "&Wis mijn gebruiksdata" msgid "&Reset to Default" msgstr "&Standaard herstellen" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Opgelost" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "He&rstellen" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "He&rstel naar oude staat" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Maak wijziging van deze vastlegging ongedaan" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Maak wijzigingen van deze vastlegging ongedaan" @@ -1150,7 +1174,7 @@ msgstr "&SSH client:" msgid "&Saturation:" msgstr "&Verzadiging:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Opslaan" @@ -1158,15 +1182,19 @@ msgstr "&Opslaan" msgid "&Save authentication" msgstr "Authenticatie &opslaan" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Schema opslaan als..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Sla lijst van geselecteerde bestanden op in..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Opslaan\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Stel Git pad in" @@ -1174,7 +1202,7 @@ msgstr "&Stel Git pad in" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Instellingen" @@ -1194,7 +1222,7 @@ msgstr "&Toon tekstlabels" msgid "&Signing key ID:" msgstr "&Signeer sleutel ID:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "Over&slaan" @@ -1202,7 +1230,7 @@ msgstr "Over&slaan" msgid "&Squash" msgstr "&Samenvoegen" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "Voeg ALLES &samen" @@ -1214,7 +1242,7 @@ msgstr "&Start" msgid "&Start Group" msgstr "&Startgroep" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Stash" @@ -1234,7 +1262,7 @@ msgstr "&Symboolweergave" msgid "&Tab size:" msgstr "&Tabstop:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Document met tabbladen" @@ -1242,7 +1270,7 @@ msgstr "&Document met tabbladen" msgid "&Tag" msgstr "&Label" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Labels" @@ -1278,7 +1306,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&werkbalken" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1290,7 +1318,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Twee paginas" @@ -1298,15 +1330,15 @@ msgstr "&Twee paginas" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Ongedaan maken" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Unified diff" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Unified diff met" @@ -1318,7 +1350,7 @@ msgstr "Onbekende s&tations" msgid "&Up" msgstr "O&mhoog" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "Onderdeel &bijwerken naar revisie" @@ -1330,11 +1362,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Gebruik automatisch aanvullen voor bestandspaden en keywords" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Gebruikersnaam:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "B&eeld" @@ -1342,7 +1374,7 @@ msgstr "B&eeld" msgid "&View:" msgstr "B&eeld:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Waarschuw bij ontbrekende Signed-Off-By bij vastleggen" @@ -1358,6 +1390,10 @@ msgstr "&Heel woord" msgid "&Within file" msgstr "&Binnen bestand" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "negeer spat&ie wijzigingen" @@ -1366,46 +1402,46 @@ msgstr "negeer spat&ie wijzigingen" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit standaard)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(van %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(geen werkset)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(geen regelnummer)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(geen waarde)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(niet gevonden)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(onbekend)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- alles -" @@ -1413,13 +1449,14 @@ msgstr "- alles -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1427,7 +1464,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config in de archiefroot" @@ -1443,7 +1480,7 @@ msgstr ".gitignore in de mappen met de items" msgid ".gitignore in the repository root" msgstr ".gitignore in de archiefroot" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig in de archiefroot" @@ -1459,31 +1496,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1492,66 +1529,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit is een shell extensie.\nDit betekent dat het geïntegreerd is in de Windows verkenner.\nOm TortoiseGit te gebruiken opent u de verkenner en klikt u met de rechtermuisknop op een willekeurige map om het contextmenu te openen waar u alle TortoiseGit commando's zult vinden.\nLees ook de handleiding!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Waarschuwing: Deze actie verwijdert de branches in het externe archief." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Weet u zeker dat u ALLE stash wilt verwijderen?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Stash Toepassen mislukt!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Stash Ophalen mislukt!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Stash mislukt!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Stash Toepassen mislukt, er zijn conflicten" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Stash Ophalen mislukt, er zijn conflicten" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Stash Toepassen was succesvol" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Stash Ophalen was succesvol" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Stash was succesvol" @@ -1559,7 +1596,7 @@ msgstr "Stash was succesvol" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1571,71 +1608,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Een branch met dezelfde naam als de door u ingevoerde labelnaam bestaat al (dus de korte referentie is ambigu).\nDit kan problemen veroorzaken dus u kunt dit het beste niet doen." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Er bestaat al een branch met deze naam." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Een nieuwere versie is beschikbaar. Download s.v.p. de huidige versie!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Een met regelovergangen gescheiden lijst paden waarvoor overlays getoond worden.\r\nAls u een '*' karakter aan het einde van het pad toevoegt, worden alle bestanden en submappen onder dat pad ook opgenomen." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Een met regelovergangen gescheiden lijst paden waarvoor geen contextmenu getoond wordt.\r\nAls u een '*' karakter aan het einde van het pad toevoegt, worden alle bestanden en submappen onder dat pad ook uitgesloten.\r\nEen lege lijst laat het contextmenu op alle paden toe." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Een met regelovergangen gescheiden lijst paden waarvoor geen overlays getoond worden.\r\nAls u een '*' karakter aan het einde van het pad toevoegt, worden alle bestanden en submappen onder dat pad ook opgenomen.\r\nEen lege lijst laat overlays op alle paden toe." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Een vereiste bron is niet beschikbaar." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Een label met dezelfde naam als de door u ingevoerde branchnaam bestaat al (dus de korte referentie is ambigu).\nDit kan problemen veroorzaken dus u kunt dit het beste niet doen." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Er bestaat al een label met deze naam." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Een viewer voor GNU diff-bestanden (patch bestanden).\r\nGebruik kladblok als u niets anders heeft." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "Af&breken" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&Over" @@ -1651,11 +1688,11 @@ msgstr "Hernoemingen afkorten" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Afbreken" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Sa&menvoeging Afbreken" @@ -1663,11 +1700,11 @@ msgstr "Sa&menvoeging Afbreken" msgid "Abort Merge" msgstr "Samenvoeging Afbreken" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Breekt een actieve samenvoeging af" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Over" @@ -1687,12 +1724,12 @@ msgstr "Over TortoiseGitMerge" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Toegang tot %1 geweigerd." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Actie" @@ -1700,26 +1737,26 @@ msgstr "Actie" msgid "Action log" msgstr "Actie-log" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Acties" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Takenlijst activeren" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Actieve bestanden" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX objecten kunnen niet opgeslagen worden tijdens het afsluiten van Windows!\nAlle wijzigingen in %1 weggooien?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Toevoegen" @@ -1727,7 +1764,7 @@ msgstr "Toevoegen" msgid "Add &Signed-off-by" msgstr "&Signed-off-by toevoegen" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Voeg '%s' toe aan woordenboek" @@ -1740,15 +1777,15 @@ msgstr "Extern Archief Toevoegen" msgid "Add \"&Signed-off-by\"" msgstr "\"&Signed-off-by\" toevoegen" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Voeg een extensie-specifiek diff-programma toe" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Voeg een extensie-specifiek merge-programma toe" @@ -1756,15 +1793,15 @@ msgstr "Voeg een extensie-specifiek merge-programma toe" msgid "Add new files automatically to Git" msgstr "Voeg nieuwe bestanden automatisch toe aan Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Voeg toe aan &negeerlijst" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Voeg toe aan 'Quick Access' werkbalk" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Toevoegen..." @@ -1772,11 +1809,11 @@ msgstr "Toevoegen..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Toevoegen/wijzigen extensie-specifiek Diff/Merge programma" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Toegevoegd" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1784,25 +1821,25 @@ msgid "" "to the ignore list." msgstr "Bestandsmasker(s)\n%s\ntoegevoegd aan de negeerlijst." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Toevoegen" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Voegt bestand(en) toe aan Git beheer" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Voegt geselecteerde bestand(en) of het bestandspatroon toe aan de negeerlijst" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Pas instellingen aan\nInstellingen" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Geavanceerd" @@ -1810,43 +1847,43 @@ msgstr "Geavanceerd" msgid "Advanced Diff/Merge Settings" msgstr "Geavanceerde Diff/Merge instellingen" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Geavanceerde diff-instellingen" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Geavanceerde merge-instellingen" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Alles" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Alle commando's" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Alle bestanden (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Alle Bestanden (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Alle Oorsprongen" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Alle lokale branches" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1854,47 +1891,47 @@ msgstr "" msgid "All tags only" msgstr "Alleen alle labels" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Al uw wijzigingen gaan verloren! Wilt u echt alle menu's en werkbalken herstellen?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Al uw wijzigingen gaan verloren! Wilt u echt alle toetscombinaties herstellen?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Al uw wijzigingen gaan verloren! Wilt u echt menu '%s' herstellen?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Al uw wijzigingen gaan verloren! Wilt u echt werkbalk '%s' herstellen?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Sta Bewerken toe voor dit overzicht\nBewerken Toestaan" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Aangepaste Gravatar URL toestaan" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Reeds up-to-date." @@ -1910,11 +1947,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Gebruik altijd de systeem landinstellingen bij het tonen van datum en tijd" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Herzie vastlegging" @@ -1922,12 +1959,12 @@ msgstr "Herzie vastlegging" msgid "Amend &Last Commit" msgstr "&Laatste Vastlegging Herzien" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Een alternatieve editor die bij voorkeur *nix regeleindes ondersteunt." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1938,7 +1975,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1951,34 +1988,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Er was een ongeldige bestands-handle geassocieerd met %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Er is een onbekende fout opgetreden." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Een onbekende fout bij het benaderen van %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Een onbekend soort regel aangetroffen op regel %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Rechterblok erna toevoegen" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Dit blok links ervoor toevoegen" @@ -1990,11 +2027,11 @@ msgstr "Menu's van applicatievenster:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Patchserie Toepassen..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Pas patch toe..." @@ -2002,7 +2039,7 @@ msgstr "Pas patch toe..." msgid "Apply Patches" msgstr "Patches toepassen" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Pas een serie patches toe uit een mailbox" @@ -2010,7 +2047,7 @@ msgstr "Pas een serie patches toe uit een mailbox" msgid "Apply unified diff" msgstr "Unified diff toepassen" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Aqua stijl" @@ -2018,39 +2055,39 @@ msgstr "Aqua stijl" msgid "Arabic" msgstr "Arabisch" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "Willekeurige &URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Weet je zeker dat je de kolommen wilt herstellen?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Weet u zeker dat u het rebaseproces wilt afbreken?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Weet u zeker dat u de conflicterende bestanden als opgelost wilt markeren?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Weet u zeker dat u %d onderde(e)l(en) wilt herstellen? U raakt alle wijzigingen sinds de laatste verversing kwijt!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Weet u zeker dat u wilt opslaan naar \"%s\"?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "&Boven elkaar plaatsen" +msgid "Arrange &vertical\tV" +msgstr "&Boven elkaar plaatsen\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Toegewezen aan werkset '%s'" @@ -2059,11 +2096,11 @@ msgstr "Toegewezen aan werkset '%s'" msgid "Assigned to:" msgstr "Toegewezen aan:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2075,34 +2112,34 @@ msgstr "" msgid "At file &creation" msgstr "Bij &aanmaken bestand" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "Bij aanmaken bestand" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Huidige revisie: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Op dit moment kunt u alleen branches hernoemen." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Poging om een niet ondersteunde actie uit te voeren." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Poging om voorbij het einde van %1 te lezen." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Poging om te lezen van het voor schrijven geopende %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Poging om te schrijven naar het voor lezen geopende %1." @@ -2119,11 +2156,11 @@ msgstr "Authenticatie" msgid "Authentication data" msgstr "Authenticatiegegevens" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Auteur" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "E-mail Auteur" @@ -2131,7 +2168,7 @@ msgstr "E-mail Auteur" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Auteur:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Auteurs" @@ -2153,11 +2190,11 @@ msgstr "Automatische CrLf conversie" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Automatisch verbergen" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Alles automatisch verbergen" @@ -2165,23 +2202,23 @@ msgstr "Alles automatisch verbergen" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Automatisch sluiten, behalve na conflicten" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Automatisch sluiten, behalve na fouten" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Automatisch sluiten als er geen opties meer beschikbaar zijn" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Automatisch sluiten, behalve na samenvoegen, verwijderen of toevoegen" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2195,7 +2232,7 @@ msgstr "Automatisch Laden Putty &Key" msgid "Autoload Putty &Key" msgstr "Automatisch Laden Putty &Key" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatisch" @@ -2215,7 +2252,7 @@ msgstr "Gemiddelde" msgid "B&rowse..." msgstr "&Bladeren..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Terug" @@ -2227,7 +2264,7 @@ msgstr "" msgid "Baltic" msgstr "Baltisch" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Staafdiagram" @@ -2247,7 +2284,7 @@ msgstr "Basisbestand:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Gebaseerd op TortoiseIDiff van TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Algemene Info" @@ -2259,45 +2296,45 @@ msgstr "Tussen bestanden:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditioneel)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bisect slecht" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bisect goed" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Bisect herstellen" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Bisect starten" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\neen bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Zwarte stijl" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Verklaren" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Annoteringsfout" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Verklaar vorige revisie" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Geeft van een bestand de auteur per regel" @@ -2305,26 +2342,30 @@ msgstr "Geeft van een bestand de auteur per regel" msgid "Blend alpha" msgstr "Alpha mixen" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Blauwe stijl" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Bericht" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Zowel /logmsg als /logmsgfile zijn opgegeven!\nU kunt slechts één van deze twee gebruiken." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Zowel het pad naar het patch-bestand als het doel-pad moeten absolute paden zijn!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Onderste Overzicht:" @@ -2336,30 +2377,30 @@ msgstr "&Bladeren..." msgid "Branc&h:" msgstr "Branc&h:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Branch" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Naam Branch" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Branch-/Labelnaam is ongeldig." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Branch-/Labelnaam mag niet leeg zijn of is ongeldig." @@ -2371,11 +2412,11 @@ msgstr "Branch:" msgid "Bro&wse" msgstr "&Bladeren" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Bladeren door Referenties" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Zoeken naar de externe Diff-applicatie" @@ -2387,7 +2428,7 @@ msgstr "Bladeren door referenties" msgid "Browse..." msgstr "Bladeren..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" @@ -2399,7 +2440,7 @@ msgstr "" msgid "Bug-ID/Issue-Nr:" msgstr "Bug-ID/Issue-Nr:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-IDs" @@ -2415,7 +2456,7 @@ msgstr "" msgid "Button Appearance" msgstr "Knopweergave" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2431,7 +2472,7 @@ msgstr "Nu &controleren" msgid "C&ommands:" msgstr "&Commando's:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "Maak b&ranch/label van revisie" @@ -2439,11 +2480,11 @@ msgstr "Maak b&ranch/label van revisie" msgid "C&urrent Keys:" msgstr "&Huidige toetsen:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "Kn&ippen" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2459,11 +2500,11 @@ msgstr "Bereken" msgid "Can double-click in log list to compare with previous revision" msgstr "Dubbelklikken in de log-lijst vergelijkt met de vorige revisie" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Een statisch ActiveX object kan niet geactiveerd worden." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2472,80 +2513,80 @@ msgid "" "%s" msgstr "%s\nkan niet gekopieerd worden naar\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Kan afbeelding niet naar klembord kopiëren!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Kan geen nieuwe afbeelding maken!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Kan menu's niet aanpassen!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Kan afbeelding van klembord niet plakken!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Annuleren" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Annuleren\nSluit TortoiseGitMerge niet af" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Annuleren\nWissel de overzichten niet" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Annuleren\nBehoud het lege bestand." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Annuleren\nLos eerst de conflicten op." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Annuleren\nBlijf bij de huidige bestanden" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Annuleren\nBlijf bij de huidige instellingen" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Kan de vastleggingen nu niet combineren.\nZorg ervoor dat u het logboek van uw huidige branch bekijkt en geen filters heeft toegepast." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Kan annotatie niet tonen. \"%s\" valt niet onder versiebeheer door git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Verschil kan niet getoond worden omdat er verschillende soorten regeleinden in het bestand zitten." @@ -2557,7 +2598,7 @@ msgstr "&Stapelen" msgid "Cascaded context menu" msgstr "Context submenu" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "" @@ -2581,33 +2622,33 @@ msgstr "" msgid "Change log" msgstr "Wijzigingen" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Wijzig de printer- en printinstellingen\nPrintinstellingen" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Wijzig de printinstellingen\nPaginainstellingen" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Wijzig de stijl van de applicatie\nWijzig stijl" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Verplaats het venster" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Wijzig afmetingen van het venster" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Wijzigingstype" @@ -2615,38 +2656,38 @@ msgstr "Wijzigingstype" msgid "Changed Files" msgstr "Gewijzigde bestanden" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Gewijzigde bestanden tussen %s en %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Gewijzigde bestanden tussen %s, %s en %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Gewijzigde bestanden: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Gewijzigde regels inclusief toegevoegde/verwijderde bestanden" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Gewijzigde regels inclusief toegevoegde/verwijderde bestanden op datum" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Gewijzigde regels exclusief toegevoegde/verwijderde bestanden" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Gewijzigde regels exclusief toegevoegde/verwijderde bestanden op datum" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Werkset %s verplaatst" @@ -2655,7 +2696,7 @@ msgstr "Werkset %s verplaatst" msgid "Changes made (double-click on file for diff):" msgstr "Gemaakte wijzigingen (dubbelklik op het bestand voor details):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Wijzigt de stijl van de applicatie" @@ -2663,7 +2704,7 @@ msgstr "Wijzigt de stijl van de applicatie" msgid "Char position where to show a border line in commit text boxes:" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Markeren" @@ -2675,31 +2716,31 @@ msgstr "Controleer Op Updates - TortoiseGit" msgid "Check For Updates..." msgstr "Controleer Op Updates..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Controleer &wijzigingen" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Controleer het pad en/of de URL die u heeft ingevoerd." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Selecteer de menu items die in het hoogste contextmenu moeten verschijnen, in plaats van het TortoiseGit submenu" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Selecteer de menu items die alleen in het submenu mogen verschijnen (Shift + linker muisknop)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Selecteer om relatieve tijden te tonen in logboekberichten" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Kies deze optie voor een verkorte datum en tijd in logboodschappen" @@ -2707,31 +2748,31 @@ msgstr "Kies deze optie voor een verkorte datum en tijd in logboodschappen" msgid "Check:" msgstr "Markeer:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Ophalen" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2739,11 +2780,11 @@ msgstr "" msgid "Chinese" msgstr "Chinees" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Selecteer Archief" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Omgekeerd chronologisch (git standaard)" @@ -2755,78 +2796,78 @@ msgstr "Opschonen" msgid "Clean Type" msgstr "Opschoontype" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Permanent opschonen" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Opschonen naar prullenbak" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Schoon achterlopende externe branches op" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Bezig met opschonen" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Bezig met opschonen." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Schonen kon de volgende paden niet behandelen:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Schonen heeft de volgende paden succesvol behandeld:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Wissen" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Wis-gereedschap\nWissen" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Wist %ld URLs opslagen voor %ld werkmappen" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Wist %ld logberichten opgeslagen voor %ld werkmappen" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Wist %ld gebruikersnaam/wachtwoord-paren, %ld SSL certificaten en %ld gebruikersnamen" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Wist opgeslagen boodschappen van %ld archieven" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Wist de opgeslagen authenticatie.\r\nU zal uw gebruikersnaam/wachtwoord voor alle archieven opnieuw moeten ingeven." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Wist opgeslagen afmetingen en posities van %ld vensters" @@ -2835,7 +2876,7 @@ msgstr "Wist opgeslagen afmetingen en posities van %ld vensters" msgid "Click here to go to the website" msgstr "Klik hier om naar de website te gaan" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Klik hier voor recent ingevoerde boodschappen" @@ -2851,17 +2892,17 @@ msgid "" "extension" msgstr "Klik op 'Geavanceerd' om Merge-programma's per extensie op te geven" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Klik om opdrachten te zien voor het verplaatsen van blokken tekst\nGebruik tekstblokken" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Klembord" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Kloon" @@ -2869,7 +2910,7 @@ msgstr "Kloon" msgid "Clone Existing Repository" msgstr "Kloon Bestaand Archief" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Kloon een archief" @@ -2877,49 +2918,49 @@ msgstr "Kloon een archief" msgid "Clone into Bare Repo" msgstr "Kloon naar Kaal Archief" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Kloon..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Sluiten" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Volledig venster sluiten" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Afdrukvoorbeeld sluiten\n&Sluiten" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Niet automatisch sluiten" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Sluit de voorbeeldweergave\nSluit Voorbeeld" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Sluit het actieve document\nSluit" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Sluit het actieve venster en vraagt om de bestanden op te slaan" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Inklappen" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2945,7 +2986,7 @@ msgstr "Kleuren:" msgid "Combine One Mail" msgstr "Combineer één e-mail" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Combineer naar één vastlegging" @@ -2953,11 +2994,11 @@ msgstr "Combineer naar één vastlegging" msgid "Comman&ds:" msgstr "&Commando's:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Commando" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Commandoregel" @@ -2965,7 +3006,7 @@ msgstr "Commandoregel" msgid "Command Line To Execute:" msgstr "Uit te voeren commando:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Opdracht mislukt." @@ -2973,41 +3014,41 @@ msgstr "Opdracht mislukt." msgid "Commands" msgstr "Commando's" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Vastleggen" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Commit %s niet gevonden in \"%s\". Submodule nu bijwerken?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Commit Datum" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Commit E-mail" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Vastlegging Info" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Commit Bericht" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Commit Naam" @@ -3015,7 +3056,7 @@ msgstr "Commit Naam" msgid "Commit Ordering:" msgstr "Commit Volgorde:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3023,19 +3064,19 @@ msgstr "" msgid "Commit to:" msgstr "Vastleggen in:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Vastleggen..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Vastleggingen per auteur" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Vastleggingen per datum" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Vastleggingen per %s" @@ -3044,15 +3085,15 @@ msgstr "Vastleggingen per %s" msgid "Commits each week:" msgstr "Vastleggingen per week:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Legt uw wijzigingen in het archief vast" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "E-mail Vastlegger" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3064,52 +3105,52 @@ msgstr "Vastleggen van een map zonder versiebeheer voegt de bestanden in de map msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Vergelijk &HEAD revisies" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Vergelijk geselecteerde referenties" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Vergelijk twee bestanden" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Vergelijk spaties en witregels" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Vergelijk met de &werkmap" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Vergelijk met &basis" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Vergelijk met vorige revisie" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Vergelijk alle spaties en lege regels bij\nhet vergelijken\nVergelijk spaties en lege regels" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Vergelijkt het bestand met de laatste vastgelegde revisie om de door u gemaakte wijzigingen te tonen" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "%s vergelijken met %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Gereed" @@ -3125,7 +3166,7 @@ msgstr "Configuratiebron" msgid "Config type:" msgstr "Configuratietype:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3159,11 +3200,11 @@ msgstr "Configureer het programma voor GNU diff bestanden (patch bestanden)" msgid "Confirm to kill running git process" msgstr "Bevestig om het draaiende git process te beëindigen" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Conflict" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Conflictbestanden" @@ -3171,15 +3212,15 @@ msgstr "Conflictbestanden" msgid "Conflict resolved" msgstr "Conflict opgelost" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "In conflict" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflicten" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "In conflict: %d" @@ -3192,98 +3233,98 @@ msgstr "Contextmenus:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Doorgaan" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Trek geparkeerd venster aan" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Converteer spaties naar tabs" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Converteer tabs naar spaties" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Kopiëren" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Gekopieerd" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopiëren" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Kopiëer %s naar %s, revisie %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Kopieer SHA-1 naar klembord" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Kopieer-gereedschap\nKopiëren" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Kopiëer alle informatie naar klembord" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopiëer en hernoem" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Kopieer logberichten naar klembord" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Kopieer logboek naar klembord" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Kopiëer paden naar klembord" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Kopieer referentienamen" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Naar klembord ko&piëren" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Kopieer de selectie en plaats op het klembord\nKopiëren" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Naar klembord kopiëren" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopie: Nieuwe naam voor %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "%s\nwordt gekopieerd" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopiëren..." @@ -3291,25 +3332,25 @@ msgstr "Kopiëren..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Correcties" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Kon %s niet aan de negeerlijst toegevoegen!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Controle voor nieuwe versie niet gelukt." -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "Kon niet controleren op een nieuwe versie! %s (Foutcode: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3317,76 +3358,76 @@ msgid "" "%s" msgstr "Kon de bestanden niet kopiëren!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 kon niet worden gemaakt omdat de map vol is." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Kon de laatst vastgelegde revisie niet bepalen!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Kon de status niet ophalen!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 kon niet worden geopend omdat er teveel bestanden open zijn." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Kan bestand %s niet openen" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 kon niet worden verwijderd omdat het de huidige map is." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "%s kon niet uit de negeerlijst worden verwijderd" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Kon de URL van het bestand niet vinden!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Kan revisie %s van bestand %s niet ophalen.\nPatchen is niet mogelijk!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Kon TortoiseGitBlame niet starten" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3394,7 +3435,7 @@ msgid "" "%s" msgstr "Kon de vergelijkingsviewer niet starten!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3402,7 +3443,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3410,11 +3451,11 @@ msgid "" "%s" msgstr "Kon het externe samenvoegingsprogramma niet starten!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Afdrukopdracht kan niet gestart worden." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3422,11 +3463,11 @@ msgid "" "%s" msgstr "Kon de tekstviewer niet starten!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Kon de Putty Agent (pageant) niet starten." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Kon geen thread starten!" @@ -3434,7 +3475,7 @@ msgstr "Kon geen thread starten!" msgid "Coun&t" msgstr "Aan&tal" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Aantal: %u gevonden." @@ -3447,15 +3488,15 @@ msgstr "Maak &bibliotheek" msgid "Create .gitignore file" msgstr "Maak .gitignore bestand" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Maak Branch" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Maak Branch vanaf deze versie..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Maak Branch..." @@ -3467,29 +3508,29 @@ msgstr "Maak werkset" msgid "Create New Branch" msgstr "Nieuwe branch aanmaken" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Patchserie Maken..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Maak Label" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Maak Label aan deze versie..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Maak Label..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Maak een nieuw document\nNieuw" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3498,49 +3539,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Maak patch-bestand" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Pull aanv&raag aanmaken" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Maak &archief hier..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Aangemaakt" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Maakt een branch of label aan" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Maakt een bibliotheekmap aan met speciale instellingen voor Git werkmappen." -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Maakt een patch-bestand van het verschil tussen de twee bestanden\nMaak patch-bestand" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Maakt een archief op de huidige locatie" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Maakt een unified diff bestand met al uw wijzigingen" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Authenticatiemodule mag niet leeg zijn." @@ -3552,7 +3593,7 @@ msgstr "Authenticatiemodule:" msgid "Credentials" msgstr "Authenticatiegegevens" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Kn&ippen" @@ -3560,7 +3601,7 @@ msgstr "Kn&ippen" msgid "Current" msgstr "Huidig" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Huidige branch" @@ -3568,7 +3609,7 @@ msgstr "Huidige branch" msgid "Current Branch:" msgstr "Huidige Branch:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3580,7 +3621,7 @@ msgstr "" msgid "Current version is:" msgstr "Huidige versie is:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Huidige versie is: %s" @@ -3593,7 +3634,7 @@ msgstr "&Aanpassen..." msgid "Custom" msgstr "Aangepast" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Aanpassen" @@ -3601,19 +3642,19 @@ msgstr "Aanpassen" msgid "Customize Keyboard" msgstr "Toetsenbord aanpassen" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "'Quick Access' werkbalk aanpassen" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "'Quick Access' werkbalk aanpassen..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Aanpassen..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3627,88 +3668,92 @@ msgstr "Cyrillisch" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Server" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Datum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Datum Laatste Vastlegging" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Standaard" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Standaardmenu" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Standaardmenu. Verschijnt indien geen documenten geopend zijn." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Gebruik standaard UTF-8 codering" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Verwijderen" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Verwijderd %d branches" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Verwijder %d externe branches" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Verwijderd %d labels" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Verwijder &lokaal" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Verwijder Ref..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Verwijder alle labels" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "%d zaken verwijderen en &negeren op naam" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Verwijder en negeer %d zaken op &extensie" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Verwijder branch" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Verwijder branch/label" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Verwijder externe branch" @@ -3716,34 +3761,34 @@ msgstr "Verwijder externe branch" msgid "Delete remote tag - TortoiseGit" msgstr "Verwijder externe label - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Verwijder externe labels..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Verwijder submodule" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Verwijder label" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Verwijder de bestaande branch of gebruik een andere naam." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Verwijder\nHet bestand is verwijderd." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Verwijderd" @@ -3751,36 +3796,36 @@ msgstr "Verwijderd" msgid "Deleted merge conflict" msgstr "Verwijderd samenvoegingsconflict" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Verwijderd geselecteerde bestand(en) en voegt de namen of het bestandspatroon toe aan de negeerlijst" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Verwijdert bestanden/mappen uit versiebeheer" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Verwijdert bestanden/mappen uit versiebeheer maar bewaart het bestand" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Verwijdert het actie-log bestand" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Verwijderen" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Bezig met verwijderen van externe referenties..." @@ -3800,7 +3845,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Omschrijving" @@ -3808,7 +3853,7 @@ msgstr "Omschrijving" msgid "Description:" msgstr "Omschrijving:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Werkset deselecteren" @@ -3816,33 +3861,33 @@ msgstr "Werkset deselecteren" msgid "Destination" msgstr "Bestemming" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "De doelschijf is vol." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detecteer en toon verplaatste blokken" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Detecteer verplaatste of gekopieerde regels binnen een bestand" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3856,11 +3901,15 @@ msgstr "Venster afmetingen en posities" msgid "Dialogs" msgstr "Dialoogvensters" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Vergelijk Twee Vastleggingen" @@ -3892,7 +3941,7 @@ msgstr "Diff-bestand:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Vergelijk later" @@ -3904,12 +3953,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Vergelijk met \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Vergelijk met oorsprong %d" @@ -3922,19 +3971,19 @@ msgstr "Verschil tussen" msgid "Diffing" msgstr "Vergelijken" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Commits vergelijken" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Vergelijkt het bestand in de werkmap met de versie van vóór de laatste vastlegging" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Vergelijkt twee willekeurige commits" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Map..." @@ -3946,26 +3995,26 @@ msgstr "Map:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Schakel deze instelling uit als u een enorme werkmap heeft en merkt\ndat er teveel schijfactiviteit plaatsvindt terwijl u deze werkmap doorbladert." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Uitgeschakeld" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Schijf vol bij benaderen van %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Verstuur-uitzondering: %1" @@ -3974,44 +4023,52 @@ msgstr "Verstuur-uitzondering: %1" msgid "Display &buttons in this order" msgstr "Toon &knoppen in deze volgorde" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Toon volledige pagina's\nAfdrukvoorbeeld" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Geef helpinformatie voor geselecteerde knoppen, menu's en vensters\nHelp" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Geef helpinformatie bij huidige taak of commando\nHelp" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Geef instructies over het verkrijgen van hulp\nHelp" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Toon informatie over het programma\nInfo" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "Toon me deze waarschuwing &niet opnieuw (als Doorgaan geselecteerd is)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "Toon me deze waarschuwing &niet opnieuw (als Negeren geselecteerd is)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Selecteer niet automatisch submodules" @@ -4024,54 +4081,71 @@ msgstr "Toon geen contextmenu voor de volgende paden:" msgid "Do not use recycle bin" msgstr "Gebruik niet de prullenbak" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Weet u zeker dat u %s wilt verwijderen?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Wilt u de werkbalk '%s' echt verwijderen?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Wilt u dit bestand of deze map echt verplaatsen?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Weet u zeker dat u de %d geselecteerde referenties wilt verwijderen? Dit kan NIET ongedaan worden gemaakt!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Weet u zeker dat u \"%s\" wilt verwijderen?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4079,7 +4153,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Weet u zeker dat u alle wijzigingen in\n%s\nongedaan wilt maken en terug wilt gaan naar deze revisie? Deze wijzigingen zullen ongedaan gemaakt worden door een omgekeerde samenvoeging uit te voeren in uw werkmap." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4087,21 +4161,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Weet u zeker dat u alle wijzigingen in deze revisie in\n%s\nongedaan wilt maken? Deze wijzigingen zullen ongedaan gemaakt worden door een omgekeerde samenvoeging uit te voeren in uw werkmap." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Wilt u de branches ophalen van het nieuw toegevoegde externe archief?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Wilt u de gewijzigde bestanden laden?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4109,21 +4183,21 @@ msgid "" "as resolved?" msgstr "Wilt u het bestand\n%s\nals opgelost markeren?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Wilt u deze automatisch opgeslagen documenten herstellen?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Wilt u de bestanden herladen om de gewijzigde instellingen te gebruiken?\nLet op: alle gemaakte wijzigingen gaan verloren!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Wilt u de wijzigingen zien?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Wilt u de stash nu ophalen?" @@ -4131,28 +4205,28 @@ msgstr "Wilt u de stash nu ophalen?" msgid "Document :" msgstr "Document :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "De automatisch opgeslagen documenten niet herstellen\nGebruik dat laatst expliciet opgeslagen versies van de documenten" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Niet opslaan\nSluit de overzichten zonder de aanpassingen op te slaan" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4162,11 +4236,11 @@ msgstr "Niet opslaan\nHerlaadt de overzichten zonder de wijzigingen op te slaan" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Deze boodschap niet meer tonen" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Afgerond" @@ -4178,7 +4252,7 @@ msgstr "Beneden" msgid "Download" msgstr "Download" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Sleep om dit menu los te koppelen" @@ -4206,6 +4280,10 @@ msgstr "Dummy Button Form " msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Exclusief paden:" @@ -4214,7 +4292,7 @@ msgstr "&Exclusief paden:" msgid "E&xit" msgstr "&Afsluiten" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xporteer..." @@ -4234,11 +4312,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Oost-Europeesch" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Wijzigen" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Bewerk &globale .gitconfig" @@ -4254,23 +4332,23 @@ msgstr "Bewerk .tgitconfig" msgid "Edit Button Image" msgstr "Wijzig knop-afbeelding" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Bewerk Notities" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Auteur wijzigen" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Bewerk omschrijving" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Wijzig extensie-specifiek diff-programma" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Wijzig extensie-specifiek merge-programma" @@ -4282,11 +4360,11 @@ msgstr "Bewerk gl&obale .gitconfig" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Bewerk lokale git configuratie" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Bewerk logbericht" @@ -4306,25 +4384,25 @@ msgstr "" msgid "Effective" msgstr "Effectief" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "De naam of het IP-adres van de proxyserver" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Ellips gereedschap\nEllips" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "E-mail" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "E-mailadres Aan en CC mogen niet beiden leeg zijn." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "E-mails" @@ -4332,7 +4410,7 @@ msgstr "E-mails" msgid "Empty" msgstr "Leeg" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Bewerken Inschakelen" @@ -4348,7 +4426,7 @@ msgstr "Gravatar Inschakelen" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4357,10 +4435,14 @@ msgstr "" msgid "Enable log cache" msgstr "Logboek cache inschakelen" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Toon Gravatar afbeelding in Logboek" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Ingeschakelde overlay handlers" @@ -4369,35 +4451,35 @@ msgstr "Ingeschakelde overlay handlers" msgid "Encode" msgstr "Encodeer" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Codering" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Een fysieke I/O fout is opgetreden bij het benaderen van %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Een locking fout is opgetreden bij het benaderen van %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Een sharing fout is opgetreden bij het benaderen van %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Onjuist argument gebruikt." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Een onverwachte fout is opgetreden bij het lezen van %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Een onverwachte fout is opgetreden bij het schrijven van %1." @@ -4410,11 +4492,11 @@ msgstr "Encryptie" msgid "End" msgstr "Einde" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Regeleinde Stijl" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Maximaliseer het venster" @@ -4422,23 +4504,23 @@ msgstr "Maximaliseer het venster" msgid "Enter Log Message" msgstr "Geef logboodschap" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Geef URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Geef een GUID" -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Geef een valuta." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Geef een datum en/of tijd." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Geef een datum." @@ -4446,33 +4528,33 @@ msgstr "Geef een datum." msgid "Enter a name for the changelist:" msgstr "Geef een naam voor de werkset:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Geef een getal tussen %1 en %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Geef een getal." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Geef een positief geheel getal." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Geef een tijd." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Geef een geheel getal tusesn %1 en %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Geef een geheel getal tussen 0 en 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Geef een geheel getal." @@ -4484,7 +4566,7 @@ msgstr "Voer bestandsinhoud om te testen beneden in:" msgid "Enter log &message:" msgstr "Geef &logboodschap:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Geef niet meer dan %1 tekens." @@ -4493,43 +4575,43 @@ msgstr "Geef niet meer dan %1 tekens." msgid "Enter the regex string below:" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Alles wissen\nAlles wissen" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Wis selectie\nWissen" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Fout" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Fout opgetreden bij het herstellen van de Shell Icon Cache!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Fout bij het lezen/schrijven van registersleutel %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Alles bijgewerkt." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4539,28 +4621,28 @@ msgstr "Programma (*.exe)|*.exe|Commando (*.com)|*.com|Informatie (*.pdf)|*.pdf| msgid "Executable (+x)" msgstr "Uitvoerbaar (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Bestaand" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Afsluiten" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Uitklappen (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Vergroot geparkeerd venster" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Verkennen naar" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exporteer" @@ -4568,36 +4650,36 @@ msgstr "Exporteer" msgid "Export Zip File" msgstr "Zip-bestand exporteren" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Export-map:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exporteer selectie naar..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exporteer deze versie..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exporteer ook bestanden zonder versiebeheer" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exporteer %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exporteren..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exporteert een revisie naar een ZIP-bestand" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extensie" @@ -4613,7 +4695,7 @@ msgstr "Extensie:" msgid "Extern DLL Path:" msgstr "Extern DLL Pad:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Extern" @@ -4621,101 +4703,101 @@ msgstr "Extern" msgid "External Program:" msgstr "Extern programma:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Vervagen" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Mislukt" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Terugzetten mislukt" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Verbinden mislukt.\nKoppeling kan fout zijn." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Converteren ActiveX object mislukt." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Maken van leeg document mislukt." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Object kan niet gemaakt worden. Zorg er voor dat de applicatie in het register staat." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Ophalen basisbestand mislukt" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Ophalen samenvoegingsbestand mislukt" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Oproepen van help mislukt." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Starten serverapplicatie mislukt." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Openen van document mislukt." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Uitvoeren serveroperatie mislukt." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Opslaan van document mislukt." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Maken/verwijderen werkset '%s' mislukt" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "De COM provider '%s' voor de issue tracker kon niet gestart worden.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Wachten op het laden van de sleutel door pageant is mislukt." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Mislukt!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4723,62 +4805,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Fetch" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Fetch vanuit een SVN archief" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Fetchen van \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Fetchen&&Re&basen" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Fetchen..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Bezig met het ophalen van de status..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Bezig met het ophalen van gewijzigde bestanden..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Bestand ophalen..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Revisie %s van bestand ophalen:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Bestand" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Bestandscodering" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Bestandswijzigingen per %s" @@ -4787,27 +4869,27 @@ msgstr "Bestandswijzigingen per %s" msgid "File changes each week:" msgstr "Bestandswijzigingen per week:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Diff van twee bestanden" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Bestand heeft geen conflicten" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Bestand is leeg." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Bestandslijst is leeg" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Bestand-patches" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4819,7 +4901,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Bestandsgrootte:\t\t%s (%s)\nBreedte:\t\t\t%ld pixel\nHoogte:\t\t\t%ld pixel\nHorizontale resolutie:\t%.1f dpi\nVertikale Resolutie:\t%.1f dpi\nKleurdiepte:\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4839,7 +4921,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Bestandsgrootte:\t\t%s (%s)\nBreedte:\t\t\t%ld pixels\nHoogte:\t\t\t%ld pixels\nHorizontale resolutie:\t%.1f dpi\nVertikale resolutie:\t\t%.1f dpi\nKleurdiepte:\t\t%d bits\nZoom:\t\t\t%d%%\n\nBestandsgrootte:\t\t%s (%s)\nBreedte:\t\t\t%ld pixels\nHoogte:\t\t\t%ld pixels\nHorizontale resolutie:\t%.1f dpi\nVertikale resolutie:\t\t%.1f dpi\nKleurdiepte:\t\t%d bits\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4851,7 +4933,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Grootte:\t\t\t%s (%s)\nBreedte:\t\t\t%ld pixel\nHoogte:\t\t\t%ld pixel\nHorizontale resolutie:\t%.1f dpi\nVertikale Resolutie:\t%.1f dpi\nKleurdiepte:\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4871,7 +4953,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Bestandsgrootte:\t\t%s (%s)\nBreedte:\t\t\t%ld pixels\nHoogte:\t\t\t%ld pixels\nHorizontale resolutie:\t%.1f dpi\nVertikale resolutie:\t\t%.1f dpi\nKleurdiepte:\t\t%d bits\nZoom:\t\t\t%d%%\n\nBestandsgrootte:\t\t%s (%s)\nBreedte:\t\t\t%ld pixels\nHoogte:\t\t\t%ld pixels\nHorizontale resolutie:\t%.1f dpi\nVertikale resolutie:\t\t%.1f dpi\nKleurdiepte:\t\t%d bits\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Bestandsnaam" @@ -4879,17 +4961,17 @@ msgstr "Bestandsnaam" msgid "Files" msgstr "Bestanden" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Vul-gereedschap\nVullen" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filter op" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filter paden" @@ -4901,11 +4983,11 @@ msgstr "Filteren:" msgid "Filter: " msgstr "Filteren:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Zoeken" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4915,17 +4997,17 @@ msgstr "Zoek de opgegeven tekst\nZoeken" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Zoeken: Kan de tekst \"%s\" niet vinden" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4933,23 +5015,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Afronden" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Gereed!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Eerste Oorsprong" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Alleen Eerste Oorsprong" @@ -4958,18 +5040,18 @@ msgid "First known &bad:" msgstr "Eerste &bekende foutief:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Afbeelding passend in &hoogte maken" +msgid "Fit image &heights\tH" +msgstr "Afbeelding passend in &hoogte maken\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Floppydrives (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Map" @@ -4981,38 +5063,34 @@ msgstr "Volg hernoemingen" msgid "Font" msgstr "Lettertype" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Druk op F1 voor hulp. Horizontaal scrollen gaat met Ctrl-Scrollwiel" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Deactiveer 'Stoppen bij kopie/hernoemd bestand' voor de volledige historie" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forceer" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5030,20 +5108,20 @@ msgstr "" msgid "Format Patch" msgstr "Patch opmaken" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Patch Samenstellen..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Vooruit" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5073,11 +5151,11 @@ msgstr "Van ge&wijzigde bestanden" msgid "From SVN Repository" msgstr "Van SVN Archief" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Van bestaande bestanden" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Van gewijzige bestanden" @@ -5085,7 +5163,7 @@ msgstr "Van gewijzige bestanden" msgid "From:" msgstr "Van:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Volledig scherm" @@ -5093,7 +5171,7 @@ msgstr "Volledig scherm" msgid "Full text search" msgstr "Doorzoek tekst" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Volledig recursief" @@ -5101,7 +5179,7 @@ msgstr "Volledig recursief" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5109,24 +5187,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Versimpeld)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ kon niet gestart worden!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ kon geen bitmap object maken. Er is waarschijnlijk te weinig geheugen." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Informatie ophalen. Een ogenblik geduld..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Statistieken samenstellen" @@ -5170,29 +5248,29 @@ msgstr "Algemeen::Dialoogvensters 3" msgid "General::Set Extend Menu Item" msgstr "Algemeen::Uitgebreid Contextmenu Instellen" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Haal samenvoegboodschappen" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Bestand %s ophalen" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Ophalen %s, revisie %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Informatie ophalen..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Informatie ophalen..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Unified diff ophalen..." @@ -5204,23 +5282,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git Proces Voortgang" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Exporteer alle items hier" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5228,35 +5306,35 @@ msgstr "" msgid "Git Init" msgstr "Git Initialiseren" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Git Installatiepad" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Logboek" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git Extern Archief Instellingen" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Git Revisielijst" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5268,7 +5346,7 @@ msgstr "Git Synchronisatie" msgid "Git clone - TortoiseGit" msgstr "Git kloon - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" @@ -5276,23 +5354,23 @@ msgstr "" msgid "Git for Windows" msgstr "Git voor Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git voor Windows (https://msysgit.github.io/) niet gevonden." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5313,7 +5391,7 @@ msgstr "Git::Authenticatie" msgid "Git::Remote" msgstr "Git::Extern Archief" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Globaal" @@ -5325,47 +5403,47 @@ msgstr "Ga naar regel" msgid "Go to line" msgstr "Ga naar regel" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Ga naar volgend conflict\nVolgend conflict" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Ga naar volgende verschil\nVolgend verschil" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Ga naar het volgende inline-verschil\nVolgend inline-verschil" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Ga naar vorig conflict\nVorig conflict" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Ga naar vorig verschil\nVorig verschil" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Ga naar het vorige inline-verschil\nVorig inline-verschil" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Ga naar regel" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Schema" @@ -5381,11 +5459,11 @@ msgstr "Grijs" msgid "Greek" msgstr "Grieks" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Werksets groeperen" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "Verberg Ongerelateerde Gewijz&igde Paden" @@ -5401,7 +5479,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Hard" @@ -5413,7 +5491,7 @@ msgstr "Sterk: Herstel de werkmap en index (maak alle lokale wijzigingen ongedaa msgid "Hebrew" msgstr "Hebreeuws" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Help" @@ -5437,11 +5515,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Verberg menu's voor paden buiten versiebeheer" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Verberg Patch<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Verberg geparkeerd venster" @@ -5449,25 +5527,25 @@ msgstr "Verberg geparkeerd venster" msgid "Hide the script while running" msgstr "Verberg script bij uitvoeren" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Verberg ongewijzigd" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Verberg/toon bestandslijst uit patch" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Toon/Verberg de lijst met patch-bestanden\nToont of verbergt de lijst met patch-bestanden" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Hint" @@ -5477,7 +5555,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Tip: selecteer het contextmenu, wijzig de pagina in \"Commando's\" en sleep de werkbalk-knoppen in het menuvenster." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Home" @@ -5493,7 +5571,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Hook-scripts::Issue Tracker Integratie" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Soort hook" @@ -5509,7 +5587,7 @@ msgstr "&Inclusief paden:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5517,55 +5595,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5573,15 +5652,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5605,7 +5684,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5613,7 +5692,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5621,7 +5700,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5629,16 +5708,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5649,17 +5728,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5671,7 +5750,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5735,7 +5814,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Overlay iconen" @@ -5747,7 +5826,7 @@ msgstr "Overlay iconen::Iconen set" msgid "Icon Overlays::Overlay Handlers" msgstr "Overlay iconen::Overlay handlers" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5757,52 +5836,52 @@ msgstr "Iconen (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bm msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Iconen/Ontwerp/Code:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Activeer deze optie om geen overlays te tonen in de 'opslaan als...' en 'open...' dialogen" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Activeer deze optie om met een dubbelklik op een reviesie in de log-lijst te vergelijken met de vorige versie" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Activeer deze optie om de vastleg-dialoog opnieuw te openen na een fout.\r\nDaarbij wordt de meest recente selectie en logboek-boodschap bewaard." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Indien ingeschakeld controleert TortoiseGit eens per week of er een nieuwere versie beschikbaar is" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Indien ingeschakeld, zullen werkmappen die normaal gesproken\ngeen indicatoren weergeven toch een indicator tonen voor status 'normaal'" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Hiermee kunnen bestanden uit mappen zonder versiebeheer getoond worden in\r\nstatusoverzichten. De 'Vastleggen'-dialoog bevat bijvoorbeeld zo'n statusoverzicht." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5815,16 +5894,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Negeren" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Negeer %d zaken op &extensie" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Negeer Commentaar" @@ -5836,15 +5915,15 @@ msgstr "Negeer Bestand" msgid "Ignore Type" msgstr "Negeer Type" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Alle witruimte negeren" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Negeer alle wijzigingen in spaties en witregels" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Witregels negeren" @@ -5852,7 +5931,7 @@ msgstr "Witregels negeren" msgid "Ignore case cha&nges" msgstr "Negeer wijzigingen in &hoofd- en kleine letters" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5870,11 +5949,11 @@ msgstr "Negeer item(s) recursief" msgid "Ignore line &endings (recommended)" msgstr "Negeer ®eleinden (aanbevolen)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Negeer spatie op einde regel" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Negeer wijzigingen in witruimte" @@ -5882,29 +5961,29 @@ msgstr "Negeer wijzigingen in witruimte" msgid "Ignore whitespace" msgstr "Negeer witruimte" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Negeer wijzigingen in spaties en witregels" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Negeer witruimte bij vergelijking bovenliggend en onderliggend item" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Genegeerd" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Genegeerde Bestanden" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Negeert alle wijzigingen in spaties en lege regels bij het vergelijken\nNegeert alle spaties en lege regels" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5922,24 +6001,24 @@ msgstr "Afbeelding &en tekst" msgid "Images" msgstr "Afbeeldingen" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Enkel nivo, inclusief mappen" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importeren" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importeer %s in %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5948,16 +6027,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Bestand %s importeren" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Inkomende Commits" @@ -5981,24 +6060,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Alleen het volgende revisiebereik gebruiken:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Ongeldige bestandsnaam." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Initiële import" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Leeg Git archief geïnitialiseerd in %s." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Inline-verschil" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Inline-verschil per woord" @@ -6010,25 +6089,25 @@ msgstr "Verschillen binnen een regel" msgid "Input" msgstr "Invoer" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Plak de inhoud vna het klembord\nPlakken" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Onvoldoende geheugen om de opdracht uit te voeren." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Interne applicatiefout." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Ongeldige valuta." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Ongeldig revisienummer!" @@ -6036,7 +6115,7 @@ msgstr "Ongeldig revisienummer!" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6059,7 +6138,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Behouden" @@ -6067,11 +6146,11 @@ msgstr "Behouden" msgid "Keep changelists" msgstr "Werksets bewaren" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Bewaar lokaal bestand?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6085,7 +6164,7 @@ msgstr "Toetsenbord" msgid "Keyboard shortcuts:" msgstr "Toetsenbordcombinaties:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Toetsen" @@ -6129,19 +6208,39 @@ msgstr "LIJN8" msgid "Language:" msgstr "Taal:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Laatste Auteur" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Laatste Vastlegging" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Laatst Gewijzigd" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Laatst Gewijzigd:" @@ -6149,7 +6248,11 @@ msgstr "Laatst Gewijzigd:" msgid "Last known &good:" msgstr "Laatst bekende &correct:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Start het externe vergelijkings-/samenvoegingsprogramma om de conflicten op te lossen" @@ -6157,17 +6260,17 @@ msgstr "Start het externe vergelijkings-/samenvoegingsprogramma om de conflicten msgid "Least active author:" msgstr "Minst actieve auteur:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Linkeroverzicht:" @@ -6175,11 +6278,11 @@ msgstr "Linkeroverzicht:" msgid "Left image" msgstr "Linker beeld" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Lijndiagram" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6193,12 +6296,12 @@ msgstr "" msgid "Line differences" msgstr "Regelverschillen" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Regel verplaatst vanaf regel %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Regel verplaatst naar regel %ld" @@ -6211,26 +6314,26 @@ msgstr "Lijnbreedte" msgid "Line:" msgstr "Regel:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Regel: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Regels toegevoegd" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Regels verwijderd" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Toon helponderwerpen\nHelponderwerpen" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6248,23 +6351,23 @@ msgstr "Afbeeldingen laden" msgid "Load Putty &Key" msgstr "Laad Putty &Key" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Laad wijzigingen\nWijzigingen gemaakt in TortoiseGitMerge worden weggegooid en vervangen met de nieuwe inhoud" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Laad wijzigingen\nDe overzichten worden bijgewerkt met de nieuwe inhoud." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Bezig met laden..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Lokaal" @@ -6272,13 +6375,13 @@ msgstr "Lokaal" msgid "Local Branch" msgstr "Lokale branch" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Locale status" @@ -6286,7 +6389,7 @@ msgstr "Locale status" msgid "Local:" msgstr "Lokaal:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6296,7 +6399,7 @@ msgstr "" msgid "Locator Bar" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Logboek" @@ -6336,12 +6439,12 @@ msgstr "Logboek boodschappen (Toon log dialoog)" msgid "Login:" msgstr "Gebruikersnaam:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Laagste getoonde revisie: %ld - Hoogste getoonde revisie: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6352,7 +6455,7 @@ msgstr "Laagste getoonde revisie: %ld - Hoogste getoonde revisie: %ld - HEAD rev msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6364,14 +6467,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "De DLL van het mailsysteem is ongeldig." -#. Resource IDs: (156) -msgid "Main" -msgstr "Hoofd" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Maak het Kaal (Geen werkmappen)" @@ -6384,47 +6483,47 @@ msgstr "Be&heren" msgid "Manage" msgstr "Beheer" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Beheer Externe Archieven" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Markeer als opgelost" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Markeer als opgelost\nDe bestandsstatus is gewijzigd naar aangepast" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Markeert een bestand als opgelost in Git\nMarkeer als opgelost" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Markeert revisie als slecht" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Markeert revisie as goed" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Gelijke &hoofd-/kleine letters" @@ -6448,7 +6547,7 @@ msgstr "&Menu's tonen recent gebruikte commando's als eerste" msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Menubalk" @@ -6456,7 +6555,7 @@ msgstr "Menubalk" msgid "Menu s&hadows" msgstr "&Schaduwen van menu's" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Samenvoegen" @@ -6464,34 +6563,34 @@ msgstr "Samenvoegen" msgid "Merge &Message" msgstr "Sa&menvoegingsbericht" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Samenvoegingspunt" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reïntegratie samenvoeging" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Voeg samen naar \"%s\"" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Samengevoegd" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Samengevoegde Bestanden" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Voegt een andere branch samen" @@ -6499,22 +6598,22 @@ msgstr "Voegt een andere branch samen" msgid "Merging" msgstr "Samenvoegen" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Samenvoegen van %s, revisie %s tot %s, revisie %s in %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Voor samenvoegen zijn verschillende revisies of URLs nodig in 'Van:' en 'Tot:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Revisies %s van %s samenvoegen in %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Bericht" @@ -6526,7 +6625,7 @@ msgstr "A&lleen bericht" msgid "Message part &expression:" msgstr "" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Berichten" @@ -6534,11 +6633,11 @@ msgstr "Berichten" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Van mij" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimaliseer het lint" @@ -6550,7 +6649,11 @@ msgstr "Minimaal aantal tekens voor een commitbericht:" msgid "Misc" msgstr "Divers" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Gemengd" @@ -6558,35 +6661,35 @@ msgstr "Gemengd" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Gemengd: Verander de werkmap niet, herstel de index" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Wijzigingsdatum" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Gewijzigd" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Gewijzigde Bestanden" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Meer" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Meer knoppen" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Meer commando's..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Meer kleuren..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Meer..." @@ -6606,41 +6709,41 @@ msgstr "Verplaats &omlaag" msgid "Move &Up" msgstr "Verplaats om&hoog" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Verplaats onderdeel omlaag" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Verplaats onderdeel omhoog" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Verplaats en hernoem" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Verplaats naar werkset" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Verplaats/hernoemen" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Verplaatsen: Nieuwe naam voor %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Plaatst gewijzigde bestanden in de prullenbak voor wijzigingen ongedaan gemaakt worden" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "%s wordt verplaatst" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Verplaatsen..." @@ -6648,11 +6751,11 @@ msgstr "Verplaatsen..." msgid "My file:" msgstr "Mijn bestand:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Naam" @@ -6664,7 +6767,7 @@ msgstr "Naam:" msgid "Navigate" msgstr "Navigeer" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6674,11 +6777,11 @@ msgstr "Ga naar een specifieke regel\nGa naar regel" msgid "Navigation Pane Options" msgstr "Opties voor navigatievenster" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opties voor navigatievenster..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Genest" @@ -6690,7 +6793,7 @@ msgstr "Netwerk" msgid "Network::Email" msgstr "Netwerk::E-mail" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nieuw" @@ -6699,43 +6802,43 @@ msgid "New &name:" msgstr "&Nieuwe naam:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nieuwe Branch\\Label" +msgid "New Branch/Tag" +msgstr "Nieuwe Branch/Label" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nieuw Menu" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Nieuwe hash" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nieuw bericht" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nieuwe naam voor %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Nieuwe naam mag niet leeg of hetzelfde als de oorspronkelijke naam zijn!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nieuwe naam:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Nieuwe submodule" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Nieuwere committijd" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Regelafbrekingen" @@ -6743,33 +6846,29 @@ msgstr "Regelafbrekingen" msgid "Next" msgstr "Volgende" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Volgende pagina\nVolgende pagina" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Volgend conflict" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Volgend verschil" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Volgend inline-verschil" -#. Resource IDs: (73) -msgid "No" -msgstr "Nee" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Geen sa&menvoegingen" @@ -6781,102 +6880,107 @@ msgstr "" msgid "No Co&mmit" msgstr "Geen Co&mmit" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "Geen HEAD gevonden" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Geen commando opgegeven!\n\nTortoiseGitProc.exe wordt gebruikt door de Shell extensie en hoort niet direct aangeroepen te worden!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Geen commando opdracht gegeven!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Geen verschillen gevonden!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Geen verschillen gevonden! Submodule is mogelijk niet bijgewerkt. Submodule nu bijwerken?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Geen foutmelding beschikbaar." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Geen fouten opgetreden." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Geen bestanden of mappen waren gewijzigd. Er is niets dat TortoiseGit ongedaan kan maken!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Geen bestanden te tonen met huidige instellingen.\nSelecteer een of meer opties om bestanden te zien die ongewijzigd, genegeerd of \nzonder versiebeheer zijn. Om wijzigingen in het archief te zien klikt u op 'Controleer archief'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." +"the last commit." msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Geen plaatje beschikbaar." -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Geen beeldvertaler gevonden voor %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Geen revisies meer gevonden." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Geen vorige versie." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Geen referentie gevonden" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Geen spellingscorrecties" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Geen status cache. Alleen mappen onder versiebeheer krijgen een overlay; bestanden niet" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Geen suggesties" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Geen werkmap gevonden." @@ -6884,11 +6988,11 @@ msgstr "Geen werkmap gevonden." msgid "Node size" msgstr "Item grootte" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Geen" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normaal" @@ -6900,30 +7004,30 @@ msgstr "" msgid "North European" msgstr "Noord-Europeaans" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Bestanden Buiten Versiebeheer" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Niet alle bestanden konden gedownload en geverifieerd worden." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Niet alle registersleutels (of INI bestand) zijn verwijderd." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Onvoldoende geheugen om de opdracht uit te voeren." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Onvoldoende geheugen!\nProbeer de grootte van het revisie-schema te beperken door\nitems in te klappen of de zoom-factor te verlagen." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Geen patches gegenereerd." @@ -6931,7 +7035,7 @@ msgstr "Geen patches gegenereerd." msgid "Note node" msgstr "Notitie item" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6950,26 +7054,26 @@ msgstr "Let op: de map bevat bestanden zonder versiebeheer" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Opmerking: dit beïnvloedt alle Tortoise clients, niet alleen TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notities" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Niets hoeft gerebased te worden\n%s is gelijk aan %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Niets om te Rebasen" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Niets om vast te leggen" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Opmerking" @@ -6977,7 +7081,7 @@ msgstr "Opmerking" msgid "Number Commits" msgstr "Aantal Commits" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Aantal %s" @@ -6990,7 +7094,7 @@ msgstr "Aantal auteurs:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7062,41 +7166,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "OLE initialisatie is mislukt. Zorg ervoor dat de OLE systeembestanden de juiste versie zijn." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007 kleuren" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Oude hash" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Oud bericht" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Oudere committijd" @@ -7104,15 +7208,15 @@ msgstr "Oudere committijd" msgid "Older lines" msgstr "Oudere regels" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Op aanvraag" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Eén of meer automatisch opgeslagen documenten zijn gevonden." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Een of meerdere bestanden bevinden zich in een conflict status." @@ -7124,29 +7228,29 @@ msgstr "Alleen de Huidige Branch" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Alleen Samengevoegde Bestanden" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Alleen bestanden" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Alleen nummers (optioneel gescheiden door een comma)\ntoegestaan!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Alleen dit object" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Openen" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7156,51 +7260,52 @@ msgstr "Open een bestaand document\nOpen" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Open bestanden om verschillen te tonen of patch uit te voeren\nOpen bestanden" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Openen vanaf klembord" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Open afbeelding..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Open bovenliggende map" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Open dit document" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Openen met..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Opent help\nHelponderwerpen" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Opent de Referentiebrowser." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Opent de archiefverkenner" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Optie" @@ -7209,30 +7314,30 @@ msgid "Options" msgstr "Opties" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "&Origineel formaat" +msgid "Ori&ginal size\tS" +msgstr "&Origineel formaat\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Andere taakvensters" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Anderen" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Uitgaande Commits" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Geen geheugen beschikbaar." @@ -7240,7 +7345,7 @@ msgstr "Geen geheugen beschikbaar." msgid "Output Directory" msgstr "Doelmap" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7248,20 +7353,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Overschrijf bestaande branch" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Overschrijven" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Pagina %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7272,15 +7381,15 @@ msgstr "Pagina %u\nPaginas %u-%u\n" msgid "Page :" msgstr "Pagina :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Venster 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Venster 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parameters" @@ -7288,25 +7397,25 @@ msgstr "Parameters" msgid "Parameters:" msgstr "Parameters:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Oorsprong %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Oorsprong %d bestaat niet" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Oorsprong 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Oorsprong 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Oorsprong(en)" @@ -7318,39 +7427,39 @@ msgstr "Deel van de code is afkomstig van TortoiseSVN Blame" msgid "Password" msgstr "Wachtwoord" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Wachtwoord:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Plakken" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Plak Recent Bericht..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Plakgereedschap\nPlakken" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Plak lijst bestandsnamen" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Plak laatste vastleggingsbericht" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Plakt het SVN-pad van klembord, zodat een kopiëer of verplaats-actie plaatsvindt" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Patch" @@ -7366,32 +7475,32 @@ msgstr "Patch &geselecteerd" msgid "Patch As Attachment" msgstr "Patch Als Bijlage" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Alle bestanden patchen" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Patch geselecteerde bestanden" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Patchbestanden (*.diff, *.patch)|*.diff;*.patch|Alle Bestanden (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Patchen" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Bezig met patchen van bestand '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Pad" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Pad gevonden dat beter klopt met de patch." @@ -7399,21 +7508,21 @@ msgstr "Pad gevonden dat beter klopt met de patch." msgid "Path:" msgstr "Pad:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Paden" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Potloodgereedschap\nPotlood" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Percentage eigenaarschap" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Procenten" @@ -7421,24 +7530,24 @@ msgstr "Procenten" msgid "Personalized Menus and Toolbars" msgstr "Aangepaste menus en werkbalken" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7448,56 +7557,56 @@ msgstr "Afbeelding (metafile)\neen afbeelding" msgid "Picture:" msgstr "Afbeelding:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Afbeeldingen (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|Alle bestanden (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Afbeeldingen (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Alle Bestanden (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Taartdiagram" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Geef een hook-script om uit te voeren." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Geef een pad op om het hook-script op toe te passen." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Selecteer een hook-script" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Even geduld terwijl er wordt afgebroken..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Even geduld terwijl de verschillen worden opgehaald..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Even geduld..." @@ -7513,11 +7622,11 @@ msgstr "Poort :" msgid "Port:" msgstr "Poort:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Post-Vastleggen hook:" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7525,23 +7634,23 @@ msgstr "" msgid "Pre&v Page" msgstr "&Vorige pagina" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Pre-Vastleggen hook:" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Bezig met het voorbereiden van de vastlegging..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Rechterblok ervoor toevoegen" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Dit blok links erna toevoegen" @@ -7553,11 +7662,11 @@ msgstr "Druk &Nieuwe sneltoets:" msgid "Press &new shortcut key:" msgstr "Druk &nieuwe sneltoets:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Voorbeeld" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Bekijk voorbeeld van gepatched bestand" @@ -7569,51 +7678,51 @@ msgstr "Voorbeeld: " msgid "Previous" msgstr "Vorige" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Vorige pagina\nVorige pagina" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Vorige Versie" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Vorig conflict" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Vorig verschil" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Vorig inline-verschil" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Afdrukken" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Document afdrukken\n&Afdrukken" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Druk het actieve document af met de huidige instellingen\nSnel Afdrukken" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Druk het actieve document af\nAfdrukken" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Afdrukken naar bestand" @@ -7621,7 +7730,7 @@ msgstr "Afdrukken naar bestand" msgid "Printer :" msgstr "Printer :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Printer bestanden (*.prn)|*.prn|Alle bestanden (*.*)|*.*||" @@ -7629,11 +7738,11 @@ msgstr "Printer bestanden (*.prn)|*.prn|Alle bestanden (*.*)|*.*||" msgid "Printing" msgstr "Afdrukken bezig" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programma" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programma's (*.exe)|*.exe|Alle Bestanden (*.*)|*.*||" @@ -7641,11 +7750,11 @@ msgstr "Programma's (*.exe)|*.exe|Alle Bestanden (*.*)|*.*||" msgid "Progress" msgstr "Voortgang" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Project" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Eigenschap" @@ -7653,7 +7762,7 @@ msgstr "Eigenschap" msgid "Property Page" msgstr "Eigenschappen" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Provider" @@ -7685,15 +7794,15 @@ msgstr "Schoonmaken" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Pull" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Pullen..." @@ -7701,19 +7810,19 @@ msgstr "Pullen..." msgid "Pull/Fetch" msgstr "Pullen/Fetchen" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "Pus&h" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Push" @@ -7729,11 +7838,11 @@ msgstr "Push URL:" msgid "Push notes" msgstr "Push notities" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Push la&bels" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Pushen..." @@ -7741,22 +7850,22 @@ msgstr "Pushen..." msgid "Putty Key:" msgstr "Putty Sleutel:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty Privésleutel (*.ppk)|*.ppk|Alle Bestanden (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Verlaat de applicatie; vraagt om documenten op te slaan\nAfsluiten" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7774,11 +7883,15 @@ msgstr "R&AM station" msgid "R&eset" msgstr "&Herstel" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "&Ongedaan maken tot deze revisie" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "REBASE" @@ -7786,7 +7899,7 @@ msgstr "REBASE" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7808,7 +7921,7 @@ msgstr "&Extern Archief:" msgid "Re&movable drives" msgstr "&Stations met verwisselbaar medium" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "&Hernoemen..." @@ -7824,15 +7937,15 @@ msgstr "&Alles herstellen" msgid "Re&store defaults" msgstr "Standaard &herstellen" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Terugzetten..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Bereikbaar" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Lees de 'Gids voor dagelijks gebruik' voordat u vast komt te zitten" @@ -7840,21 +7953,21 @@ msgstr "Lees de 'Gids voor dagelijks gebruik' voordat u vast komt te zitten" msgid "Rebase" msgstr "Rebase" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Rebase \"%s\" hierop..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Rebase..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Bezig met rebasen... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Recent" @@ -7866,21 +7979,21 @@ msgstr "Recent Bestand" msgid "Recently modified lines" msgstr "Recent gewijzigde regels" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Alleen opnemen" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Herstel de automatisch opgeslagen documenten\nOpen de automatisch opgeslagen versies in plaats van de expliciet opgeslagen versies" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Herstel naar de status voor de rebase" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7894,17 +8007,21 @@ msgstr "" msgid "Recursive" msgstr "Recursief" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Herhaal ongedaan gemaakte actie\nOpnieuw" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Minimaliseer het venster" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Referentie" @@ -7912,31 +8029,31 @@ msgstr "Referentie" msgid "Ref (Click it then go to)" msgstr "Referentie (Klik erop dan ga naar)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Referentiebrowser" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "Referentielogboek" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Referentienaam" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Vernieuwen" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Bezig met vernieuwen..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7948,7 +8065,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7967,7 +8084,7 @@ msgid "" "\\s : whitespaces" msgstr "Filter voor reguliere expressies:\r\n. : willekeurig teken\r\nc+ : één of meer 'c' karakters\r\nc* : nul of meer 'c' karakters\r\n^ : begin van de regel\r\n$ : einde van de regel\r\n(string){n} : n maal tekenreeks string\r\n(abcd) : subexpressie\r\n[aei0-9] : tekens a,e,i of 0..9\r\n[^aei0-9] : alle tekens behalve a,e,i and 0..9\r\n\r\n\\w : tekens a-z,A-Z,0-9 and _\r\n\\W : alle niet alfanumerieke tekens\r\n\\d : cijfers 0-9\r\n\\s : spaties en tabs" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Patch-brokken voor '%s' geweigerd" @@ -7980,7 +8097,7 @@ msgstr "Relatieve tijden in logboek" msgid "Reload" msgstr "Herladen" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8014,19 +8131,19 @@ msgstr "Ex&tern gevolgde branch" msgid "Remote Branch" msgstr "Externe Branch" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "Extern archief URL mag niet leeg zijn." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Extern Archief Update" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Externe naam mag niet leeg zijn." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Status in archief" @@ -8038,12 +8155,12 @@ msgstr "Extern Archief:" msgid "Remove" msgstr "Verwijderen" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Verwijder %ld zaken" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Verwijder %s" @@ -8052,7 +8169,7 @@ msgstr "Verwijder %s" msgid "Remove &all untracked files (-fx)" msgstr "Verwijder &alle ongevolgde bestanden (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Verwijder &branch" @@ -8060,21 +8177,21 @@ msgstr "Verwijder &branch" msgid "Remove &non-ignored untracked files (-f)" msgstr "Verwijder &niet-genegeerde ongevolgde bestanden (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Verwijder uit &negeerlijst" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Verwijder van Snelle Toegang werkbalk" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Verwijderen uit werkset" @@ -8086,7 +8203,7 @@ msgstr "Verwijder genegeerde bestanden (-fX)" msgid "Remove untracked directories (-d)" msgstr "Verwijder ongevolgde mappen (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Verwijder ongevolgde bestanden uit de werkmap, ..." @@ -8094,11 +8211,11 @@ msgstr "Verwijder ongevolgde bestanden uit de werkmap, ..." msgid "Removed" msgstr "Verwijderd" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Verwijderd uit werkset" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8106,7 +8223,7 @@ msgid "" "from the ignore list." msgstr "De bestandsmasker(s)\n%s\nverwijderd uit de negeerlijst." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Verwijdert bestand(en) of het bestandspatroon uit de negeerlijst" @@ -8114,11 +8231,11 @@ msgstr "Verwijdert bestand(en) of het bestandspatroon uit de negeerlijst" msgid "Rena&me..." msgstr "&Hernoemen..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Hernoemen" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Hernoem %s" @@ -8127,20 +8244,20 @@ msgstr "Hernoem %s" msgid "Rename - TortoiseGit" msgstr "Hernoemen - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Hernoem \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Verplaats/hernoem" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Hernoemt bestanden/mappen in versiebeheer" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8150,7 +8267,7 @@ msgstr "Herhaal de vorige actie\nHerhalen" msgid "Replace &All" msgstr "&Alles Vervangen" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8164,12 +8281,12 @@ msgstr "Vervang door:" msgid "Replace:" msgstr "Vervang:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Vervangen" @@ -8193,11 +8310,11 @@ msgstr "Pull aanvragen" msgid "Requests a username and a password" msgstr "Vraagt om een gebruikersnaam en wachtwoord" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Opnieuw instellen" @@ -8209,25 +8326,25 @@ msgstr "&Alles herstellen" msgid "Reset Type" msgstr "Hersteltype" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Herstel \"%s\" naar dit..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Herstel actieve branch" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Kolommen herstellen" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Herstel huidige branch \"%s\" naar" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Oplossen" @@ -8235,126 +8352,122 @@ msgstr "Oplossen" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Los conflict op met 'mijn'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Los conflict op met 'hun'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Opgelost" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Opgelost:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Lost conflicten in bestanden op" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Rebase herstarten" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Herstel" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Standaard herstellen" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Herstel na vastleggen" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Herstel oorspronkelijk formaat" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Hersteld" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Opnieuw" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Opnieuw proberen over 2 seconden..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Ongedaan maken" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Vastlegging terugdraaien" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Vastlegging %s terugdraaien" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Herstel naar bovenliggende revisie" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Herstel naar revisie %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Ongedaan gemaakt" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Maakt al uw wijzigingen sinds de laatste verversing ongedaan" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Maakt een toevoeging aan versiebeheer ongedaan" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Controleer Patch met TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Een unified diff bestand controleren/toepassen met TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Een enkele &patch controleren/toepassen" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisie" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisie %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisie %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Revisie &schema" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Revisiebestanden" @@ -8370,31 +8483,31 @@ msgstr "Revisie schema filter" msgid "Revision graph" msgstr "Revisie schema" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Revisie(s) ongedaan gemaakt. Alle wijzigingen zijn nu opgenomen in uw werkmap." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revisie:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntekst met lettertypes en formattering" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Rechter beeld: " @@ -8402,21 +8515,21 @@ msgstr "Rechter beeld: " msgid "Right image" msgstr "Rechter beeld" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Regel %d van %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Regel %d-%d van %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Rij naar beneden" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Rij naar boven" @@ -8424,11 +8537,11 @@ msgstr "Rij naar boven" msgid "S&elect..." msgstr "&Selecteer..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Toon knoppen op één regel" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Toon knoppen op twee regels" @@ -8436,15 +8549,23 @@ msgstr "&Toon knoppen op twee regels" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Toon Snelle Toegang werkbalk onder het Ribbon" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "&Statistieken" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8464,7 +8585,7 @@ msgstr "SMTP-server vereist authenticatie" msgid "SMTP Server:" msgstr "SMTP-server:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, direct naar doelserver" @@ -8472,11 +8593,11 @@ msgstr "SMTP, direct naar doelserver" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8484,19 +8605,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN Commit Type" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Fetch" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN Rebase" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN Rev" @@ -8508,15 +8629,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Hetzelfde" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Zelfde commit tijd" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8534,35 +8655,39 @@ msgstr "" msgid "Sample text:" msgstr "Voorbeeldtekst:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Opslaan" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Opslaan &als..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Opslaan &als...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Opslaan als" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Bestand Opslaan" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Linkerbestand opslaan als\nU wordt gevraagd waar u het linkerbestand wilt opslaan" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8570,13 +8695,13 @@ msgid "" "%s" msgstr "Linkerbestand Opslaan\nDe wijzigingen worden opgeslagen naar\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Rechterbestand opslaan als\nU wordt gevraagd waar u het rechterbestand wilt opslaan" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8584,74 +8709,74 @@ msgid "" "%s" msgstr "Rechterbestand Opslaan\nDe wijzigingen worden opgeslagen naar\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Alles opslaan\nBeide bestanden worden opgeslagen" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Opslaan als" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Opslaan als..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Opslaan als\nU wordt gevraagd waar het bestand opgeslagen dient te worden" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Wijzigingen in %1 opslaan?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Wijzigingen opslaan." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Bewaar revisie &in..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Sla het actieve document met een andere naam op\nOpslaan Als" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Sla het actieve document op\nOpslaan" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8673,13 +8798,13 @@ msgstr "Unified diff opslaan" msgid "Save unified diff since HEAD" msgstr "Unified diff vanaf HEAD opslaan" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Opslaan\nSla het bestand op met de conflictmarkeringen." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8691,12 +8816,12 @@ msgstr "Opslaan\nDe wijzigingen worden opgeslagen naar\n%s" msgid "Saved Data" msgstr "Opgeslagen gegevens" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Opslaan van configuratie mislukt (sleutel: \"%s\", waarde: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Notities opslaan is mislukt." @@ -8708,11 +8833,11 @@ msgstr "" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Scroll naar links" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Scroll naar rechts" @@ -8720,7 +8845,7 @@ msgstr "Scroll naar rechts" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Doorzoek &logboekberichten..." @@ -8732,20 +8857,20 @@ msgstr "Zoek &omhoog" msgid "Search for:" msgstr "Zoeken naar:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Zoekt een beter pad om de patch toe te passen..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Positioneren mislukt in %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Selecteer" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "&Alles selecteren" @@ -8761,59 +8886,59 @@ msgstr "Selecteer &contextmenu:" msgid "Select &window:" msgstr "Selecteer &venster:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Kleur-gereedschap\nKies kleur" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Selecteer bestand..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Selecteer een SSH Client" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Druk op een knop." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Kies een object waarover u helpinformatie wilt" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Selecteer werkset" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Selecteer diff-applicatie" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Selecteer bestand" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Selecteer map om met deze issue-tracker te associeren" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Kies de map om naartoe te exporteren.\nMaak eventueel eerst een map aan voordat u exporteert." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Selecteer map om script op toe te passen" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Selecteer map om de geselecteerde bestanden in op te slaan" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Selecteer hook-script bestand" @@ -8821,20 +8946,20 @@ msgstr "Selecteer hook-script bestand" msgid "Select items automatically" msgstr "Onderdelen automatisch kiezen" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Selecteer een samenvoeg-applicatie" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Selecteer een samenvoeg doel" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8846,15 +8971,19 @@ msgid "" "checker used for commit messages." msgstr "Selecteer de taal voor dit project. Deze instellingen beïnvloeden de spellingscontrole voor commitberichten." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Selecteer viewer voor diff-bestanden" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Selecteer als welk bestand u het wilt opslaan" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8864,7 +8993,7 @@ msgstr "Selecteer als welk bestand u wilt opslaan\nLet op: Er is een onopgelost msgid "Select/deselect &all" msgstr "Selecteer/deselecteer &alles" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8872,7 +9001,7 @@ msgstr "" msgid "Send" msgstr "Versturen" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Verstuur E-mail" @@ -8880,11 +9009,11 @@ msgstr "Verstuur E-mail" msgid "Send Mail after create" msgstr "Verstuur e-mail na aanmaken" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Sendmail kan geen bericht versturen." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Stuur Mail..." @@ -8892,19 +9021,19 @@ msgstr "Stuur Mail..." msgid "Send Patch" msgstr "Verstuur Patch" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Verstuur Patch per E-mail" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Verstuur Patch(es) per E-mail" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Inhoud wordt verstuurd" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Bezig met versturen..." @@ -8924,28 +9053,28 @@ msgstr "Au&teur instellen" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Bezig met eigenschappen wijzigen..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Instellingen" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Instellingen - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8953,7 +9082,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "De Shell Icon Cache is hersteld." @@ -8965,7 +9094,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Verkorte &datum/tijd in logboek-boodschappen" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Verkort eigenschappen-lijst" @@ -8977,7 +9106,7 @@ msgstr "Toon" msgid "Show &Accelerator for:" msgstr "&Toon sneltoets voor:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Toon &Referentielogboek" @@ -8985,15 +9114,15 @@ msgstr "Toon &Referentielogboek" msgid "Show &Unversioned Files" msgstr "Toon Bestanden &Zonder Versiebeheer" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Toon &Compleet Project" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Toon &wijzigingen" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Toon &logboek" @@ -9001,15 +9130,19 @@ msgstr "Toon &logboek" msgid "Show &log..." msgstr "Toon &logboek..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Toon &overlays en contextmenu alleen in verkenner" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Toon boven het lint" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Toon onder het lint" @@ -9017,35 +9150,35 @@ msgstr "Toon onder het lint" msgid "Show Environment Variables" msgstr "Toon Omgevingsvariabelen" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Toon minder knoppen" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Toon HEAD revisie items" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Toon verschillen in een regel per woord\nWoordelijke verschillen in een regel" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Toon inline-verschil\nInline-verschil" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Toon meer knoppen" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Toon snelle toegang-balk boven het lint" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Toon snelle toegang-balk onder het lint" @@ -9053,11 +9186,11 @@ msgstr "Toon snelle toegang-balk onder het lint" msgid "Show Screen&Tips on toolbars" msgstr "Toon scherm&tips op werkbalken" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Toon witregels, tabs en spaties" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Toon een overzicht van het hele diagram" @@ -9065,7 +9198,7 @@ msgstr "Toon een overzicht van het hele diagram" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9073,11 +9206,11 @@ msgstr "" msgid "Show author" msgstr "Toon auteur" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Toon branches met deze vastlegging" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Toon wijzigingen als &unified diff" @@ -9097,15 +9230,15 @@ msgstr "Toon datum" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Toon doelmap" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Toon vergelijking" @@ -9117,11 +9250,15 @@ msgstr "Toon vergelijking met vorige commit" msgid "Show excluded folders as normal" msgstr "Toon uitgesloten mappen als 'normaal'" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Toon &gehele menu na korte tijd" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Toon bestandsnaam" @@ -9137,7 +9274,7 @@ msgstr "Toon &genegeerde bestanden" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9145,90 +9282,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Toon regel&nummers" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Toon logboek" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Toon log&boek voor hernoemen/kopiëren" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Toon logboek van %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Toon logboek van submodule" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Toon logboek van deze map" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Toon logboek..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Toon gewijzigde bestanden in de werkmap" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Toon oudste item bovenaan" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Toon of verberg de inline-diff balk\nWissel inline-diff balk" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Toon of verberg de locator-balk\nWissel locator-balk" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Toon of verberg de statusbalk\nWissel statusbalk" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Toon of verberg de werkbalk\nWissel werkbalk" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Toon oorspronkelijk regelnummer" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Toon revisie-eigenschappen" @@ -9236,7 +9373,7 @@ msgstr "Toon revisie-eigenschappen" msgid "Show shortcut &keys in ScreenTips" msgstr "Toon &sneltoetsen in schermtips" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9246,7 +9383,7 @@ msgstr "Toon tekens voor witregels, tabs en spaties\nToon witregels, tabs en spa msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9258,45 +9395,43 @@ msgstr "Toon on&gewijzigde bestanden" msgid "Show un&versioned files" msgstr "Toon bestanden &zonder versiebeheer" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Toon/verberg" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "%ld revisie(s) getoond, van revisie %s tot revisie %s - %ld revisie(s) geselecteerd, %ld bestand(en) geselecteerd\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Geeft een grafische weergave van kopieën/labels/branches" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Toont alle bestanden die sinds de laatste verversing zijn gewijzigd, zowel lokaal als in het archief" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Toont informatie over TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Toont het referentie logboek" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Toont actie-log bestand in de standaard tekst-editor" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Toont het logboek voor geselecteerd bestand/map" @@ -9308,7 +9443,7 @@ msgstr "Si&gneer" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Zilveren stijl" @@ -9316,20 +9451,20 @@ msgstr "Zilveren stijl" msgid "Since" msgstr "Sinds" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Grootte" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Overslaan" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Patch Overslaan: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9337,23 +9472,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Overgeslagen" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Ontbrekend doel overgeslagen" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Verschuiven" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Slim tabkarakter" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Zacht" @@ -9361,13 +9496,13 @@ msgstr "Zacht" msgid "Soft: Leave working tree and index untouched" msgstr "Zwak: Verander de werkmap en index niet" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Bestand(en) gewijzigd buiten TortoiseGitMerge om.\nWilt u de wijzigingen laden?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9381,7 +9516,7 @@ msgstr "Sorteer op aantal vastleggingen" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9391,49 +9526,53 @@ msgstr "Geeft aan hoeveel boodschappen bewaard worden in de geschiedenis van log msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Splits regels" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Splits actieve venster in tweeën\nSplits" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Samenvoegen" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Gestapeld staafdiagram" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Gestapeld lijndiagram" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standaard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Start Vastleggen Hook-script" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Start met Rebasen" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Start bisect modus..." @@ -9441,7 +9580,7 @@ msgstr "Start bisect modus..." msgid "Start registry editor" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Start een git server die het git procotol draait" @@ -9453,39 +9592,47 @@ msgstr "Stash" msgid "Stash &Message" msgstr "Stash &Bericht" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Stash Toepassen" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Stashlijst" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Stash Ophalen" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Stash Opslaan" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Bezig met stashwerkzaamheden..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statisch" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistieken" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Status" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Statusbalk-configuratie" @@ -9497,32 +9644,32 @@ msgstr "Status- en actiekleuren" msgid "Status cache" msgstr "Status cache" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Status cache alleen voor mappen; geen recursieve status" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Stopt bisect modus" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Strategie" @@ -9530,15 +9677,15 @@ msgstr "Strategie" msgid "Strip lines starting with \"#\" in commit message" msgstr "Verwijder regels die beginnen met \"#\" uit commitbericht" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Stijl" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Onderwerp" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Onderwerp:" @@ -9546,7 +9693,7 @@ msgstr "Onderwerp:" msgid "Submodule" msgstr "Submodule" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "S&ubmodule Bijwerken..." @@ -9554,7 +9701,7 @@ msgstr "S&ubmodule Bijwerken..." msgid "Submodule Add" msgstr "Submodule Toevoegen" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Submodule Toevoegen..." @@ -9562,15 +9709,15 @@ msgstr "Submodule Toevoegen..." msgid "Submodule Diff" msgstr "Submodule Vergelijken" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Submodule Initialiseren" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Submodule Synchronisatie" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Submodule Bijwerken" @@ -9578,7 +9725,7 @@ msgstr "Submodule Bijwerken" msgid "Submodule Update Options" msgstr "Submodule Bijwerkinstellingen" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9593,15 +9740,15 @@ msgstr "" msgid "Submodules" msgstr "Submodules" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Geslaagd" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Wissel" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Wissel %s naar %s, revisie %s" @@ -9610,43 +9757,43 @@ msgstr "Wissel %s naar %s, revisie %s" msgid "Switch To" msgstr "Overschakelen naar" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Ga naar het vorige venster\nVorig venster" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Wissel tussen enkel en dubbel venster" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Wissel tussen enkelvoudig en dubbel venster\nWissel tussen enkelvoudig en dubbel venster" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Wissel linker en rechter venster" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Wissel de inhoud van het linker en rechter venster\nWissel linker en rechter venster" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Ga naar het volgende documentvenster" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Ga naar het volgende venster\nVolgend venster" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Ga naar het vorige documentvenster" @@ -9654,19 +9801,19 @@ msgstr "Ga naar het vorige documentvenster" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Wissel werkmap naar een andere branch/label" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "" @@ -9678,23 +9825,23 @@ msgstr "" msgid "Symlink" msgstr "Symlink" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Synchroniseren..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Systeem" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Systeem in offline modus. Controleer Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9704,11 +9851,11 @@ msgstr "Registersleutels zijn verwijderd, evenals het INI bestand (als dat er wa msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "" @@ -9724,7 +9871,7 @@ msgstr "Tab-positie" msgid "Tab size:" msgstr "Tabstop:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Label" @@ -9732,16 +9879,16 @@ msgstr "Label" msgid "Tag (FF)" msgstr "Label (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Label Info" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Werkmap gelabeld aan %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Labels" @@ -9749,11 +9896,11 @@ msgstr "Labels" msgid "Tags:" msgstr "Labels:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Taken" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Taakvenster" @@ -9765,11 +9912,11 @@ msgstr "Tijdelijke bestanden (inclusief Gravatar afbeeldingen)" msgid "Test" msgstr "Test" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Alleen testen" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Tekstbestanden (*.txt)|*.txt|Alle Bestanden (*.*)|*.*||" @@ -9777,13 +9924,19 @@ msgstr "Tekstbestanden (*.txt)|*.txt|Alle Bestanden (*.*)|*.*||" msgid "Thai" msgstr "Thais" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "De Externe Configuratie is gewijzigd.\nWilt u nu opslaan of de wijzigingen negeren?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9791,64 +9944,78 @@ msgid "" "Do you really want to delete it?" msgstr "De branch \"%s\" is een externe branch.\n\nWilt u het echt verwijderen?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "De afmeting van het brokstuk komt niet overeen met het aantal toegevoegde/verwijderde regels!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Het vastleggingsbericht mag niet leeg zijn." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "De authenticatiemodule URL \"%s\" bestaat al.\nWilt u het overschrijven?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "De authenticatiemodule is gewijzigd.\nWilt u nu opslaan of de wijzigingen negeren?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "Er bestaan wijzigingen in de huidige werkmap.\nWilt u deze wijzigingen stashen?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "De Diff-programmatuur is afgebroken wegens een fout:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Bestand %s bestaat niet!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Bestand %s niet aangetroffen in het patch-bestand!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Het bestand \"%s\" bestaat niet in uw werkmap.\nWilt u een ander bestand selecteren om te vergelijken?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9857,15 +10024,15 @@ msgid "" "Do you want to remove the file?" msgstr "Bestand\n%s\nis leeg.\nWilt u het bestand verwijderen?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Het bestand is te groot" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Het bestand is te groot om te openen." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9873,7 +10040,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Bestand\n%s\nbestaat al! Wilt u het overschrijven?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9881,14 +10048,14 @@ msgid "" "is not a valid text file!" msgstr "Het bestand\n%s\nis geen geldig tekstdocument!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "De map %s\nbevat gewijzigde bestanden en/of bestanden die niet onder versiebeheer vallen.\nWilt u de map toch verwijderen?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9897,78 +10064,78 @@ msgid "" "Would you like to create it first?" msgstr "De map\n%s\nbestaat niet.\nWilt u de map eerst aanmaken?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Het hook-script gaf een foutmelding:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Het bestand kan niet worden getoond." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Kan geen issue-tracker provider maken. Controleer of de installatie ervan correct is." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "De issue-tracker provider kon de opdracht-tekenreeks niet valideren" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "De regel met de indicatie voor het nieuwe bestand is niet aangetroffen op regel %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Het regelnummer moet tussen %d en %d liggen" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "De lokale branchnaam en de externe branchnaam zijn leeg.\nDoorgaan?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "De lokale branch-/labelnaam is leeg. Dit resulteert in een externe verwijderactie.\nDoorgaan?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Het maximale aantal regels in de actie-log.\nBij het toevoegen van meer regels worden de oudste regels verwijderd." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Opdracht mislukt." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "De parameters '/path' en '/pathfile' kunnen niet samen gebruikt worden.\nU mag er slechts één opgeven." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "De patch kon niet foutloos worden toegepast op %s en er is geen versieinformatie opgegeven.\nPatchen is niet mogelijk!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9978,7 +10145,7 @@ msgid "" "do not match!" msgstr "De patch lijkt te oud! De bestandsregel\n%s\nen de patchregel\n%s\npassen niet bij elkaar!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9989,7 +10156,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Het opgegeven pad/URL is niet toegestaan onder Windows!\nU kunt het proberen te gebruiken, maar er kan later een fout optreden.\n\nEen geldig pad onder Windows mag geen '<<>|\"?*:' bevatten en niet een van de volgende namen zijn:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nWilt u toch doorgaan?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -10000,36 +10167,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Het pad\n%s\nlijkt niet te kloppen met de paden in het patchbestand.\nMaar TortoiseGitMerge heeft het pad\n%s\ngevonden dat beter klopt. Wilt u dit pad gebruiken?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Het proces is nog bezig.\nWeet u zeker dat u het wilt afbreken?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Het externe archief \"%s\" bestaat al.\nWilt u het overschrijven?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Het archief is gemaakt." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Het geselecteerde bestand lijkt nog conflict-markeringen te bevatten.\nWeet u zeker dat u het bestand als opgelost wilt markeren?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10037,7 +10211,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10046,7 +10220,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10055,26 +10229,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "De doelmap\n%s\nis niet leeg!\nWeet u zeker dat u een git archief wilt initialiseren in deze map?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "De maximale tijd in seconden om de bestanden te doorzoeken.\r\nEen lagere waarde zorgt voor het snel beschikbaar zijn van de lijst,\r\nmaar mogelijk zijn niet alle bestanden doorzocht." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "De twee geselecteerde URLs zijn niet gebaseerd op dezelfde basis.\nHet is niet mogelijk om logboodschappen tussen deze twee te tonen!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10084,34 +10258,34 @@ msgstr "" msgid "Their file:" msgstr "Hun bestand:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Van hun" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Er zijn momenteel %d overlay handlers geïnstalleerd naast die van Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Er zijn meerdere bewerkbare overzichten.\nWelk overzicht wil je opslaan?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Er zijn geen issue-tracker providers beschikbaar." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10120,85 +10294,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Er zijn nog steeds onopgeloste conflicten op regel %d!\nDeze moeten opgelost worden voordat u opslaat.\nWilt u het bestand opslaan inclusief de conflicten?\nAls u op Ja klikt dan dient u de conflicten handmatig op te lossen in een ander programma!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Wijzigingen zijn nog niet opgeslagen!\nWilt u de wijzigingen opslaan?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Thesaurus" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Deze zijn recentelijker opgeslagen dan de huidig geopende documenten en bevatten wijzigingen die aangebracht zijn voordat het programma werd afgesloten." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Dit veld is verplicht en mag niet leeg zijn." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Dit is geen geldige URL.\nGeef hier a.u.b. een URL op." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Dit is geen geldig pad!\nEen geldig pad onder Windows mag geen '<<>|\"?*:' bevatten en niet een van de volgende namen zijn:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Dit programma is gekoppeld aan de ontbrekende %s in bestand %s. Deze computer heeft mogelijk een incompatibele versie van %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Voor dit programma is het bestand %s vereist, maar dat ontbreekt op deze computer." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Deze eigenschap is alleen geldig voor mappen, niet voor bestanden." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Deze actie vereist een schone werkmap." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Hiermee verwijdert u de informatie over gebruikte commando's en herstelt u de standaard set van zichtbare commando's in de menu's en werkbalken. Uw eigen aanpassingen blijven intact. Weet u zeker dat u dit wilt uitvoeren?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "3-weg vergelijking" @@ -10214,14 +10388,14 @@ msgstr "&Horizontaal verdelen" msgid "To" msgstr "Aan" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "Om te voorkomen dat de verkeerde labels worden opgehaald,\nwordt u geadviseerd het ophalen van labels voor dit extern archief uit te schakelen.\nLabels ophalen uitschakelen?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10233,13 +10407,13 @@ msgstr "Om tijdelijke bestanden te verwijderen, moet u zeker zijn dat er geen an msgid "To:" msgstr "Aan:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Wissel tussen enkele/dubbele paginaweergave\nWissel tussen enkele/dubbele paginaweergave" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10251,11 +10425,11 @@ msgstr "Werkbalk" msgid "Toolbar Name" msgstr "Werkbalk naam" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Werkbalk opties" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Interne werkbalk-fout. Neem contact op met de applicatie-beheerder." @@ -10271,16 +10445,16 @@ msgstr "Gereedschappen" msgid "Tools:" msgstr "Gereedschappen:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10290,20 +10464,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit heeft vergelijkbare bestandsnamen gedetecteerd. Wilt u de bestanden:%s\nook hernoemen?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit zal de volgende overlays neit tonen: %s" @@ -10312,18 +10486,18 @@ msgstr "TortoiseGit zal de volgende overlays neit tonen: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame was al geïnitialiseerd voor het archief \"%s\". Kan niet omschakelen naar een ander archief (\"%s\") nadat de applicatie gestart is." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10339,7 +10513,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10347,7 +10521,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10361,16 +10535,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10379,18 +10553,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge kan dit patchbestand niet verwerken. De bestandsnaam \"%s\" komt meer dan één keer voor." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10429,11 +10603,11 @@ msgstr "Volg" msgid "Tracked Remote Branch:" msgstr "Gevolgde Externe Branch:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Versturen met %s" @@ -10442,39 +10616,35 @@ msgstr "Versturen met %s" msgid "Transparent &color..." msgstr "&Doorzichtige kleur..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Probeer te 'Schonen'. Indien het probleem blijft dient u opnieuw op te halen. " -#. Resource IDs: (73) -msgid "Try again" -msgstr "Opnieuw proberen" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turks" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Pas TortoiseGit Aan" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Type" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Type:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10498,24 +10668,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Mailsysteemondersteuning kan niet geladen worden." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Commando kan niet verwerkt wordenl, server is bezig." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Kan niet lezen uit %1, het is geopend door iemand anders." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Alleen-schrijven eigenschap kan niet gelezen worden." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10523,91 +10693,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Het pad naar het bestand in de werkmap kon niet bepaald worden!\nDit kan gebeuren als het bestand hernoemd is.\nProbeer het logboek op het betreffende bestand te openen en de wijzigingen ongedaan te maken\nin het bovenste venster in het logboekscherm." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Alleen-lezen eigenschap kan niet geschreven worden." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Kan niet schrijven naar %1, het is geopend door iemand anders of als alleen-lezen gemarkeerd." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Niet markeren" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Ongedaan maken" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "%d acties ongedaan maken" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Eén actie ongedaan maken" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Maak Toevoegen Ongedaan..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Maak laatste actie ongedaan\nOngedaan maken" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "De laatste wijzigingen ongedaan maken\nOngedaan maken" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Onverwacht bestandsformaat." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Uitklappen" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Ongeformatteerde tekst\ntekst zonder enige opmaak" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Unified &diff van HEAD revisies" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Onbekend" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Onbekende diepte" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Onopgeloste conflicten!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Naamloos" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Zonder versiebeheer" @@ -10615,7 +10789,7 @@ msgstr "Zonder versiebeheer" msgid "Unversioned files mark parent folder as modified" msgstr "Bestanden zonder versiebeheer markeren map als gewijzigd" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Versiebeheer verwijderen van %s" @@ -10628,23 +10802,23 @@ msgstr "Omhoog" msgid "Update" msgstr "Update" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Referentie Bijwerken" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Submodules Bijwerken" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Ververst" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "ActiveX objecten worden bijgewerkt" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Bezig met het bijwerken van de index..." @@ -10656,30 +10830,26 @@ msgstr "Gebruik &standaardbeeld:" msgid "Use &one-pane view as default for 2-file diff" msgstr "&Enkel-venster als standaard instellen voor 2-weg Diff" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Gebruik &ander tekstgedeelte" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Gebruik 'mijn' tekstblok" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Gebruik 'mijn' tekstblok en dan 'hun' tekstblok" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Gebruik 'hun' tekstblok" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Gebruik 'hun' tekstblok en dan 'mijn' tekstblok" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Gebruik blokken" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Gebruik HTTP padcomponent" @@ -10700,15 +10870,15 @@ msgstr "Extra Com&pressie (Voor trage netwerkverbindingen)" msgid "Use Unified Diff from &clipboard" msgstr "Gebruik Unified Diff van &klembord" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Voer een andere naam in of gebruik de \"Overschrijf branch\" instelling." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10718,7 +10888,7 @@ msgstr "Gebruik alle inhoud van het linker venster\nGebruik linker bestand" msgid "Use block from left before right" msgstr "Gebruik linker stuk voor rechter stuk" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10728,25 +10898,25 @@ msgstr "Gebruik het stuk van het linker venster voor het stuk van het rechter ve msgid "Use block from right before left" msgstr "Gebruik rechter stuk voor linker stuk" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Gebruik het stuk van het rechter venster voor het stuk van het linker venster\nGebruik rechter stuk voor linker stuk" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Gebruik beide tekstgedeeltes (deze eerst)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Gebruik beide tekstgedeeltes (deze laatst)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Gebruik linker blok" @@ -10762,15 +10932,15 @@ msgstr "Gebruik lokale branch kleur voor huidige branch" msgid "Use recycle bin when reverting" msgstr "Gebruik prullenbak bij herstellen" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Gebruik reguliere expressie" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Gebruik rechterblok" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Gebruik spaties" @@ -10778,61 +10948,61 @@ msgstr "Gebruik spaties" msgid "Use system locale for date/time" msgstr "Gebruik systeem landinstellingen voor datum/tijd" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Gebruik tekstgedeelte uit '&mijn'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Gebruik tekstgedeelte van 'h&un'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Gebruik tekstgedeelte uit 'm&ijn' vóór 'hun'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Gebruik tekstgedeelte uit 'mijn' vóór 'hun'\nGebruik 'mijn' tekstgedeelte en dan 'hun'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Gebruik tekstgedeelte uit 'mijn'\nGebruik 'mijn' tekstgedeelte" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Gebruik tekstgedeelte uit '&hun' vóór 'mijn'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Gebruik tekstgedeelte uit 'hun' vóór 'mijn'\nGebruik 'hun' tekstgedeelte en dan 'mijn'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Gebruik tekstgedeelte uit 'hun'\nGebruik 'hun' tekstgedeelte" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Gebruik tekstgedeelte uit linker venster\nGebruik linker stuk" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Gebruik d&it tekstgedeelte" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10840,7 +11010,7 @@ msgid "" "%s" msgstr "Gebruik het gevonden pad.\nPatch toepassen op\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10852,19 +11022,19 @@ msgstr "Gebruik het originele pad.\nPatch toepassen op\n%s" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "&Gebruik dit gehele bestand" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Gebruik dit blok links" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Gebruik het gehele andere &bestand" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10880,11 +11050,11 @@ msgstr "Gebruikersinformatie" msgid "User Name:" msgstr "Naam Gebruiker:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "De gebruiker heeft afgebroken" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10894,11 +11064,11 @@ msgstr "Gebruikersnaam en -e-mail moet ingesteld zijn voordat u een vastlegging msgid "User&name:" msgstr "Gebruikers&naam:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Gebruikersnaam:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10917,7 +11087,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Waarde" @@ -10925,24 +11095,24 @@ msgstr "Waarde" msgid "Version" msgstr "Versie" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Versie 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Versie 1 (Recentere commit tijd)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Versie 2 (Basis)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Versie 2 (Basis) (Recentere commit tijd)" @@ -10950,11 +11120,11 @@ msgstr "Versie 2 (Basis) (Recentere commit tijd)" msgid "Version Information" msgstr "Versie-informatie" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versie:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Onder beheer" @@ -10966,23 +11136,27 @@ msgstr "Vietnamees" msgid "View" msgstr "Bekijk" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Bekijk .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Bekijk Patch" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Bekijk Patch>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Bekijk revisie voor dit pad in &webviewer" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Bekijk revisie in alternatieve editor" @@ -10994,11 +11168,11 @@ msgstr "&Bekijk systeembrede gitconfig" msgid "Visit our website" msgstr "Bezoek onze website" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11009,7 +11183,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "WAARSCHUWING:\r\nWijzig deze instellingen alleen als u weet wat u doet!\r\nOm de standaardwaardes te gebruiken maakt u de tekst leeg." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Wacht" @@ -11017,7 +11191,7 @@ msgstr "Wacht" msgid "Wait for the script to finish" msgstr "Wacht op het beëindigen van het script" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Wachten op input" @@ -11025,15 +11199,15 @@ msgstr "Wachten op input" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Waarschuwing" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Waarschuwing!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11041,7 +11215,7 @@ msgid "" "Do you really want to continue?" msgstr "Waarschuwing: \"%s\" zal permanent verwijderd worden. Dit kan NIET hersteld worden!\n\nWeet u zeker dat u wilt doorgaan?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11049,56 +11223,56 @@ msgstr "Web" msgid "Western European" msgstr "West-Europeaans" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Negeer wijzigingen in witruimte voor relevante regel bij het toepassen van een patch" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Activeer deze optie om alle onderdelen onder versiebeheer automatisch te selecteren bij het vastleggen" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Als de patch niet juist kon worden toegepast, val terug op een 3-wegs merge als de patch de identiteit van de data die het hoort toe te passen bevat en deze data lokaal beschikbaar is" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11108,15 +11282,15 @@ msgid "" "authentication and/or encryption." msgstr "Zolang de server draait is alle data van dit archief openbaar zonder authenticatie en/of encryptie." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Wijzigingen in witruimte (tabs, spaties)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Spaties en lege regels" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Vensterpositie" @@ -11124,15 +11298,15 @@ msgstr "Vensterpositie" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11176,11 +11350,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "Binnen een bestand:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Binnen bestand" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Werkmap" @@ -11188,29 +11362,25 @@ msgstr "Werkmap" msgid "Working Tree Path:" msgstr "Pad Werkmap:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Wijzigingen werkmap" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Terugloop bij lange regels" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Laat lange regels afbreken aan het einde van het venster\nTerugloop bij lange regels" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Ja" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Ja op alles" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "De meest recente versie is reeds geïnstalleerd." @@ -11220,51 +11390,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Hier kunnen overlay handlers uitgeschakeld worden.\nUitgeschakelde handlers gebruiken geen overlay posities en geven daarmee andere shell-extensies de ruimte om hun overlays te tonen." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "U kunt alleen een bitmap plakken met afmeting (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "U kunt maximaal %d zelfgedefiniëerde werkbalken maken!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Deze eigenschap kan alleen op bestanden worden gezet, niet op mappen!\nAls u hem op alle bestanden in de map wilt zetten, gebruik\ndan de optie 'recursief'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "U kunt het type van de referentie niet wijzigen met een hernoeming." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "U heeft \"inclusief ongevolgd\" aangevinkt.\nDit zorgt voor een \"git clean -fd\" commando, dus genegeerde bestanden/mappen worden verwijderd zonder de prullenbak te gebruiken." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "U heeft eigenschappen gewijzigd zonder ze op te slaan.\nWilt u ze nu opslaan?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11272,67 +11442,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Je hebt %d items geselecteerd om te vergelijken.\nVoor elk item wordt een nieuwe instantie van de vergelijkingsviewer gestart.\nWeet je zeker dat je zoveel items tegelijkertijd wilt vergelijken?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "U heeft geen issue nummer ingevuld.\nWeet u zeker dat u wilt vastleggen zonder een issue number?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "U heeft geen Signed-Off-By regel ingevoerd!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "U kunt maximaal %d gereedschappen definiëren." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "U moet een logbericht invoeren voor de vastlegging" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Het systeem moet herstart worden om de instellingen te activeren." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "U moet een bestandsnaam kiezen voor het ZIP-bestand!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "U heeft een map geselecteerd.\nExporteren is alleen mogelijk naar een (ZIP) bestand." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "U heeft een bestand zonder versiebeheer geselecteerd.\nHet bestand wordt toegevoegd aan het versiebeheer wanneer een vastlegging wordt uitgevoerd." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "U moet een tekst opgeven!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "U moet een afbeelding kiezen!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "De pictogrammenset is gewijzigd van %s in %s.\nDeze wijziging heeft pas effect nadat u zich opnieuw heeft aangemeld of de computer heeft herstart!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11342,7 +11512,7 @@ msgstr "De eerder ingevoerde boodschappen zijn bewaard.\nKlik hier om ze te leze msgid "Your version is:" msgstr "Uw versie is:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Uw versie is: %d.%d.%d.%d" @@ -11352,10 +11522,10 @@ msgid "Zip File" msgstr "Zip-bestand" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Uitzoomen" +msgid "Zoo&m out\t-" +msgstr "&Uitzoomen\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Inzoomen" @@ -11367,80 +11537,80 @@ msgstr "&Inzoomen" msgid "Zoom &Out" msgstr "&Uitzoomen" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Inzoomen\nInzoomen" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Uitzoomen\nUitzoomen" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "&Inzoomen" +msgid "Zoom i&n\t+" +msgstr "&Inzoomen\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Inzoomen" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Uitzoomen" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Passend weergeven" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Passend in hoogte weergeven" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Passend in breedte weergeven" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Standaard]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[niet toegewezen]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" is ongeldig." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" is geen git archief" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11454,7 +11624,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "toegevoegd" @@ -11462,7 +11632,7 @@ msgstr "toegevoegd" msgid "added files" msgstr "toegevoegde bestanden" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "een bestand zonder naam" @@ -11470,14 +11640,19 @@ msgstr "een bestand zonder naam" msgid "and support the developers" msgstr "en ondersteun de ontwikkelaars" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "auteur" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "gebaseerd op TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11510,30 +11685,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "vastleggingen" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "geconflicteerd" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "gekopieerd van\r\n%s - revisie %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dag" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "verwijderd" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11545,7 +11720,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "Instellingen E-mail" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11554,16 +11729,16 @@ msgid "" "%s" msgstr "%s\nis geëxporteerd naar\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "extern" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git is niet juist afgesloten (exit code %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "genegeerd" @@ -11571,15 +11746,15 @@ msgstr "genegeerd" msgid "include &untracked" msgstr "incl&usief ongevolgd" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "onvolledig" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "overerven" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "object lokaal bewaard" @@ -11587,7 +11762,7 @@ msgstr "object lokaal bewaard" msgid "keep the file lists in English" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11596,7 +11771,7 @@ msgid "" "%s = %ld" msgstr "regel: %d(+) %d(-) bestanden: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11611,11 +11786,11 @@ msgstr "regel: %d(+) %d(-) bestanden: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "samengevoegd" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "ontbrekend" @@ -11623,7 +11798,7 @@ msgstr "ontbrekend" msgid "missing/deleted/replaced" msgstr "ontbrekend/verwijderd/vervangen" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "gewijzigd" @@ -11631,7 +11806,7 @@ msgstr "gewijzigd" msgid "modified/copied" msgstr "gewijzigd/gekopieerd" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "maand" @@ -11639,40 +11814,44 @@ msgstr "maand" msgid "new branch" msgstr "nieuwe branch" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nee" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "voor dit commando is geen beschrijving beschikbaar" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "zonder versiebeheer" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "gewoon" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "niet gevonden" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "versperd" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "op %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixels" @@ -11680,11 +11859,11 @@ msgstr "pixels" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "kwartaal" @@ -11692,35 +11871,35 @@ msgstr "kwartaal" msgid "renamed" msgstr "hernoemd" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "vervangen" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "scan pad:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "skip-worktree" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "gewisseld naar\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "naar %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "naar %s" @@ -11729,35 +11908,35 @@ msgstr "naar %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "week" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - alle Windows gebruikers" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - huidige Windows gebruiker" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - alleen dit archief" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - huidige Windows gebruiker" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - alleen dit archief" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "jaar" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "ja" diff --git a/Languages/Tortoise_pl_PL.po b/Languages/Tortoise_pl_PL.po index c60bf1fb1..2fbdc2d76 100644 --- a/Languages/Tortoise_pl_PL.po +++ b/Languages/Tortoise_pl_PL.po @@ -7,6 +7,8 @@ # Andrzej Kukuła , 2013 # Andrzej Kukuła , 2013 # Begina Felicysym <>, 2011 +# Jarosław Pękala , 2013 +# jotpeg , 2013 # kkotowicz , 2011 # kkotowicz , 2011 # kkotowicz , 2011 @@ -22,9 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/tortoisegit/language/pl_PL/)\n" "MIME-Version: 1.0\n" @@ -33,7 +35,7 @@ msgstr "" "Language: pl_PL\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -55,138 +57,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "Liczba autorów do pokazania osobno: #" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB przesłanych" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 zawierał niespodziewany obiekt" -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 zawiera niepoprawną ścieżkę." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 zawiera niepoprawny schemat." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 ma niepoprawny format." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 nie został znaleziony." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! dzień temu" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! dni temu" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! godzin temu" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! godzin temu" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! minut temu" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! miesiące temu" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! miesięcy temu" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! sekund temu" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! sekund temu" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! tydzień temu" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! tygodni temu" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! rok temu" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! lat temu" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "Zaznaczono %1!d! pozycji" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minut temu" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nWyświetla %2!d! pliki, %3!d! podmoduły i %4!d! katalogi, %5!d! pozycji " -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nRozmiar %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\\n Kontynuować wykonywanie skryptu?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -194,52 +196,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nNie można odnaleźć tego pliku.\nProszę sprawdzić poprawność ścieżki i nazwy pliku." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bajtów przesłanych" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB przesłanych" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d zmienionych plików" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d usuniętych plików." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d plików przywrócono do %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d wybranych plików, %d plików ogółem" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d najbardziej aktywny(ch) autorów z przynajmniej %d zapisami zmian (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -247,78 +249,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alfa\nkliknij, aby przełączyć alfa \nkliknij dwukrotnie, aby automatycznie przełączać alfa" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minut(y) i %ld sekund(y)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld z %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - w wersji: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Odzyskano]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s w %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s wymaga Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Kopia robocza" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Eksport (%d) %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Eksport %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\\n %s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nNie może być prawidłowo poprawione." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\\nCzy mimo to chcesz usunąć?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -334,6 +336,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-stronne scalanie" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&O TortoiseGitBlame..." @@ -362,15 +368,15 @@ msgstr "&Dodaj filtr" msgid "&Add New/Save" msgstr "&Dodaj nowy/Zapisz" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Dodaj go" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Dodaj lub usuń przyciski" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Dodaj..." @@ -410,7 +416,7 @@ msgstr "&Przypisz" msgid "&Associate double-click event with:" msgstr "&Przypisz dwuklik do akcji:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Autoukrywanie" @@ -426,15 +432,15 @@ msgstr "Autoładowanie klucza Putty" msgid "&Backup original file" msgstr "Zrób &kopię oryginalnego pliku" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Adnotuj" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Adnotuj zmiany" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Adnotuj wersje" @@ -458,7 +464,7 @@ msgstr "&Gałąź:" msgid "&Browse Dir" msgstr "&Przeglądaj folder" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Przeglądaj repozytorium" @@ -494,7 +500,7 @@ msgstr "&Kategoria:" msgid "&Choose commands from:" msgstr "&Wybierz polecenia z:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Uporządkuj..." @@ -518,7 +524,7 @@ msgstr "&Zamknij okno(a)" msgid "&Command:" msgstr "&Polecenie:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Zatwierdź" @@ -526,23 +532,27 @@ msgstr "&Zatwierdź" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Zatwierdź " -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Zatwierdź zmiany..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Porównaj wersje" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Skompresowany wykres" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopiuj" @@ -562,11 +572,11 @@ msgstr "&Użytkownika" msgid "&Default" msgstr "&Domyślnie" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Usuń" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Usuń (zachowaj lokalnie)" @@ -574,7 +584,7 @@ msgstr "&Usuń (zachowaj lokalnie)" msgid "&Delete Filter" msgstr "&Usuń filtr" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Usuń zdalne && lokalne" @@ -586,11 +596,11 @@ msgstr "&Wykryj przeniesione lub skopiowane wiersze" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Porównaj" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Porównaj z poprzednią wersją" @@ -602,7 +612,7 @@ msgstr "Katalog:" msgid "&Disabled" msgstr "&Zablokuj" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Odrzuć" @@ -610,7 +620,7 @@ msgstr "&Odrzuć" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Dokowanie" @@ -618,11 +628,15 @@ msgstr "&Dokowanie" msgid "&Don't ask me again" msgstr "&Nie pytaj ponownie" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&W dół" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Pobierz" @@ -630,11 +644,11 @@ msgstr "&Pobierz" msgid "&Edit" msgstr "&Edytuj" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Edytuj .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Edytuj wszystko" @@ -642,7 +656,7 @@ msgstr "&Edytuj wszystko" msgid "&Edit Filter" msgstr "&Edytuj filtr" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Edytuj konflikty" @@ -667,10 +681,10 @@ msgid "&Enable edit" msgstr "&Włącz edytowanie" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Eksportuj wybrane elementy do..." @@ -682,27 +696,27 @@ msgstr "&Zewnętrzny" msgid "&File" msgstr "&Plik" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Znajdź" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Znajdź\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Dopasuj obrazki do okna" +msgid "&Fit images in window\tF" +msgstr "&Dopasuj obrazki do okna\tD" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Dyski twarde" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Pływające" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "Ś&ledź zmiany nazw" @@ -714,7 +728,7 @@ msgstr "&Czcionka opisów zmian:" msgid "&Font:" msgstr "&Czcionka:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Wymuś" @@ -734,7 +748,7 @@ msgstr "&Git Styl zatwierdzenia (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Idź do \tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -746,7 +760,7 @@ msgstr "&Zielony:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Pomoc" @@ -754,7 +768,7 @@ msgstr "&Pomoc" msgid "&Help Topics" msgstr "Tematy &pomocy" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Ukryj" @@ -762,11 +776,11 @@ msgstr "&Ukryj" msgid "&Icon Set:" msgstr "&Zestaw ikon:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignoruj" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Pomiń %d elementów wg nazwy" @@ -780,14 +794,14 @@ msgid "&Image" msgstr "&Obraz" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informacje o obrazku" +msgid "&Image info\tI" +msgstr "&Informacje o obrazku\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Tylko obraz" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importuj..." @@ -799,7 +813,7 @@ msgstr "&Katalog początkowy:" msgid "&Initialize submodules (--init)" msgstr "Zainicjuj podmoduły (- init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Zainstaluj" @@ -811,11 +825,11 @@ msgstr "Podczas ładowania &skocz do pierwszej różnicy" msgid "&Keep CR" msgstr "&Zachowaj CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Zachowaj aktualny stan" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Etykiety" @@ -843,7 +857,7 @@ msgstr "&Limit:" msgid "&Line number" msgstr "Numer &linii" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Numer &linii (%d - %d)" @@ -860,7 +874,7 @@ msgstr "&Widok listy" msgid "&Local Branch:" msgstr "&Lokalna gałąź:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -884,11 +898,11 @@ msgstr "&Animacje menu:" msgid "&Menu contents:" msgstr "&Zawartość menu:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Scal" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Scal..." @@ -938,12 +952,16 @@ msgstr "&Nowy..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Następne >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Następna strona" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Bez zdarzenia dwukliku" @@ -960,11 +978,11 @@ msgstr "&Nic" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Jedna strona" @@ -972,19 +990,15 @@ msgstr "&Jedna strona" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Otwórz" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Otwórz stronę Git dla Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Otwórz...\tCtrl+O" @@ -997,18 +1011,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Nałóż obrazy" +msgid "&Overlay images\tO" +msgstr "&Nałóż obrazy\tN" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Hasło:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Wklej" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Wybierz WSZYSTKO" @@ -1016,7 +1030,7 @@ msgstr "&Wybierz WSZYSTKO" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Podgląd wydruku" @@ -1024,11 +1038,15 @@ msgstr "&Podgląd wydruku" msgid "&Print..." msgstr "&Drukuj..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Drukuj...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Pobierz" @@ -1036,10 +1054,14 @@ msgstr "&Pobierz" msgid "&Push all branches" msgstr "&Wypchnij wszystkie gałęzie" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Ostatnie komunikaty" @@ -1052,7 +1074,7 @@ msgstr "&Rekurencyjne" msgid "&Red:" msgstr "&Czerwony:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Ponów" @@ -1068,7 +1090,7 @@ msgstr "&Odśwież" msgid "&Regular Expression" msgstr "&Wyrażenia regularne" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Przypomnij mi później" @@ -1076,7 +1098,7 @@ msgstr "&Przypomnij mi później" msgid "&Remote Branch:" msgstr "&Zdalna gałąź:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1084,7 +1106,7 @@ msgstr "" msgid "&Remote:" msgstr "&Zdalny:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Usuń" @@ -1096,7 +1118,7 @@ msgstr "&Usuń plik z indeksu" msgid "&Replace" msgstr "&Zastąp" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Przeglądarka repozytorium" @@ -1104,7 +1126,7 @@ msgstr "&Przeglądarka repozytorium" msgid "&Reset" msgstr "&Zresetuj" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Zresetuj pasek narzędzi" @@ -1120,23 +1142,27 @@ msgstr "&Usuń dane nt. użycia" msgid "&Reset to Default" msgstr "&Przywróć wartości domyślne" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Rozwiązany" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Przywróć" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Przywróć poprzedni stan" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Cofnij zmianę wprowadzoną przez to zatwierdzenie" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Cofnij zmiany wprowadzone przez te zatwierdzenia" @@ -1148,7 +1174,7 @@ msgstr "&Klient SSH:" msgid "&Saturation:" msgstr "&Nasycenie:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Zapisz" @@ -1156,15 +1182,19 @@ msgstr "&Zapisz" msgid "&Save authentication" msgstr "&Zapisz parametry uwierzytelnienia" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Zapisz wykres jako..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Zapisz listę wybranych plików do..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Zapisz\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1172,7 +1202,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Ustawienia" @@ -1192,7 +1222,7 @@ msgstr "&Pokaż etykiety" msgid "&Signing key ID:" msgstr "&ID zarejestrowanego klucza:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Pomiń" @@ -1200,7 +1230,7 @@ msgstr "&Pomiń" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1212,7 +1242,7 @@ msgstr "&Start" msgid "&Start Group" msgstr "&Grupa startowa" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1232,7 +1262,7 @@ msgstr "&Widok symboli" msgid "&Tab size:" msgstr "Rozmiar &tabulatora:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Dokument z zakładkami" @@ -1240,7 +1270,7 @@ msgstr "&Dokument z zakładkami" msgid "&Tag" msgstr "Tag" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Tagi" @@ -1276,7 +1306,7 @@ msgstr "&Paski narzędzi i okna dokujące" msgid "&Toolbars:" msgstr "&Pasek narzędzi:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1288,7 +1318,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dwie strony" @@ -1296,15 +1330,15 @@ msgstr "&Dwie strony" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Cofnij" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Plik różnicowy" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Plik różnicowy" @@ -1316,7 +1350,7 @@ msgstr "&Dyski nieznanych typów" msgid "&Up" msgstr "&W górę" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Uaktualnij element do wersji" @@ -1328,11 +1362,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Używaj podpowiadania ścieżek plików i słów kluczowych" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Użytkownik:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Widok" @@ -1340,7 +1374,7 @@ msgstr "&Widok" msgid "&View:" msgstr "&Pokaż:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Ostrzegaj o brakującym Signed-Off-By przy zatwierdzaniu" @@ -1356,6 +1390,10 @@ msgstr "&Całe słowo" msgid "&Within file" msgstr "Wewnątrz piliku" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Ignoruj zmiany białych znaków" @@ -1364,46 +1402,46 @@ msgstr "&Ignoruj zmiany białych znaków" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(z %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(brak listy zmian)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(brak numeru linii)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(brak wartości)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nie znaleziono)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(nieznany)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- wszystko -" @@ -1411,13 +1449,14 @@ msgstr "- wszystko -" msgid "--&all" msgstr "--&wszystko" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1425,7 +1464,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1441,7 +1480,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr ".gitignore w katalogu głównym repozytorium" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1457,31 +1496,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1490,66 +1529,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit jest rozszerzeniem powłoki systemu.\nOznacza to, że jest zintegrowany z eksploratorem Windows.\nAby użyć TortoiseGit proszę otworzyć eksplorator i kliknąć prawym klawiszem myszy\nna wybranym folderze, aby wywołać menu kontekstowe z wszystkimi poleceniami TortoiseGit.\nPrzeczytaj też instrukcję obsługi!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Uwaga: Nie zostało sprawdzone, czy te gałęzie zostały w pełni scalone w HEAD." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Wykonanie tego działania spowoduje usunięcie gałęzi zdalnej." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Uwaga: Ta gałąź nie została w pełni scalona w HEAD." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1557,7 +1596,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1569,71 +1608,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Gałąź o tej nazwie już istnieje." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Jest dostępna nowsza wersja. Proszę pobrać aktualną wersję!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Lista ścieżek, dla których ikony nakładkowe są wyświetlane.\nSeparatorem jest znak nowej linii.\nUżycie znaku '*' na końcu ścieżki spowoduje objęcie wyświetlaniem także wszystkich plików i katalogów poniżej tej ścieżki." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Lista ścieżek, dla których menu kontekstowe nie jest wyświetlane.\nSeparatorem jest znak nowej linii.\nUżycie znaku '*' na końcu ścieżki spowoduje wyłączenie wyświetlania także we wszystkich plikach i podkatalogach w ramach tej ścieżki.\nPusta lista oznacza wyświetlanie menu kontekstowego dla wszystkich ścieżek." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Lista ścieżek, dla których ikony nakładkowe nie są wyświetlane.\nSeparatorem jest znak nowej linii.\nUżycie znaku '*' na końcu ścieżki spowoduje wyłączenie wyświetlania także we wszystkich plikach i podkatalogach w ramach tej ścieżki.\nPusta lista oznacza wyświetlanie ikon dla wszystkich ścieżek." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Żądany zasób nie był dostępny." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Tag o tej nazwie już istnieje." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Program do przeglądania plików różnicowych GNU (plików poprawek).\nJeśli nie posiadasz takiego programu, użyj Notatnika." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "O& programie" @@ -1649,23 +1688,23 @@ msgstr "Skracaj zmiany nazw" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Przerwij" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "&Anuluj scalanie" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "Zatrzymaj scalanie" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Informacje o" @@ -1685,12 +1724,12 @@ msgstr "O programie TortoiseGitMerge" msgid "Accept certificate" msgstr "Zaakceptuj certyfikat" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Brak dostępu do %1." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Akcja" @@ -1698,26 +1737,26 @@ msgstr "Akcja" msgid "Action log" msgstr "Log akcji" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Akcje" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Uaktywnij listę zadań" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktywne pliki" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Obiekty ActiveX nie mogą być zapisane w trakcie wychodzenia z Windows!\nPorzucić wszystkie zmiany w %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Dodaj" @@ -1725,7 +1764,7 @@ msgstr "Dodaj" msgid "Add &Signed-off-by" msgstr "Dodaj &Signed-off-by" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Dodaj '%s' do słownika" @@ -1738,15 +1777,15 @@ msgstr "Dodaj zdalny" msgid "Add \"&Signed-off-by\"" msgstr "Dodaj \"&Signed-off-by\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Dodaj program do porównywania plików, zależny od rozszerzenia pliku" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Dodaj program do scalania plików, zależny od rozszerzenia pliku" @@ -1754,15 +1793,15 @@ msgstr "Dodaj program do scalania plików, zależny od rozszerzenia pliku" msgid "Add new files automatically to Git" msgstr "Automatycznie dodawaj nowe pliki do Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Dodaj do listy &ignorowanych" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Dodaj do Paska Szybkiego Dostępu" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Dodaj..." @@ -1770,11 +1809,11 @@ msgstr "Dodaj..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Dodaj/edytuj program do porównywania/scalania plików, zależny od typu pliku" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Dodano" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1782,25 +1821,25 @@ msgid "" "to the ignore list." msgstr "Dodano maskę (maski) plików\n%s\ndo listy ignorowanych." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Dodawanie" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Dodaje plik(i) do kontroli Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Dodaje zaznaczone plik(i) lub maski plików do listy ignorowanych." -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Wyświetla okno ustawień\nUstawienia" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Zaawansowane" @@ -1808,43 +1847,43 @@ msgstr "Zaawansowane" msgid "Advanced Diff/Merge Settings" msgstr "Zaawansowane opcje Porównywania/Scalania" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Zaawansowane opcje Porównywania" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Zaawansowane opcje Scalania" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Wszystkie" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Wszystkie polecenia" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Wszystkie pliki (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Wszystkie pliki (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Każdy rodzic" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Wszystkie lokalne gałęzie" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Wszystkie tagi" @@ -1852,47 +1891,47 @@ msgstr "Wszystkie tagi" msgid "All tags only" msgstr "Wyłącznie wszystkie tagi" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Wszystkie twoje zmiany zostaną utracone! Na pewno chcesz przywrócić wszystkie paski narzędzi i menu?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Wszystkie twoje zmiany zostaną utracone! Na pewno chcesz przywrócić przypisania skrótów klawiaturowych?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Wszystkie twoje zmiany zostaną utracone! Na pewno chcesz przywrócić menu '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Wszystkie twoje zmiany zostaną utracone! Na pewno chcesz przywrócić pasek narzędzi '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" -msgstr "" +msgstr "Pozwól na edycję dla tego widoku\nPozwól na edycję" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1908,11 +1947,11 @@ msgstr "" msgid "Always show long format" msgstr "Zawsze pokazuj dugi format" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Zawsze używaj systemowych ustawień regionalnych, aby pokazywać datę i czas" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Zmień" @@ -1920,12 +1959,12 @@ msgstr "Zmień" msgid "Amend &Last Commit" msgstr "Popraw &ostatnie zatwierdzenie" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Skonfiguruj alternatywny edytor. Najlepiej taki, który może obsłużyć zakończenia linii *nix." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1936,7 +1975,7 @@ msgid "" "%mine: the modified file" msgstr "Zewnętrzny program używany\ndo porównywania plików w różnych wersjach\n\nMożesz go wywołać z następującymi parametrami:\n%base: plik bazowy\n%mine: plik z twoimi zmianami" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1949,36 +1988,36 @@ msgid "" "%base: the original file without your changes" msgstr "Zewnętrzny program do scalania plików\nużywany w celu rozwiązania konfliktów między różnymi wersjami pliku.\n\nMożesz go wywołać z następującymi parametrami:\n%merged: plik z konfliktem, do zapisu\n%theirs: plik w wersji jak w repozytorium\n%mine: plik z twoimi zmianami\n%base: oryginalny plik przed twoimi zmianami" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Niepoprawny uchwyt pliku skojarzony z %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Wystąpił błąd nieznanego typu." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Wystąpił nieoczekiwany błąd podczas dostępu do %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "W linii %d wystąpił nieznany typ linii!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" -msgstr "" +msgstr "Dopisz prawy blok" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" -msgstr "" +msgstr "Dopisz ten blok do lewej strony" #. Resource IDs: (65535) msgid "Application Frame Menus: " @@ -1988,11 +2027,11 @@ msgstr "Menu ramek aplikacji: " msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Zastosuj poprawkę..." @@ -2000,7 +2039,7 @@ msgstr "Zastosuj poprawkę..." msgid "Apply Patches" msgstr "Zastosuj poprawki" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Zastosuj serię poprawek ze skrzynki pocztowej" @@ -2008,7 +2047,7 @@ msgstr "Zastosuj serię poprawek ze skrzynki pocztowej" msgid "Apply unified diff" msgstr "Zastosuj plik różnicowy w formacie Unified Diff" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Styl aqua" @@ -2016,39 +2055,39 @@ msgstr "Styl aqua" msgid "Arabic" msgstr "arabski" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "Dowolny &URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Czy na pewno chcesz przerwać proces zmiany bazy?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Czy chcesz oznaczyć konflikty w pliku(-ach) jako rozwiązane?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Na pewno chcesz wycofać zmiany %d element(ów)? Oznacza to utratę wszystkich zmian od czasu ostatniej aktualizacji!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Porządkowanie p&ionowe" +msgid "Arrange &vertical\tV" +msgstr "Porządkowanie p&ionowe\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Przypisano do listy zmian '%s'" @@ -2057,11 +2096,11 @@ msgstr "Przypisano do listy zmian '%s'" msgid "Assigned to:" msgstr "Przypisano do:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Adnotuj zmiany" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2073,34 +2112,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "W wersji: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "W tej chwili można zmieniać tylko nazwy gałęzi." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Próba wykonania niedozwolonej operacji." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Wystąpiła próba dostępu do %1 poza jego końcem." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Próba odczytu z zapisywanego %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Próba zapisu do odczytywanego %1." @@ -2117,11 +2156,11 @@ msgstr "Autoryzacja" msgid "Authentication data" msgstr "Dane autoryzacji" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "E-mail autora" @@ -2129,7 +2168,7 @@ msgstr "E-mail autora" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autorzy" @@ -2151,11 +2190,11 @@ msgstr "Automatyczna konwersja CrLf" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Auto-ukrywanie" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Automatycznie ukryj" @@ -2163,23 +2202,23 @@ msgstr "Automatycznie ukryj" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Automatycznie zamykaj jeśli nie ma konfliktów" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Automatycznie zamykaj, jeśli nie ma błędów" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Automatycznie zamykaj, jeśli nie scalono, nie dodano lub nie usunięto" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2193,7 +2232,7 @@ msgstr "AutoŁadowanie &klucza Putty" msgid "Autoload Putty &Key" msgstr "Autoładowanie &klucza Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatyczny" @@ -2203,7 +2242,7 @@ msgstr "Sprawdzaj raz na tydzień, czy są &nowe wersje" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Test autotekstu" #. Resource IDs: (1157) msgid "Average" @@ -2213,7 +2252,7 @@ msgstr "Średnia" msgid "B&rowse..." msgstr "Prze&glądaj..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Wstecz" @@ -2225,7 +2264,7 @@ msgstr "Tło" msgid "Baltic" msgstr "Bałtycki" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Wykres kolumnowy" @@ -2245,7 +2284,7 @@ msgstr "Plik bazowy:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "W oparciu o TortoiseIDiff z TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Podstawowe informacje" @@ -2257,45 +2296,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "Big5 (tradycyjny)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bisekcja błędna" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bisekcja poprawna" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Reset bisekcji" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Start bisekcji" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmapa\nBitmapa" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Styl czarny" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Adnotuj" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Adnotuje - tworzy raport o zmianach autorów w poszczególnych liniach pliku" @@ -2303,28 +2342,32 @@ msgstr "Adnotuje - tworzy raport o zmianach autorów w poszczególnych liniach p msgid "Blend alpha" msgstr "Mieszanie alfa" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Styl niebieski" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Body" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Określono zarówno /logmsg, jak i /logmsgfile.\nTylko jedno z nich może być określone." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Zarówno ścieżka do pliku poprawki jak i ścieżka docelowa muszą być ścieżkami bezwzględnymi!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" -msgstr "" +msgstr "Widok Dolny:" #. Resource IDs: (1007) msgid "Br&owse..." @@ -2334,30 +2377,30 @@ msgstr "Przeg&lądaj..." msgid "Branc&h:" msgstr "Gałą&ź:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Gałąź" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Nazwa gałęzi" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Nazwa gałęzi/tagu jest nieprawidłowa." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Nazwa gałęzi/tagu nie może być pusta lub jest nieprawidłowa." @@ -2369,11 +2412,11 @@ msgstr "Gałąź:" msgid "Bro&wse" msgstr "Przeg&lądaj" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Wybierz zewnętrzny program do porównywania plików" @@ -2385,19 +2428,19 @@ msgstr "Przeglądaj odniesienia" msgid "Browse..." msgstr "Przeglądaj..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID błędu" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "&Wyrażenie Bug-ID:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "ID błędu/Numer problemu:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "ID błędów" @@ -2413,7 +2456,7 @@ msgstr "" msgid "Button Appearance" msgstr "Wygląd przycisku" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Przycisk 1" @@ -2429,7 +2472,7 @@ msgstr "&Sprawdź teraz" msgid "C&ommands:" msgstr "P&olecenia:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "U&twórz gałąź/etykietę z wersji" @@ -2437,11 +2480,11 @@ msgstr "U&twórz gałąź/etykietę z wersji" msgid "C&urrent Keys:" msgstr "&Bieżące klawisze:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "Wy&tnij" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2457,11 +2500,11 @@ msgstr "Oblicz" msgid "Can double-click in log list to compare with previous revision" msgstr "Podwójne kliknięcie na liście zdarzeń porównuje z poprzednią wersją" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Nie można aktywować statycznego obiektu ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2470,80 +2513,80 @@ msgid "" "%s" msgstr "Nie można skopiować\n%s\ndo\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Nie można skopiować bitmapy do schowka!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Nie można utworzyć nowego obrazu!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Nie można dostosować menu!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Nie można wkleić obrazu ze schowka!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Anuluj" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Anuluj\nNie kończy działania TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Anuluj\nNie przełączaj widoków" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Anuluj\nZachowaj pusty plik." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Anuluj\nNajpierw rozwiąż konflikty." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Anuluj\nPozostań z bieżącymi plikami" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Anuluj\nZachowaj bieżące ustawienia" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Nie jest możliwe pokazanie różnic ze względu na niekonsekwentne znaki końca linii w pliku." @@ -2555,9 +2598,9 @@ msgstr "Kaska&dowo" msgid "Cascaded context menu" msgstr "Kaskadowe menu kontekstowe" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Bez uwzględnienia wielkości liter" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2579,33 +2622,33 @@ msgstr "" msgid "Change log" msgstr "Dziennik zmian" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Zmień drukarkę i opcje drukowania\nUstawienia wydruku" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Zmień opcje drukowania\nUstawienia strony" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Zmień styl aplikacji\nZmień styl" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Zmień położenie okna" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Zmień rozmiar okna" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2613,38 +2656,38 @@ msgstr "" msgid "Changed Files" msgstr "Zmienione pliki" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Zmienione pliki między %s, %s i %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Zmienione pliki: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Zmienione linie uwzględniając dodane/usunięte pliki" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Zmienione linie uwzględniając dodane/usunięte pliki według daty" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Zmienione linie nie uwzględniając dodanych/usuniętych plików" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Zmienione linie nie uwzględniając dodanych/usuniętych plików według daty" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Lista zmian %s przeniesiona" @@ -2653,15 +2696,15 @@ msgstr "Lista zmian %s przeniesiona" msgid "Changes made (double-click on file for diff):" msgstr "Dokonane zmiany (kliknij dwukrotnie, aby zobaczyć różnice):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Zmień styl aplikacji" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Ilość znaków przy których pokazać linię graniczną w oknie opisu zmian:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Sprawdź" @@ -2673,31 +2716,31 @@ msgstr "Sprawdź zmiany - TortoiseGit" msgid "Check For Updates..." msgstr "Sprawdź aktualizacje..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "&Sprawdź zmiany" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Sprawdź wprowadzoną ścieżkę i/lub adres URL." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Zaznacz pozycje, które mają być pokazane w głównym menu kontekstowym zamiast w menu podrzędnym TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Sprawdź te pozycje menu, które mają być wyświetlane tylko w rozszerzonym menu kontekstowym (SHIFT + lewy przycisk myszy)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Wyświetl względne czasy w komunikatach dziennika" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Zaznacz, aby użyć krótszego formatu daty i czasu w opisach zmian" @@ -2705,31 +2748,31 @@ msgstr "Zaznacz, aby użyć krótszego formatu daty i czasu w opisach zmian" msgid "Check:" msgstr "Sprawdź:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Pobierz" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2737,11 +2780,11 @@ msgstr "" msgid "Chinese" msgstr "chiński" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Wybierz repozytorium" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2753,78 +2796,78 @@ msgstr "Wyczyść" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Porządkowanie" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Porządkowanie." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Nie udało się uporządkować następujących ścieżek:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Udało się uporządkować następujące ścieżki:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Wyczyść" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Narzędzie czyszczenia\nWyczyść" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Czyści %ld URL-i zapisanych dla %ld kopii roboczych" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Czyści %ld opisów zmian zapisanych dla %ld kopii roboczych" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Czyści %ld nazwę użytkownika/hasło, %ld certyfikaty ssl i %ld nazwy użytkownika" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Czyści zbuforowane logi z repozytoriów %ld" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Usuwa zapisane parametry uwierzytelnienia.\nPrzy dostępie do repozytoriów trzeba będzie wprowadzić nazwę i hasło użytkownika." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Czyści zapisane wielkości i pozycje %ld okien dialogowych" @@ -2833,7 +2876,7 @@ msgstr "Czyści zapisane wielkości i pozycje %ld okien dialogowych" msgid "Click here to go to the website" msgstr "Kliknij tutaj, aby przejść do witryny" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Kliknij tutaj, aby wybrać ostatnią wpisaną wiadomość" @@ -2849,17 +2892,17 @@ msgid "" "extension" msgstr "Kliknij na \"Zaawansowane\", aby wskazać alternatywny program do scalania plików" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Kliknij aby zobaczyć polecenia przenoszenia bloków tekstu\nUżyj bloków tekstu" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Schowek" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Sklonuj" @@ -2867,7 +2910,7 @@ msgstr "Sklonuj" msgid "Clone Existing Repository" msgstr "Sklonuj istniejące repozytorium" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Sklonuj repozytorium" @@ -2875,49 +2918,49 @@ msgstr "Sklonuj repozytorium" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Sklonuj..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Zamknij" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Zamknij pełny ekran" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Zamknij podgląd wydruku\n&Zamknij" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Zamknięcie ręczne" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Zamknij tryb podglądu wydruku\nAnuluj podgląd" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Zamknij aktywny dokument\nZamknij" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Zamyka aktywne okno z pytaniem o zapisanie zmian w dokumencie" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Zwiń" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2943,7 +2986,7 @@ msgstr "Kolory:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2951,11 +2994,11 @@ msgstr "" msgid "Comman&ds:" msgstr "&Polecenia:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Polecenie" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Linia poleceń" @@ -2963,7 +3006,7 @@ msgstr "Linia poleceń" msgid "Command Line To Execute:" msgstr "Linia komend do wykonania:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Operacja zakończona niepowodzeniem." @@ -2971,41 +3014,41 @@ msgstr "Operacja zakończona niepowodzeniem." msgid "Commands" msgstr "Polecenia" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Zatwierdź zmiany" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Data zatwierdzenia" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "E-mail zatwierdzenia" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Ukończone zatwierdzanie" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Treść zatwierdzenia" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Nazwa zatwierdzenia" @@ -3013,7 +3056,7 @@ msgstr "Nazwa zatwierdzenia" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3021,19 +3064,19 @@ msgstr "" msgid "Commit to:" msgstr "Zatwierdź zmiany w:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Zatwierdź zmiany..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Zatwierdzenia zmian z podziałem na autorów" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Zatwierdzenia zmian z podziałem na daty" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Liczba zatwierdzeń w każdym %s" @@ -3042,15 +3085,15 @@ msgstr "Liczba zatwierdzeń w każdym %s" msgid "Commits each week:" msgstr "Liczba zatwierdzeń w każdym tygodniu:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Zatwierdza twoje zmiany w repozytorium" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3062,52 +3105,52 @@ msgstr "Zatwierdzenie folderu, który nie jest poddany kontroli wersji nie doda msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Porównaj wersje &główne (HEAD)" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Porównaj dwa pliki" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Porównuj białe znaki" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Porównaj z &kopią roboczą" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Porównaj z &BASE" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Porównaj z poprzednią wersją" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Uwzględnia wszystkie białe znaki przy porównywaniu\nPorównuj białe znaki" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Porównuje dany plik z jego ostatnią zatwierdzoną wersją aby pokazać zmiany które zrobiłeś" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Kopiowanie %s do %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Zakończono" @@ -3123,9 +3166,9 @@ msgstr "Konfiguracja źródła" msgid "Config type:" msgstr "Typ konfiguracji:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" -msgstr "" +msgstr "Konfiguruj Wyrażenia Regularne Filtru" #. Resource IDs: (236) msgid "Configure Hook Scripts" @@ -3157,11 +3200,11 @@ msgstr "Skonfiguruj program do przeglądania plików różnicowych GNU (plików msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Konflikt" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Konflikt plików" @@ -3169,15 +3212,15 @@ msgstr "Konflikt plików" msgid "Conflict resolved" msgstr "Konflikt rozwiązany" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "W stanie konfliktu" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Konflikty" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konflikty: %d" @@ -3188,126 +3231,126 @@ msgstr "Menu kontekstowe: " #. Resource IDs: (65535) msgid "Context lines for patches" -msgstr "" +msgstr "Linie kontekstu do poprawek" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Kontynuuj" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Zwiń okno dokowane" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Zamień spacje na tabulacje" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Zamień tabulacje na spacje" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Kopiu&j" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Skopiowano" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopiuj" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Kopiuj %s do %s, wersja %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Kopiuj SHA-1 do schowka" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Narzędzie kopiowania\nKopiuj" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Kopiuj wszystkie informacje do schowka" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopiuj i zmień nazwę" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Skopiuj wiadomości dziennika do schowka" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Skopiuj log do schowka" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Kopiuj ścieżki do schowka" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "&Kopiuj zaznaczenie do schowka" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Kopiuje zaznaczenie i umieszcza w schowku\nKopiuj" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Kopiuj do schowka" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopiuj: Nowa nazwa dla %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Kopiowanie %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopiowanie..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Poprawki" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Nie można dodać %s do listy ignorowanych!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Nie można sprawdzić, czy jest nowsza wersja!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3315,76 +3358,76 @@ msgid "" "%s" msgstr "Nie można skopiować plików!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 nie może być utworzony. Katalog jest pełny." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Nie można określić ostatniej zatwierdzonej wersji!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Nie można znaleźć Super-projektu" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Nie można określić stanu!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 nie może być otworzony. Zbyt duża liczba otwartych plików." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Nie można otworzyć pliku\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 nie może być usunięty, gdyż znajduje się w bieżącym katalogu." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Nie można usunąć %s z listy ignorowanych" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Nie można zresetować oryginalnej sekcji HEAD." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Nie można uzyskać adresu URL dla tego pliku\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Nie można uzyskać wersji %s pliku %s.\nNie jest możliwe zastosowanie poprawki!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Nie można uruchomić TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3392,7 +3435,7 @@ msgid "" "%s" msgstr "Nie można uruchomić przeglądarki plików różnicowych!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3400,7 +3443,7 @@ msgid "" "%s" msgstr "Nie można uruchomić zewnętrznego programu do porównywania plików!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3408,11 +3451,11 @@ msgid "" "%s" msgstr "Nie można uruchomić zewnętrznego programu do scalania plików!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Nie można rozpocząć zadania wydruku." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3420,22 +3463,22 @@ msgid "" "%s" msgstr "Nie można uruchomić przeglądarki plików!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Nie można uruchomić agenta Putty (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Nie można rozpocząć wątku!" #. Resource IDs: (1501) msgid "Coun&t" -msgstr "" +msgstr "Zlic&z" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." -msgstr "" +msgstr "Zliczono: %u dopasowań." #. Resource IDs: (1683) msgid "Create &Library" @@ -3445,15 +3488,15 @@ msgstr "Utwórz &bibliotekę" msgid "Create .gitignore file" msgstr "Stwórz plik .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Stwórz gałąź" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Stwórz gałąź w tej wersji..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Stwórz gałąź..." @@ -3465,29 +3508,29 @@ msgstr "Twórz listę zmian" msgid "Create New Branch" msgstr "Utwórz nową gałąź" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Stwórz tag" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Stwórz tag w tej wersji..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Stwórz tag..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Stwórz nowy dokument\nNowy" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3496,49 +3539,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Utwórz plik poprawki" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Stwórz repozytorium tutaj..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Utworzono" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Stwórz gałąź lub tag" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Tworzy folder biblioteki ze specjalnymi ustawieniami dla kopii roboczej Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Tworzy plik poprawek (patch) z różnic pomiędzy dwoma plikami\nUtwórz łatę" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Tworzy w bieżącej lokalizacji bazę danych dla repozytorium" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Tworzy plik różnicowy, zawierający wszystkie twoje zmiany" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Pomocnik poświadczeń nie może być pusty." @@ -3550,7 +3593,7 @@ msgstr "Pomocnik poświadczeń:" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Wytni&j" @@ -3558,7 +3601,7 @@ msgstr "Wytni&j" msgid "Current" msgstr "Bieżący" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Aktualna wersja:" @@ -3566,7 +3609,7 @@ msgstr "Aktualna wersja:" msgid "Current Branch:" msgstr "Obecna gałąź:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3578,7 +3621,7 @@ msgstr "" msgid "Current version is:" msgstr "Aktualna wersja:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Aktualna wersja: %s" @@ -3591,7 +3634,7 @@ msgstr "&Dostosuj..." msgid "Custom" msgstr "Użytkownika" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Dostosuj" @@ -3599,19 +3642,19 @@ msgstr "Dostosuj" msgid "Customize Keyboard" msgstr "Dostosuj klawiaturę" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Dostosuj Pasek szybkiego dostępu" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Dostosuj Pasek szybkiego dostępu..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Dostosuj..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3625,88 +3668,92 @@ msgstr "Cyrylica" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Data" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Domyślny" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Domyślne menu" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Domyślne menu aplikacji. Pojawia się, kiedy nie ma otwartych dokumentów." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Domyślnie stosuj kodowanie UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Usuń" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Usuń %d gałęzi" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Usuń %d zdalnych gałęzi" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Usuń %d tagów" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Usuń i pom&iń %d elementów wg nazwy" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Dodaj i usuń z listy &ignorowanych" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Usuwa i ignoruje %d elementy(-ów) wg &rozszerzenia" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Usuń gałąź" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Usuń gałąź/tag" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Usuń zdalną gałąź" @@ -3714,34 +3761,34 @@ msgstr "Usuń zdalną gałąź" msgid "Delete remote tag - TortoiseGit" msgstr "Usuń zdalny tag - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Usuń zdalne tagi..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Usuń podmoduł" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Usuń tag" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Usuń istniejącą gałąź lub użyj innej nazwy." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Usuń\nPlik został usunięty." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Usunięto" @@ -3749,36 +3796,36 @@ msgstr "Usunięto" msgid "Deleted merge conflict" msgstr "Usunięty konflikt scalania" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Usuwa i dodaje zaznaczone pliki lub maski plików do listy ignorowanych" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Usuwa pliki/foldery z kontroli wersji" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Usuwa pliki/foldery z kontroli wersji nie usuwając ich z dysku" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Usuwa plik z logiem akcji" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Usuwanie" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Usuwanie buforowanych danych" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Usuwanie pliku" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3788,7 +3835,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Głębokość" #. Resource IDs: (65535) msgid "Describe" @@ -3798,7 +3845,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Opis" @@ -3806,7 +3853,7 @@ msgstr "Opis" msgid "Description:" msgstr "Opis:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Odznacz listę zmian" @@ -3814,33 +3861,33 @@ msgstr "Odznacz listę zmian" msgid "Destination" msgstr "Miejsce przeznaczenia" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Dysk docelowy jest pełny." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Wykryj i podświetl przeniesione bloki" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3854,11 +3901,15 @@ msgstr "Wielkości i położenia okien dialogowych" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Opcje Porównywania" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Porównaj dwa zatwierdzenia" @@ -3872,15 +3923,15 @@ msgstr "Przeglądarka różnic::Narzędzie scalania" #. Resource IDs: (65535) msgid "Diff added lines" -msgstr "" +msgstr "Porównaj dodane linie" #. Resource IDs: (65535) msgid "Diff command" -msgstr "" +msgstr "Polecenie porównania" #. Resource IDs: (65535) msgid "Diff comment" -msgstr "" +msgstr "Porównaj komentarze" #. Resource IDs: (65535) msgid "Diff file:" @@ -3888,26 +3939,26 @@ msgstr "Plik różnicowy:" #. Resource IDs: (65535) msgid "Diff header" -msgstr "" +msgstr "Porównaj nagłówki" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" -msgstr "" +msgstr "Porównaj później" #. Resource IDs: (65535) msgid "Diff position" -msgstr "" +msgstr "Porównaj pozycję" #. Resource IDs: (65535) msgid "Diff removed lines" -msgstr "" +msgstr "Porównaj usunięte linie" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Porównaj z nadrzędnym %d" @@ -3920,19 +3971,19 @@ msgstr "Różnica między" msgid "Diffing" msgstr "Porównywanie" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Porównuje plik w kopii roboczej z tym sprzed ostatniego zatwierdzenia zmian." -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Porównaj dwa jakiekolwiek zatwierdzenia" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Katalog..." @@ -3944,26 +3995,26 @@ msgstr "Katalog:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Wyłącz tą opcję, jeżeli posiadasz naprawdę duże kopie robocze i występuje\nzbyt dużo dostęp do dysku w trakcie przeglądania kopii roboczej." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Dostęp do %1 - dysk jest pełny." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Wyjątek podczas wysyłania: %1" @@ -3972,44 +4023,52 @@ msgstr "Wyjątek podczas wysyłania: %1" msgid "Display &buttons in this order" msgstr "Pokaż &przyciski w tej kolejności" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Wyświetl całe strony\nPodgląd wydruku" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Pokazuje pomoc na temat przycisków, menu i okien\nPomoc" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Pokazuje pomoc na temat bieżącego zadania lub polecenia\nPomoc" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Pokazuje instrukcje jak korzystać z systemu pomocy\nPomoc" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Wyświetla informacje o programie, numerze wersji i prawach autorskich\nO programie" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "&Nie pokazuj mi tej uwagi ponownie (jeśli Kontynuuj jest zaznaczone)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "Nie pokazuj tego ostrzeżenia ponownie (jeśli Ignoruj ​​jest zaznaczone)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Nie wybieraj automatycznie podmodułów" @@ -4022,54 +4081,71 @@ msgstr "Nie pokazuj menu kontekstowego dla następujących ścieżek:" msgid "Do not use recycle bin" msgstr "Nie używaj kosza" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Czy naprawdę chcesz usunąć %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Czy na pewno chcesz usunąć pasek narzędzi '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Czy na pewno chcesz przenieść ten plik lub folder?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Czy na pewno chcesz usunąć \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Czy na pewno chcesz przywrócić kopię? Zostaną utracone wszelkie zmiany dokonane po utworzeniu kopii." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,7 +4153,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Czy na pewno chcesz wycofać wszystkie zmiany w\n%s\ni powrócić do tej wersji? Zmiany te będą wycofane poprzez odwrócone scalanie wersji do twojej kopii roboczej." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4085,21 +4161,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Czy na pewno chcesz wycofać wszystkie zmiany w\n%s\nwprowadzone w bieżącej wersji? Zmiany te będą wycofane poprzez odwrócone scalanie wersji do twojej kopii roboczej." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Czy chcesz załadować zmienione pliki?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4107,21 +4183,21 @@ msgid "" "as resolved?" msgstr "Czy chcesz oznaczyć plik\n%s\njako rozwiązany?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Czy chcesz odzyskać te automatycznie zapisane dokumenty?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Czy chcesz przeładować dokumenty aby uwzględnić zmiany w ustawieniach?\nUwaga: spowoduje to utratę wszystkich dokonanych zmian!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Czy chcesz zobaczyć zmiany?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4129,28 +4205,28 @@ msgstr "" msgid "Document :" msgstr "Dokument:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Nie odzyskuj zapisanych automatzcznie dokumentów\nUżyj ostatnich jawnie zapisanych wersji dokumentów" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Nie zapisuj\nZamknij widoki bez zapisywania zmian" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4160,11 +4236,11 @@ msgstr "Nie zapisuj\nPrzeładuj widoku bez zapisu zmian" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Nie pokazuj więcej tego komunikatu" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Gotowe" @@ -4176,7 +4252,7 @@ msgstr "W dół" msgid "Download" msgstr "Pobierz" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Przeciągnij, aby to menu było pływające" @@ -4204,6 +4280,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Pomiń ścieżki:" @@ -4212,7 +4292,7 @@ msgstr "&Pomiń ścieżki:" msgid "E&xit" msgstr "Za&mknij" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Eksportuj..." @@ -4232,11 +4312,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "wschodnioeuropejski" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Edytuj" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Edytuj &globalny .gitconfig" @@ -4252,23 +4332,23 @@ msgstr "Edytuj .tgitconfig" msgid "Edit Button Image" msgstr "Edytuj obraz przycisku" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Edytuj notatki" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Edytuj autora" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Edytuj opis" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Edytuj rozszerzenie konkretnego programu różnicowego" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Edytuj rozszerzenie konkretnego programu scalania" @@ -4280,11 +4360,11 @@ msgstr "Edytuj gl&obalny .gitconfig" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Edytuj lokalną konfigurację git" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Edytuj opis zmian" @@ -4304,25 +4384,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Nazwa lub adres IP serwera proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Narzędzia Ellipse\nEllipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "E-mail" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Nie można wyczyścić w tym samym czasie adresu e-mail z pól DO i DW." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4330,13 +4410,13 @@ msgstr "" msgid "Empty" msgstr "Pusty" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" -msgstr "" +msgstr "Włącz edycję" #. Resource IDs: (1510) msgid "Enable EditorConfig" -msgstr "" +msgstr "Włącz KonfigEdytora" #. Resource IDs: (1766) msgid "Enable Gravatar" @@ -4344,9 +4424,9 @@ msgstr "" #. Resource IDs: (1788) msgid "Enable drag context menu" -msgstr "" +msgstr "Włącz przeciągane menu kontekstowe" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4355,10 +4435,14 @@ msgstr "" msgid "Enable log cache" msgstr "Włącz pamięć podręczną zapisów" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Uruchomione uchwyty nakładek" @@ -4367,35 +4451,35 @@ msgstr "Uruchomione uchwyty nakładek" msgid "Encode" msgstr "Zakoduj" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Kodowanie" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Podczas dostępu do %1 wystąpił sprzętowy błąd wejścia/wyjścia." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Podczas dostępu do %1 wystąpiło naruszenie systemu blokad." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Podczas dostępu do %1 wystąpiło naruszenie zasad współdzielenia." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Napotkano niewłaściwy argument." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Wystąpił nieoczekiwany błąd podczas odczytu %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Wystąpił nieoczekiwany błąd podczas zapisu %1." @@ -4408,11 +4492,11 @@ msgstr "" msgid "End" msgstr "Koniec" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Styl końca linii" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Powiększ okno do pełnego rozmiaru" @@ -4420,23 +4504,23 @@ msgstr "Powiększ okno do pełnego rozmiaru" msgid "Enter Log Message" msgstr "Wprowadź opis zmian" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Podaj adres URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Proszę podać GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Proszę podać walutę." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Proszę podać datę i/lub czas." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Proszę podać datę." @@ -4444,90 +4528,90 @@ msgstr "Proszę podać datę." msgid "Enter a name for the changelist:" msgstr "Podaj nazwę listy zmian:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Proszę podać liczbę pomiędzy %1 i %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Proszę podać liczbę." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Proszę podać dodatnią liczbę całkowitą." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Proszę podać czas." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Proszę podać liczbę całkowitą pomiędzy %1 i %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Proszę podać liczbę całkowitą pomiędzy 0 i 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Proszę podać liczbę całkowitą." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Podaj poniżej zawartość pliku do przetestowania:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Wprowadź tekst ko&munikatu w dzienniku:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Proszę wprowadzić nie więcej niż %1 znaków." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Podaj poniżej wyrażenie regularne:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Kasuje wszystko\nUsuń wszystko" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Kasuje zaznaczenie\nUsuń" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Błąd" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Błąd przy przebudowywaniu pamięci podręcznej ikon systemowych!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Problem podczas odczytu/zapisu klucza rejestru %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Wszystko zaktualizowane." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4537,28 +4621,28 @@ msgstr "Pliki wykonywalne (*.exe)|*.exe|Pliki COM (*.com)|*.com|Pliki PDF (*.pdf msgid "Executable (+x)" msgstr "Pliki wykonywalne (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Istniejący" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Wyjdź" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Rozwiń (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Rozwiń okno dokowane" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Eksploruj do" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Eksportuj" @@ -4566,36 +4650,36 @@ msgstr "Eksportuj" msgid "Export Zip File" msgstr "Eksportuj plik zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Katalog docelowy eksportu:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Eksportuj zaznaczenie do..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Eksportuj tę wersję..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Eksportuj także pliki nie objęte kontrolą wersji" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Eksportowanie %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Eksportowanie..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Eksportuj wersję do pliku zip" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Rozszerzenie" @@ -4611,7 +4695,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "Zewnętrzna ścieżka DLL:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Zewn." @@ -4619,101 +4703,101 @@ msgstr "Zewn." msgid "External Program:" msgstr "Program zewnętrzny:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Wygaś" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Wycofanie zmian zakończone niepowodzeniem" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Nie powiodło się pobranie pliku \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Nie powiodło się pobranie pliku \"%s\", wersja %s do \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Nie udało się połączyć.\nLink może być niepoprawny." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Nie udało się skonwertować obiektu ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Nie udało się utworzyć pustego dokumentu." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Nie udało się utworzyć obiektu. Upewnij się, że aplikacja jest zainstalowana w rejestrze systemu." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Nie udało się pobrać pliku bazowego." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Nie powiodło się pobranie pliku scalania." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Nie udało się otworzyć pomocy." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Nie udało się uruchomić aplikacji serwera." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Nie udało się otworzyć dokumentu." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Nie udało się wykonać operacji na serwerze." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Nie udało się zapisać dokumentu." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Nie udało się ustawić/usunąć listy zmian '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Nie udało się uruchomić providera COM '%s' dla systemu śledzenia błędów.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Niepowodzenie!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4721,62 +4805,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "Pobie&rz" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Pobierz" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Pobierz z repozytorium SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Pobierz z \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Pobierz..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Pobieranie statusu..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Pobieranie zmienionych plików..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Ściąganie pliku..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Ściąganie wersji %s pliku:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Plik" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Kodowanie pliku" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Zmiany w plikach w każdym %s" @@ -4785,27 +4869,27 @@ msgstr "Zmiany w plikach w każdym %s" msgid "File changes each week:" msgstr "Zmiany w plikach w każdym tygodniu:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Różnice pliku" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Plik nie ma konfliktów" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Plik jest pusty." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Lista plików jest pusta" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Plik poprawek" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4817,7 +4901,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Wielkość pliku:\t\t\t%s (%s)\nSzerokość:\t\t\t%ld pikseli\nWysokość:\t\t\t%ld pikseli\nRozdzielczość pozioma:\t\t%.1f dpi\nRozdzielczość pionowa:\t\t%.1f dpi\nGłębia koloru:\t\t\t%d bitów\nPowiększenie:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4837,7 +4921,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Wielkość pliku:\t\t\t%s (%s)\nSzerokość:\t\t\t%ld pikseli\nWysokość:\t\t\t%ld pikseli\nRozdzielczość pozioma:\t\t%.1f dpi\nRozdzielczość pionowa:\t\t%.1f dpi\nGłębia koloru:\t\t\t%d bitów\nPowiększenie:\t\t\t%d%%\n\nWielkość pliku:\t\t\t%s (%s)\nSzerokość:\t\t\t%ld pikseli\nWysokość:\t\t\t%ld pikseli\nRozdzielczość pozioma:\t\t%.1f dpi\nRozdzielczość pionowa:\t\t%.1f dpi\nGłębia koloru:\t\t\t%d bitów\nPowiększenie:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4849,7 +4933,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Wielkość pliku:\t\t\t%s (%s)\nSzerokość:\t\t\t%ld pikseli\nWysokość:\t\t\t%ld pikseli\nRozdzielczość pozioma:\t%.1f dpi\nRozdzielczość pionowa:\t\t%.1f dpi\nGłębia koloru:\t\t\t%d bitów\nPowiększenie:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4869,7 +4953,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Wielkość pliku:\t\t\t%s (%s)\nSzerokość:\t\t\t%ld pikseli\nWysokość:\t\t\t%ld pikseli\nRozdzielczość pozioma:\t%.1f dpi\nRozdzielczość pionowa:\t\t%.1f dpi\nGłębia koloru:\t\t\t%d bitów\nPowiększenie:\t\t\t%d%%\n\nWielkość pliku:\t\t\t%s (%s)\nSzerokość:\t\t\t%ld pikseli\nWysokość:\t\t\t%ld pikseli\nRozdzielczość pozioma:\t%.1f dpi\nRozdzielczość pionowa:\t\t%.1f dpi\n\nGłębia koloru:\t\t\t%d bitów\nPowiększenie:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nazwa pliku" @@ -4877,17 +4961,17 @@ msgstr "Nazwa pliku" msgid "Files" msgstr "Pliki" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Narzędzie wypełniania\nWypełnij" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtruj po" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtruj ścieżki" @@ -4899,11 +4983,11 @@ msgstr "Filtr:" msgid "Filter: " msgstr "Filtr:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Znajdź" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4913,41 +4997,41 @@ msgstr "Szuka podanego tekstu\nZnajdź" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." -msgstr "" +msgstr "Znajdź: Wyszukano pierwsze wystąpienie od końca. Natrafiono na początek dokumentu." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." -msgstr "" +msgstr "Znajdź: Wyszukano pierwsze wystąpienie od początku. Natrafiono na koniec dokumentu." #. Resource IDs: (65535) msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Zakończ" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Zakończona zmiana bazy." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Zakończono!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Pierwszy rodzic" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Tylko pierwszy rodzic" @@ -4956,18 +5040,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Stacja dyskietek (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Folder" @@ -4979,38 +5063,34 @@ msgstr "Śledź zmiany nazw" msgid "Font" msgstr "Czcionka" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Naciśnij F1 aby uzyskać pomoc. Przewijaj poziomo trzymając Ctrl i używając kółka przewijania" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Aby uzyskać kompletną historię, wyłącz opcję 'Zatrzymaj na kopii/zmianie nazwy'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Wymuś" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Wymuś utworzenie gałęzi/tagu - nawet jeśli istnieje już o tej samej nazwie." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5022,26 +5102,26 @@ msgstr "" #. Resource IDs: (65535) msgid "Foreground" -msgstr "" +msgstr "Pierwszy plan" #. Resource IDs: (312) msgid "Format Patch" msgstr "Format poprawki" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Format poprawki..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "W przód" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5049,7 +5129,7 @@ msgstr "Znaleziono pusty komunikat zatwierdzania. Wprowadź komunikat, albo zmia #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Znaleziono słowa:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5071,11 +5151,11 @@ msgstr "" msgid "From SVN Repository" msgstr "Z repozytorium SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5083,7 +5163,7 @@ msgstr "" msgid "From:" msgstr "Od:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Pełny ekran" @@ -5091,7 +5171,7 @@ msgstr "Pełny ekran" msgid "Full text search" msgstr "Wyszukiwanie pełnotekstowe" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Pełna rekursywność" @@ -5099,7 +5179,7 @@ msgstr "Pełna rekursywność" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5107,24 +5187,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "GB2312 (uproszczony)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ nie został zainicjalizowany!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ nie był w stanie utworzyć obiektu bitmapy. Prawdopodobnie zabrakło pamięci." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Pobieranie informacji. Proszę czekać..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Pobieranie statystyk" @@ -5154,43 +5234,43 @@ msgstr "Ogólne::Menu kontekstowe" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Ogólne::Okna dialogowe 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Ogólne::Okna dialogowe 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Ogólne::Okna dialogowe 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "Ogólne::Pozycje menu rozszerzonego" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Pobierz dziennik scalania" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Pobieranie pliku %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Pobieranie pliku %s, wersja %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Pobieranie informacji..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Pobieranie informacji..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Pobieranie różnic..." @@ -5202,23 +5282,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git Postęp polecenia" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git kopiuj i dodaj pliki do tej kopii roboczej" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Skopiuj i zmień nazwę wersjonowanego elementu tutaj" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Skopiuj wersjonowany element(y) tutaj" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Eksportuj wszystkie elementy tutaj" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Eksportuj wersjonowane elementy tutaj" @@ -5226,35 +5306,35 @@ msgstr "Git Eksportuj wersjonowane elementy tutaj" msgid "Git Init" msgstr "Git Inicjalizacja" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Log" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Przenieś i zmień nazwę wersjonowanego elementu tutaj" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Przenieś wersjonowany element(y) tutaj" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git Ustawienia zdalne" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Zmiana bazy" @@ -5266,31 +5346,31 @@ msgstr "Synchronizacja Gita" msgid "Git clone - TortoiseGit" msgstr "Git klonuj - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git zgłosił błąd podczas tworzenia repozytorium!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5311,7 +5391,7 @@ msgstr "Git::Poświadczenia" msgid "Git::Remote" msgstr "Git::Zdalny" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5323,47 +5403,47 @@ msgstr "Idź do linii" msgid "Go to line" msgstr "Idź do linii" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Przejdź do następnego konfliktu\nnastępny konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Przechodzi do następnej różnicy\nnastępna różnica" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Przechodzi do następnej różnicy w linii\nnastępna różnica w linii" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Przechodzi do poprzedniego konfliktu\npoprzedni konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Przechodzi do poprzedniej różnicy\npoprzednia różnica" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Przechodzi do poprzedniej różnicy w linii\npoprzednia różnica w linii" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Idź do linii" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Wykres" @@ -5379,11 +5459,11 @@ msgstr "Szary" msgid "Greek" msgstr "grecki" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Grupuj listy zmian" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5399,7 +5479,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5411,7 +5491,7 @@ msgstr "" msgid "Hebrew" msgstr "hebrajski" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Pomoc" @@ -5435,11 +5515,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Ukryj menu dla niewersjonowanych ścieżek" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Ukryj poprawki<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Ukryj okienko zadokowane" @@ -5447,25 +5527,25 @@ msgstr "Ukryj okienko zadokowane" msgid "Hide the script while running" msgstr "Ukryj skrypt kiedy jest wykonywany" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Ukryj/Pokaż listę plików poprawki" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Ukryj/pokaż listę plików poprawek\nUkrywa lub pokazuje listę plików poprawek" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5475,7 +5555,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Podpowiedź: wybierz menu kontekstowe, zmień stronę na 'Polecenia' i przenieś przyciski paska zadań do okna menu." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Dom" @@ -5491,7 +5571,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Skrypty przechwytujące::Integracja z systemami śledzenia błędów" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Typ przechwycenia" @@ -5505,9 +5585,9 @@ msgstr "&Uwzględnij ścieżki:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5515,55 +5595,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +N" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +D" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5571,15 +5652,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5603,7 +5684,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5611,7 +5692,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5619,7 +5700,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5627,16 +5708,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5647,17 +5728,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5669,7 +5750,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5733,7 +5814,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Nakładki ikon" @@ -5745,7 +5826,7 @@ msgstr "Nakładki ikon::Zestaw ikon" msgid "Icon Overlays::Overlay Handlers" msgstr "Nakładki ikon::Uchwyty nakładek" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5755,52 +5836,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ikony/Wygląd/Kod:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Włączenie opcji zapobiega pojawianiu się ikon nakładkowych oraz menu kontekstowych w oknach dialogowych 'zapisz jako...' lub 'otwórz'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Jeśli zaznaczone, dwuklik na wersji w okienku dziennika porównuje ją z poprzednią wersją" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Jeśli włączone, dialog zatwierdzania będzie po błędzie uruchamiany ponownie,\r\nz zachowaniem ostatnio wybranych elementów i opisu zmian." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Jeśli opcja jest włączona, TortoiseGit sprawdza raz w tygodniu, czy jest dostępna nowsza wersja" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Jeśli włączone, foldery kopii roboczej, które są wyłączone z pokazywania\nnakładek ikon, wciąż pokazują nakładkę statusu 'normalny'" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Jeśli włączone, pliki znajdujące się w folderach nie objętych\r\nwersjonowaniem będą widoczne w kontrolerze statusu.\r\nKontroler statusu jest używany m.in. w oknie zatwierdzania zmian." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5813,18 +5894,18 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignoruj" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignoruj %d elementy(-ów) wg &rozszerzenia" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" -msgstr "" +msgstr "Ignoruj Komentarze" #. Resource IDs: (1692) msgid "Ignore File" @@ -5834,15 +5915,15 @@ msgstr "Ignoruj plik" msgid "Ignore Type" msgstr "Ignoruj typ" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignoruj wszystkie zmiany białych znaków" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5850,7 +5931,7 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Ignoruj &zmiany wielkości liter" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5868,11 +5949,11 @@ msgstr "Ignoruj pozycje rekursywnie" msgid "Ignore line &endings (recommended)" msgstr "Pomiń znaki &końca linii (zalecane)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5880,29 +5961,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignoruj zmiany białych znaków" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorowane" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Ignorowane pliki" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignoruje wszystkie zmiany białych znaków przy porównywaniu\nIgnoruj wszystkie białe znaki" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5920,24 +6001,24 @@ msgstr "Obraz &i tekst" msgid "Images" msgstr "Obrazy" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Bezpośrednie elementy podrzędne, w tym foldery" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importuj" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importuj %s do %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5946,16 +6027,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importuj ignorowany plik svn do pliku .git/info/exclude (plik zostanie nadpisany)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importuję plik %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Na liście zmian" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "W zatwierdzeniu" @@ -5979,24 +6060,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Uwzględnij tylko następujący zakres wersji:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Niepoprawna nazwa pliku." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Import inicjujący" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Zainicjowano puste repozytorium Git w %s." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Różnice w linii" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Różnice w linii wg słów" @@ -6008,25 +6089,25 @@ msgstr "Różnice w ramach linii" msgid "Input" msgstr "Wejście" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Wstaw zawartość schowka\nWklej" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Za mało pamięci do wykonania operacji." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Wewnętrzny błąd aplikacji." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Niewłaściwa waluta." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Błędny numer wersji!" @@ -6034,7 +6115,7 @@ msgstr "Błędny numer wersji!" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6057,7 +6138,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6065,15 +6146,15 @@ msgstr "" msgid "Keep changelists" msgstr "Zachowaj listy zmian" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Zachować lokalnie plik?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "" +msgstr "Rozwiązuj nadal\nIdź do pierwszego nierozwiązanego konfliktu" #. Resource IDs: (16136) msgid "Keyboard" @@ -6083,7 +6164,7 @@ msgstr "Klawiatura" msgid "Keyboard shortcuts:" msgstr "Skróty klawiaturowe:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Klawisze" @@ -6125,21 +6206,41 @@ msgstr "WIERSZ 8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Język:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" msgstr "" -#. Resource IDs: (85) -msgid "Last Author" -msgstr "Ostatni autor" +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" -#. Resource IDs: (68) -msgid "Last Commit" -msgstr "Ostatnie zatwierdzenie" +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" -#. Resource IDs: (86) -msgid "Last Modified" +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) +msgid "Last Author" +msgstr "Ostatni autor" + +#. Resource IDs: (1076) +msgid "Last Commit" +msgstr "Ostatnie zatwierdzenie" + +#. Resource IDs: (1364) +msgid "Last Modified" msgstr "Zmodyfikowano" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Ostatnia modyfikacja:" @@ -6147,7 +6248,11 @@ msgstr "Ostatnia modyfikacja:" msgid "Last known &good:" msgstr "Ostatnia znana &dobra:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Uruchamia zewnętrzny program do porównywania/scalania plików w celu rozwiązania konfliktu." @@ -6155,17 +6260,17 @@ msgstr "Uruchamia zewnętrzny program do porównywania/scalania plików w celu r msgid "Least active author:" msgstr "Najmniej aktywny użytkownik:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Pozostaw w stanie konfliktu\nStatus konfliktu pliku zostanie zachowany" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Widok lewy: " @@ -6173,11 +6278,11 @@ msgstr "Widok lewy: " msgid "Left image" msgstr "Lewy obraz" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Wykres liniowy" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6191,12 +6296,12 @@ msgstr "Pasek porównania linii" msgid "Line differences" msgstr "Różnice linii" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Wiersz przeniesiony z linii %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Wiersz przeniesiony do linii %ld" @@ -6209,26 +6314,26 @@ msgstr "" msgid "Line:" msgstr "Linia:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Linia: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Dodane wiersze" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Usunięte wiersze" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Pokazuje tematy pomocy\nTematy pomocy" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6246,23 +6351,23 @@ msgstr "Załaduj obrazy" msgid "Load Putty &Key" msgstr "Wczytaj &klucz Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Wczytaj zmiany\nZmiany wykonane w TortoiseGitMerge zostaną utracone i zastąpione nową treścią." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "" +msgstr "Załaduj zmiany\nWidoki zostaną zaktualizowane o nowe treści." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Ładowanie..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6270,13 +6375,13 @@ msgstr "" msgid "Local Branch" msgstr "Lokalna gałąź" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Status lokalny" @@ -6284,7 +6389,7 @@ msgstr "Status lokalny" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6294,7 +6399,7 @@ msgstr "" msgid "Locator Bar" msgstr "Pasek lolalizacji" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Dziennik" @@ -6334,12 +6439,12 @@ msgstr "Opisy zmian (Pokaż okienko dialogowe logu)" msgid "Login:" msgstr "Login:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Najniższa pokazana wersja: %ld - Najwyższa pokazana wersja: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6350,7 +6455,7 @@ msgstr "Najniższa pokazana wersja: %ld - Najwyższa pokazana wersja: %ld - Gł msgid "Lum" msgstr "Jas" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6362,14 +6467,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL systemu pocztowego jest niepoprawny." -#. Resource IDs: (156) -msgid "Main" -msgstr "Główna" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6382,47 +6483,47 @@ msgstr "Zarzą&dzaj" msgid "Manage" msgstr "Zarządzaj" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Zarządzaj zdalnie" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Oznacz jako rozwiązany" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Zaznacz jako rozwiązane.\nPlik zostanie oznaczony jako zmieniony." -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Zaznacz do porównania" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" -msgstr "" +msgstr "Zaznaczone Bloki" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Oznacza jako plik z rozwiązanym konfliktem w Git\nOznacz jako rozwiązany" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Oznacz zmiany jako złe" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Oznacz zmiany jako dobre" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Uwzględnij &wielkość liter" @@ -6446,7 +6547,7 @@ msgstr "Menu najpierw wyświetlają &ostatnio używane polecenia" msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Pasek menu" @@ -6454,7 +6555,7 @@ msgstr "Pasek menu" msgid "Menu s&hadows" msgstr "&Cienie menu" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Scalaj" @@ -6462,34 +6563,34 @@ msgstr "Scalaj" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reintegruj scalanie" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Scal do \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Scalono" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Scalone pliki" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Scala inną gałąź" @@ -6497,22 +6598,22 @@ msgstr "Scala inną gałąź" msgid "Merging" msgstr "Scalanie" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Łączenie zmian z %s, wersja %s do %s, wersja %s na %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Scalanie wymaga różnych wersji lub różnych URLi w 'Z:' i 'Do:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Scalanie wersji %s %s do %s,%s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Wiadomość" @@ -6522,9 +6623,9 @@ msgstr "Tyl&ko wiadomość" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "&Wyrażenie częściowe wiadomości:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Wiadomości" @@ -6532,23 +6633,27 @@ msgstr "Wiadomości" msgid "Min" msgstr "Min." -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Moje" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimalizuj wstążkę" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Minimalna liczba znaków dla wiadomości przy zatwierdzaniu:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Różne" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Mieszany" @@ -6556,35 +6661,35 @@ msgstr "Mieszany" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Data modyfikacji" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Zmodyfikowano" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Zmienione pliki" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Więcej" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Więcej przycisków" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Więcej poleceń..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Więcej kolorów..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Więcej..." @@ -6604,41 +6709,41 @@ msgstr "Przesuń w &dół" msgid "Move &Up" msgstr "Przesuń do &góry" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Przesuń element w dół" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Przesuń element do góry" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Przenieś i zmień nazwę" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Przenieś do listy zmian" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Przenieś/Zmień nazwę" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Przenieś: Nowa nazwa dla %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Przenosi zmodyfikowane pliki do kosza przed wycofaniem zmian" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Przenoszenie %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Przenoszenie..." @@ -6646,11 +6751,11 @@ msgstr "Przenoszenie..." msgid "My file:" msgstr "Mój plik:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nazwa" @@ -6662,7 +6767,7 @@ msgstr "Nazwa:" msgid "Navigate" msgstr "Przejdź" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6672,11 +6777,11 @@ msgstr "Przejdź do określonego wiersza w widoku\nIdź do linii" msgid "Navigation Pane Options" msgstr "Opcje panelu nawigacji" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opcje panelu nawigacji..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Zagnieżdżony" @@ -6688,7 +6793,7 @@ msgstr "Sieć" msgid "Network::Email" msgstr "Sieć::E-mail" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nowy" @@ -6697,77 +6802,73 @@ msgid "New &name:" msgstr "Nowa &nazwa:" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "Nowa gałąź/tag" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nowe menu" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nowa nazwa dla %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" -msgstr "" +msgstr "Nowa nazwa nie może być pusta lub identyczna z oryginalną!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nowa nazwa:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Nowy podmoduł" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" -msgstr "" +msgstr "Znaki nowej linii" #. Resource IDs: (20308) msgid "Next" msgstr "Następny" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Następna strona\nPoprzednia strona" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Następny konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Następna różnica" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Następna różnica w linii" -#. Resource IDs: (73) -msgid "No" -msgstr "Nie" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6779,102 +6880,107 @@ msgstr "Nie pobrano" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nie określona wartość w poleceniu!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Nie wykryto różnic!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Brak dostępnego komunikatu o błędzie." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nie wystąpiły błędy." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "TortoiseGit nie może wycofać zmian. Pliki lub foldery nie były modyfikowane!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Brak plików do pokazania przy aktualnych ustawieniach.\nSprawdź ustawienia poniżej, aby zobaczyć pliki poza kontrolą wersji, ignorowane i/lub niezmodyfikowane.\nAby zobaczyć zdalne zmiany, kliknij na 'Sprawdź repozytorium'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Żadne pliki nie zostały zmienione lub dodane od\nostatniego zatwierdzenia.\nTortoiseGit nie ma nic do zrobienia..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Żadne pliki nie zostały zmienione lub dodane od\nostatniego zatwierdzenia.\nTortoiseGit nie ma nic do zrobienia...\nCzy chcesz zobaczyć niewersjonowane pliki?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Wykres nie jest dostępny" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Nie znaleziono kodeka obrazu dla %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Brak poprzedniej wersji." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Brak poprawek pisowni" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Brak pamięci podręcznej statusu. Ikony nakładkowe będą wyświetlane tylko dla folderów" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Brak sugestii z tezaurusa" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Nie znaleziono katalogu roboczego." @@ -6882,11 +6988,11 @@ msgstr "Nie znaleziono katalogu roboczego." msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Brak" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Zwykły" @@ -6898,30 +7004,30 @@ msgstr "" msgid "North European" msgstr "północnoeuropejski" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Pliki nie objęte kontrolą wersji" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Nie wszystkie pliki można pobrać i zweryfikować." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nie wszystkie wpisy w rejestrze systemu (lub pliki INI) zostały usunięte." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Za mało pamięci do dokończenia operacji." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Brak pamięci!\nZmniejsz rozmiar wykresu zwijając niektóre\nelementy lub zmniejszając powiększenie." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Nie utworzono poprawek." @@ -6929,7 +7035,7 @@ msgstr "Nie utworzono poprawek." msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6948,26 +7054,26 @@ msgstr "Uwaga: folder zawiera niewersjonowane elementy" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Uwaga: dotyczy to wszystkich klientów Tortoise, nie tylko TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Uwagi" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Nic nie wymaga zmiany bazy\n%s jest równe %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Nie ma nic do zmiany bazy" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Nie ma nic do zatwierdzenia" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Uwaga" @@ -6975,7 +7081,7 @@ msgstr "Uwaga" msgid "Number Commits" msgstr "Liczba zatwierdzeń" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Liczba %s" @@ -6988,7 +7094,7 @@ msgstr "Liczba użytkowników:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7060,41 +7166,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Inicjalizacja OLE nie powiodła się. Upewnij się, że biblioteki OLE są w prawidłowej wersji." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Kolory Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7102,15 +7208,15 @@ msgstr "" msgid "Older lines" msgstr "Starsze linie" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Na żądanie" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Jeden lub więcej automatycznie zapisanych dokumentów zostało znalezionych." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Jeden lub wiele plików znajduje się w stanie konfliktu." @@ -7122,29 +7228,29 @@ msgstr "Tylko bieżąca gałąź" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Tylko scalone pliki" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Tylko pliki podrzędne" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Można użyć wyłącznie liczb (ewentualnie oddzielonych przecinkami)!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Tylko ten element" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Otwórz" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7154,51 +7260,52 @@ msgstr "Otwórz istniejący dokument\nOtwórz" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Otwórz pliki do porównania lub zastosowania pliku poprawek\nOtwórz pliki" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Otwórz ze schowka" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Otwórz plik obrazu..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Otwórz folder nadrzędny" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Otwórz dokument" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Otwórz z..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Wyświetla pomoc do programu\nTematy pomocy" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Otwiera przeglądarkę repozytorium" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opcja" @@ -7207,30 +7314,30 @@ msgid "Options" msgstr "Opcje" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Wielkość ory&ginalna" +msgid "Ori&ginal size\tS" +msgstr "Wielkość ory&ginalna\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Inne panele zadań" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Innych" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Brak pamięci." @@ -7238,7 +7345,7 @@ msgstr "Brak pamięci." msgid "Output Directory" msgstr "Katalog wyjściowy" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7246,20 +7353,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Nadpisz, jeśli gałąź istnieje" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Strona %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7270,15 +7381,15 @@ msgstr "Strona %u\nStrony %u-%u\n" msgid "Page :" msgstr "Strona:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Panel 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Panel 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametry" @@ -7286,25 +7397,25 @@ msgstr "Parametry" msgid "Parameters:" msgstr "Parametry:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Rodzic %d nie istnieje" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Rodzic(e)" @@ -7316,39 +7427,39 @@ msgstr "Część kodu pochodzi z TortoiseSVN Blame" msgid "Password" msgstr "Hasło" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Hasło:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Wklej" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Wklej ostatnią wiadomość..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Narzędzie wklejania\nWklej" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Wstaw listę plików" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Wklej ostatnią zatwierdzoną wiadomość" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Wkleja ścieżkę svn ze schowka, co skutkuje przeniesieniem (wytnij) lub skopiowaniem elementu" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7364,32 +7475,32 @@ msgstr "Popraw &wybrane pozycje" msgid "Patch As Attachment" msgstr "Łatka jako załącznik" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Popraw wszystkie pliki" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Popraw wybrane pliki" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Pliki poprawek (*.diff, *.patch)|*.diff;*.patch|Wszystkie pliki (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Poprawianie" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Poprawiam plik '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Ścieżka" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Znaleziono ścieżkę lepiej pasującą do poprawki." @@ -7397,21 +7508,21 @@ msgstr "Znaleziono ścieżkę lepiej pasującą do poprawki." msgid "Path:" msgstr "Ścieżka:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Ścieżki" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Narzędzie ołówka\nOłówek" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Procent autorstwa" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Procenty" @@ -7419,24 +7530,24 @@ msgstr "Procenty" msgid "Personalized Menus and Toolbars" msgstr "Spersonalizowane menu i paski narzędzi" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Wybierz" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7446,56 +7557,56 @@ msgstr "Obraz (metaplik)\nobraz" msgid "Picture:" msgstr "Obraz:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Wykres kołowy" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Proszę wprowadzić skrypt przechwytujący do wykonania." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Wpisz proszę ścieżkę do której zastosować skrypt przechwytujący." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Proszę wybrać typ przechwycenia" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Trwa anulowanie operacji. Proszę czekać..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Proszę czekaj aż zostaną pobrane różnice..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Proszę czekać..." @@ -7511,11 +7622,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Przechwycenie po zatwierdzaniu" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7523,25 +7634,25 @@ msgstr "" msgid "Pre&v Page" msgstr "&Poprzednia strona" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Przechwycenie przed zatwierdzaniem" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Przygotowywanie zatwierdzenia zmian..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" -msgstr "" +msgstr "Poprzedź prawy blok" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" -msgstr "" +msgstr "Poprzedź tym blokiem lewą stronę" #. Resource IDs: (65535) msgid "Press &New Shortcut Key:" @@ -7551,11 +7662,11 @@ msgstr "Naciśnij &nowy klawisz skrótu:" msgid "Press &new shortcut key:" msgstr "Naciśnij &nowy klawisz skrótu:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Podgląd" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Podgląd pliku poprawek" @@ -7567,51 +7678,51 @@ msgstr "Podgląd: " msgid "Previous" msgstr "Poprzedni" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Poprzednia strona\nPoprzednia strona" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Poprzednia wersja" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Poprzedni konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Poprzednia różnica" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Poprzednia różnica w linii" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Drukuj" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Drukuj dokument\n&Drukuj" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Wydrukuj aktywny dokument, używając bieżących opcji\nSzybki wydruk" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Wydrukuj aktywny dokument\nWydrukuj" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Drukuj do pliku" @@ -7619,7 +7730,7 @@ msgstr "Drukuj do pliku" msgid "Printer :" msgstr "Drukarka :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Pliki wydruku (*.prn)|*.prn|Wszystkie pliki (*.*)|*.*||" @@ -7627,11 +7738,11 @@ msgstr "Pliki wydruku (*.prn)|*.prn|Wszystkie pliki (*.*)|*.*||" msgid "Printing" msgstr "Drukowanie" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programy (*.exe)|*.exe|Wszystkie pliki (*.*)|*.*||" @@ -7639,11 +7750,11 @@ msgstr "Programy (*.exe)|*.exe|Wszystkie pliki (*.*)|*.*||" msgid "Progress" msgstr "Stan zaawansowania" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" -msgstr "" +msgstr "Projekt" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Atrybut" @@ -7651,17 +7762,17 @@ msgstr "Atrybut" msgid "Property Page" msgstr "Strona atrybutów" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Dostawca" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Para&metry dostawcy:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Provider uuid win&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7683,15 +7794,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7699,19 +7810,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "" @@ -7727,11 +7838,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7739,22 +7850,22 @@ msgstr "" msgid "Putty Key:" msgstr "Klucz Putty:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Prywatny klucz Putty (*.ppk)|*.ppk|Wszystkie pliki (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Zamyka program; przypomina o zapisaniu zmian w dokumencie\nWyjście" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7772,11 +7883,15 @@ msgstr "&RAM-dyski" msgid "R&eset" msgstr "Z&resetuj" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "Wy&cofaj zmiany do tej wersji" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "ZMIANA BAZY" @@ -7784,7 +7899,7 @@ msgstr "ZMIANA BAZY" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7806,7 +7921,7 @@ msgstr "Zd&alny:" msgid "Re&movable drives" msgstr "Dyski &wymienne" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Zmień &nazwę..." @@ -7822,15 +7937,15 @@ msgstr "Zresetuj &wszystko" msgid "Re&store defaults" msgstr "Przy&wróć domyślne" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Wycofaj zmiany..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Przeczytaj 'Daily Use Guide' zanim rozpoczniesz na dobre..." @@ -7838,21 +7953,21 @@ msgstr "Przeczytaj 'Daily Use Guide' zanim rozpoczniesz na dobre..." msgid "Rebase" msgstr "Zmiana bazy" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Zmień bazę \"%s\" na..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Zmień bazę..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Zmiana bazy... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Ostatnie" @@ -7864,21 +7979,21 @@ msgstr "Najnowszy plik" msgid "Recently modified lines" msgstr "Ostatnio zmieniane linie" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Tylko zapisz" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Odzyskaj dokumenty zapisane automatycznie\nOtwórz wersje zapisane automatycznie zamiast wersji zapisanych jawnie" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Powróć do statusu przed zmianą bazy" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7892,17 +8007,21 @@ msgstr "" msgid "Recursive" msgstr "Rekursywne" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Ponawia uprzednio cofniętą akcję\nPonów" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Zwiń okno do ikony" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7910,43 +8029,43 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Nazwa odniesienia" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Odśwież" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Odświeżanie..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" -msgstr "" +msgstr "Filtr z Wyrażeniem Regularnym" #. Resource IDs: (164) msgid "Regex Filters" -msgstr "" +msgstr "Filtry z Wyrażeniem Regularnym" #. Resource IDs: (65535) msgid "Regex:" -msgstr "" +msgstr "Wyrażenie Regularne:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7965,7 +8084,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtr wyrażeń regularnych:\r\n. : dowolny znak\r\nc+ : znak c jeden lub więcej razy\r\nc* : znak c zero lub więcej razy\r\n^ : początek linii\r\n$ : koniec linii\r\n(abcd){n} : abcd n razy\r\n(abcd) : podwyrażenie\r\n[aei0-9] : a,e,i i 0..9\r\n[^aei0-9] : wszystko oprócz a,e,i i 0..9\r\n\r\n\\w : a-z,A-Z,0-9 and _\r\n\\W : dowolny znak niealfanumeryczny\r\n\\d : cyfry 0-9\r\n\\s : białe znaki (znaki niedrukowalne)" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Odrzucone hunks-poprawki dla '%s'" @@ -7978,7 +8097,7 @@ msgstr "Czasy względne w dzienniku" msgid "Reload" msgstr "Przeładuj" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8012,19 +8131,19 @@ msgstr "" msgid "Remote Branch" msgstr "Zdalna gałąź" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "Zdalny adres URL nie może być pusty." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Nazwa zdalna nie może być pusta." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Status zdalny" @@ -8036,12 +8155,12 @@ msgstr "Zdalny:" msgid "Remove" msgstr "Usuń" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Usuń %ld elementów" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Usuń %s" @@ -8050,7 +8169,7 @@ msgstr "Usuń %s" msgid "Remove &all untracked files (-fx)" msgstr "Usuń &wszystkie nieśledzone pliki (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Usuń &gałąź" @@ -8058,21 +8177,21 @@ msgstr "Usuń &gałąź" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" -msgstr "" +msgstr "Usuń wszystkie komentarze przed wykonaniem porównania aby zmiany wewnątrz komentarzy nie były wyświetlane jako różnice" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Usuń z listy &ignorowanych" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Usuń z paska szybkiego dostępu" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Usuń z listy zmian" @@ -8084,7 +8203,7 @@ msgstr "Usuń ignorowane pliki (-fX)" msgid "Remove untracked directories (-d)" msgstr "Usuń nieśledzone katalogi (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Usuń nieśledzone pliki z kopii roboczej..." @@ -8092,11 +8211,11 @@ msgstr "Usuń nieśledzone pliki z kopii roboczej..." msgid "Removed" msgstr "Usunięto" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Usunięto z listy zmian" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8104,7 +8223,7 @@ msgid "" "from the ignore list." msgstr "Usunięto wzorce plików\n%s\nz listy ignorowanych." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Usuwa zaznaczone pliki lub maski plików z listy ignorowanych" @@ -8112,11 +8231,11 @@ msgstr "Usuwa zaznaczone pliki lub maski plików z listy ignorowanych" msgid "Rena&me..." msgstr "Z&mień nazwę..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Zmień nazwę" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Zmień nazwę %s" @@ -8125,20 +8244,20 @@ msgstr "Zmień nazwę %s" msgid "Rename - TortoiseGit" msgstr "Zmień nazwę - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Zmień nazwę/przenieś" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Zmienia nazwy plików/folderów wewnątrz kontroli wersji" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8146,9 +8265,9 @@ msgstr "Powtarza ostatnią operację\nPowtórz" #. Resource IDs: (1512) msgid "Replace &All" -msgstr "" +msgstr "Zastąp &Wszystkie" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8156,18 +8275,18 @@ msgstr "Zamienia podany tekst na inny\nZamień" #. Resource IDs: (65535) msgid "Replace with:" -msgstr "" +msgstr "Zastąp przez:" #. Resource IDs: (65535) msgid "Replace:" -msgstr "" +msgstr "Zastąp:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" -msgstr "" +msgstr "Zastąpiono %d dopasowań" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Zastępowanie" @@ -8191,11 +8310,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Prośba o nazwę użytkownika i hasło" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "R&ozwiąż..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Resetuj" @@ -8207,25 +8326,25 @@ msgstr "Zresetuj &wszystko" msgid "Reset Type" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Resetuj \"%s\" do tego..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Resetuj aktywną gałąź" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Przywróć kolumny" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Rozwiąż konflikt" @@ -8233,126 +8352,122 @@ msgstr "Rozwiąż konflikt" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Rozwiąż konflikt używając 'moje'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Rozwiąż konflikt używając 'ich'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Rozwiązany" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Rozwiązany:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Rozwiązuje konflikty w plikach" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Ponownie uruchom zmianę bazy" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Przywrócenie" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Przywróć domyślne" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Przywróć po zatwierdzeniu" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Przywraca normalny rozmiar okna" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Przywrócono" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Ponów próbę" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Wycofaj zmiany" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Cofnij zatwierdzenie" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Cofnij zatwierdzenie %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Wycofaj do wersji %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Wycofane zmiany" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Wycofuje wszystkie zmiany dokonane od ostatniej aktualizacji" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Odwraca dodanie do kontroli wersji" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Przejrzyj poprawkę przy pomocy TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Przejrzyj/zastosuj plik różnicowy przy pomocy TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Przeglądaj/zatwierdź pojedynczą zmianę..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Wersja" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Wersja %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Wersja %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Pokaż w&ykres wersji" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Zmiana plików" @@ -8368,31 +8483,31 @@ msgstr "Filtr wykresu wersji" msgid "Revision graph" msgstr "Pokaż wykres wersji" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Weryfikacja:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntekst z formatowaniem" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Widok prawy: " @@ -8400,21 +8515,21 @@ msgstr "Widok prawy: " msgid "Right image" msgstr "Prawy obraz" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Wiersz %d z %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Wiersz %d-%d z %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Wiersz niżej" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Wiersz wyżej" @@ -8422,11 +8537,11 @@ msgstr "Wiersz wyżej" msgid "S&elect..." msgstr "&Zaznacz..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Pokaż przyciski w &jednym rzędzie" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Pokaż przyciski w &dwóch rzędach" @@ -8434,25 +8549,33 @@ msgstr "Pokaż przyciski w &dwóch rzędach" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "P&okaż Pasek Szybkiego Dostępu pod wstążką" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatystyki" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "&Przełącz/pobierz..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8462,7 +8585,7 @@ msgstr "Parametry uwierzytelnienia serwera SMTP" msgid "SMTP Server:" msgstr "Serwer SMTP:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8470,31 +8593,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Pobierz" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8506,15 +8629,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8530,37 +8653,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Przykładowy tekst:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Zapisz" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Zapisz j&ako..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Zapisz j&ako...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Zapisz jako" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Zapisz dolny plik\nMożna wskazać miejsce zapisu dolnego pliku" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Zapisz plik" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Zapisz lewy plik jako\nMożna wskazać miejsce zapisu lewego pliku" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8568,13 +8695,13 @@ msgid "" "%s" msgstr "Zapisz lewy plik\nZmiany zostaną zapisane do\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Zapisz prawy plik jako\nMożna wskazać miejsce zapisu prawego pliku" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8582,74 +8709,74 @@ msgid "" "%s" msgstr "Zapisz prawy plik\nZmiany zostaną zapisane do\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Zapisz wszystko\nZostaną zapisane oba pliki" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" -msgstr "" +msgstr "Zapisz i wyklucz\nTwoje zmiany zostaną zapisane a użyta będzie oryginalna zawartość" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Zapisz i zignoruj zaznaczone bloki\nZapisane będą tylko twoje ręczne zmiany, zaznaczone bloki będą pozostawione bez zmian" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "" +msgstr "Zapisz i dołącz\nTwoje zmiany zostaną zapisane a zaznaczone bloki będą dołączone" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Zapisz jako" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Zapisz jako..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Zapisz jako\nMożna wskazać miejsce zapisu pliku" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Zapisz zmiany do %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Zapisz zmiany." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Zapisz wersję &w..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Zapisuje aktywny dokument pod nową nazwą\nZapisz jako" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Zapisuje aktywny dokument\nZapisz" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8671,13 +8798,13 @@ msgstr "Zapisz plik różnicowy" msgid "Save unified diff since HEAD" msgstr "Zapisz plik różnicowy od wersji HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Zapisz\nZapisanie pliku ze znacznikami konfliktu." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8689,28 +8816,28 @@ msgstr "Zapisz\nZmiany zostały zapisane do\n%s" msgid "Saved Data" msgstr "Zapisane dane" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Zapisywanie konfiguracji nie powiodło się (klucz: \"%s\", wartość: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Zapisywanie notki nie powiodło się." #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Skanuj" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Przewiń w lewo" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Przewiń w prawo" @@ -8718,32 +8845,32 @@ msgstr "Przewiń w prawo" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Szukaj w &opisach zmian..." #. Resource IDs: (1074) msgid "Search &up" -msgstr "" +msgstr "Sz&ukaj powyżej" #. Resource IDs: (65535) msgid "Search for:" msgstr "Szukaj:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Szukam lepszej ścieżki do zastosowania poprawki..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Przeszukiwanie %1 zakończone niepowodzeniem" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Zaznacz" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Zaznacz &wszystko" @@ -8759,59 +8886,59 @@ msgstr "Wybierz menu &kontekstowe:" msgid "Select &window:" msgstr "Wybierz &okno:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Narzędzie wybierania koloru\nWybierz kolor" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Wybierz plik..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Wybierz klienta SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Wybierz przycisk." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Wskaż element, na którego temat chcesz uzyskać pomoc" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Wybierz listę zmian" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Wybierz program do porównywania" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Wybierz folder, który powiązać z tym systemem śledzenia błędów" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Wskaż folder, do którego ma nastąpić eksport.\nByć może trzeba będzie utworzyć nowy folder przed rozpoczęciem eksportu." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Wybierz folder dla którego uruchomić hook-skrypt" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Wybierz folder do którego zachować wybrane pliki" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Wybierz plik skryptu przechwytującego" @@ -8819,20 +8946,20 @@ msgstr "Wybierz plik skryptu przechwytującego" msgid "Select items automatically" msgstr "Zaznacz elementy automatycznie" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Wybierz program do scalania plików" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Wybierz cel scalania" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8842,17 +8969,21 @@ msgstr "Zaznacza cały dokument\nZaznacz wszystko" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Wybierz język dla tego projektu. To ustawienie skutkuje wykorzystaniem narzędzia sprawdzenia pisowni dla wiadomości zatwierdzania." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Wybierz program do przeglądania plików różnicowych" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Wybierz, który plik chcesz zapisać pod inną nazwą" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8862,7 +8993,7 @@ msgstr "Wybierz, który plik chcesz zapisać pod inną nazwą\nUwaga: Występuje msgid "Select/deselect &all" msgstr "Zaznacz/odznacz &wszystko" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8870,7 +9001,7 @@ msgstr "" msgid "Send" msgstr "Wyślij" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Wyślij e-maila" @@ -8878,11 +9009,11 @@ msgstr "Wyślij e-maila" msgid "Send Mail after create" msgstr "Wyślij maila po utworzeniu" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Nie udało się wysłać wiadomości." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Wyślij e-maila..." @@ -8890,19 +9021,19 @@ msgstr "Wyślij e-maila..." msgid "Send Patch" msgstr "Wyślij zmiany" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Wyślij zmiany na e-maila" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Wyślij zmianę(zmiany) na maila" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Wysyłanie zawartości" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Wysyłanie..." @@ -8922,28 +9053,28 @@ msgstr "Ustaw au&tora" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Ustawianie atrybutów..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Ustawienia" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Ustawienia - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Powłoka" @@ -8951,7 +9082,7 @@ msgstr "Powłoka" msgid "Shell Extended" msgstr "Powłoka rozszerzona" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Pamięć podręczna ikon systemowych została przebudowana!" @@ -8963,7 +9094,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Użyj krótkiego formatu &daty/czasu w opisach zmian" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Skróć listę atrybutów" @@ -8975,7 +9106,7 @@ msgstr "Pokaż" msgid "Show &Accelerator for:" msgstr "Pokaż &skrót do:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8983,15 +9114,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "Pokaż &niewersjonowane pliki" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Pokaż &cały projekt" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Pokaż &zmiany" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Pokaż &dziennik" @@ -8999,15 +9130,19 @@ msgstr "Pokaż &dziennik" msgid "Show &log..." msgstr "Pokaż &dziennik..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "&Nakładki i menu kontekstowe pokazuj tylko w eksploratorze" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Pokaż nad wstążką" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Pokaż pod wstążką" @@ -9015,35 +9150,35 @@ msgstr "Pokaż pod wstążką" msgid "Show Environment Variables" msgstr "Pokaż zmienne środowiskowe" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Pokaż mniej przycisków" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Pokaż węzły wersji HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Pokaż różnice w linii uwzględniając słowa\nRóżnice w linii wg słów" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Pokaż różnice w linii\nRóżnice w linii" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Pokaż więcej przycisków" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Pokaż pasek szybkiego dostępu nad wstążką" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Pokaż pasek szybkiego dostępu pod wstążką" @@ -9051,11 +9186,11 @@ msgstr "Pokaż pasek szybkiego dostępu pod wstążką" msgid "Show Screen&Tips on toolbars" msgstr "Pokaż &podpowiedzi na paskach narzędzi" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Pokaż białe znaki" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Pokaż przegląd całego wykresu" @@ -9063,7 +9198,7 @@ msgstr "Pokaż przegląd całego wykresu" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9071,11 +9206,11 @@ msgstr "" msgid "Show author" msgstr "Pokaż autora" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Pokaż gałęzie tego zatwierdzenia, jeśli włączone" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Pokaż zmiany w formacie &Unified Diff" @@ -9095,15 +9230,15 @@ msgstr "Pokaż datę" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Pokaż folder docelowy" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Pokaż różnice" @@ -9115,11 +9250,15 @@ msgstr "Porównaj z poprzednią wersją" msgid "Show excluded folders as normal" msgstr "Pokaż foldery wykluczone jako normalne" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Pokaż &pełne menu po chwili" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9135,7 +9274,7 @@ msgstr "Pokaż &ignorowane pliki" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9143,90 +9282,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Pokaż &numery linii" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Pokaż log" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Pokaż log &przed zmianą nazwy/kopiowaniem" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Pokaż log podmodułu" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Pokaż log tego folderu" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Pokaż log..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Pokaż niezmodyfikowane pliki w kopii roboczej" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Pokaż następną zmianę wybranego zatwierdzenia\nPokaż następną" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Pokaż najstarsze węzły na górze" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Pokazuje lub ukrywa pasek różnic linii\nPrzełącz pasek różnic w linii" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Pokazuje lub ukrywa pasek lokalizacji\nPrzełącz pasek lokalizacji" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Pokaż lub ukryj pasek stanu\nPrzełącz pasek stanu" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Pokazuje lub ukrywa pasek stanu\nPrzełącz pasek stanu" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Pokazuje lub ukrywa pasek narzędzi\nPrzełącz pasek narzędzi" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Pokaż poprzednią zmianę wybranego zatwierdzenia\nPokaż poprzednią" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Pokaż atrybuty wersji" @@ -9234,7 +9373,7 @@ msgstr "Pokaż atrybuty wersji" msgid "Show shortcut &keys in ScreenTips" msgstr "Pokaż skróty &klawiaturowe w podpowiedziach" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9244,7 +9383,7 @@ msgstr "Wyświetla znaki specjalne aby pokazać białe znaki i znaki końca lini msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9256,45 +9395,43 @@ msgstr "Pokaż &niezmodyfikowane pliki" msgid "Show un&versioned files" msgstr "Pokaż nie&wersjonowane pliki" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Pokaż/ukryj" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Prezentuje graficzną reprezentację kopii/etykiet/gałęzi" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Pokazuje wszystkie pliki zmienione od czasu ostatniej aktualizacji - lokalnie i w repozytorium" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Pokazuje informacje o TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Pokazuje referencyjny log" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Pokazuje log akcji w domyślnym edytorze tekstowym" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Pokazuje log dla wybranego pliku/folderu" @@ -9306,7 +9443,7 @@ msgstr "Ozn&acz" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Styl srebrny" @@ -9314,20 +9451,20 @@ msgstr "Styl srebrny" msgid "Since" msgstr "Od" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Rozmiar" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Pomiń" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Pomiń poprawkę: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Pomiń drzewo robocze" @@ -9335,23 +9472,23 @@ msgstr "Pomiń drzewo robocze" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Pominięto" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Pominięto brakujący obiekt docelowy" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Przesuń" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" -msgstr "" +msgstr "Inteligentny znak tabulacji" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9359,13 +9496,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Niektóre pliki zostały zmienione poza programem TortoiseGitMerge.\nCzy chcesz wczytać zmiany?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9379,7 +9516,7 @@ msgstr "Posortuj wg liczby zapisów" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9389,57 +9526,61 @@ msgstr "Określa, jak wiele elementów chcesz pokazywać w oknie z ostatnimi opi msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Podziel linie" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Dzieli aktywne okno na panele\nPodziel" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Skumulowany wykres kolumnowy" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Skumulowany wykres liniowy" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Przechwycenie początku zatwierdzania" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Uruchom zmianę bazy" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Start trybu bisekcji..." #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Uruchom edytor rejestru" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9451,39 +9592,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statyczny" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statystyka" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Stan" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Konfiguracja paska statusu" @@ -9495,32 +9644,32 @@ msgstr "Kolory statusów i akcji" msgid "Status cache" msgstr "Pamięć podręczna statusu" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Pamięć podręczna statusu tylko dla jednego katalogu, nie sprawdza statusu podkatalogów" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Zakończenie trybu bisekcji" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." -msgstr "" +msgstr "Zapisuje ścieżkę do pliku by jej użyć do porównania podczas kolejnych prawoklików. Trzymaj wciśnięty klawisz Ctrl by usunąć ostatnio zapisaną ścieżkę." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Strategia" @@ -9528,15 +9677,15 @@ msgstr "Strategia" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Styl" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Temat" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Temat:" @@ -9544,7 +9693,7 @@ msgstr "Temat:" msgid "Submodule" msgstr "Podmoduł" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9552,7 +9701,7 @@ msgstr "" msgid "Submodule Add" msgstr "Dodaj podmoduł" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9560,15 +9709,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9576,7 +9725,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "Opcje aktualizacji podmodułu" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9591,15 +9740,15 @@ msgstr "" msgid "Submodules" msgstr "Podmoduły" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Powodzenie" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Przełącz" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Przełącz %s na %s, wersja %s" @@ -9608,43 +9757,43 @@ msgstr "Przełącz %s na %s, wersja %s" msgid "Switch To" msgstr "Przełącz do" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Przełącza na poprzedni panel okna\nPoprzedni panel" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Przełącz pomiędzy widokiem jedno- i dwupanelowym" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Przełącza pomiędzy widokiem jedno- i dwupanelowym\nPrzełącz pomiędzy widokiem jedno- i dwupanelowym" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Zamień lewy i prawy widok" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Zamień zawartość lewego i prawego widoku\nZamień lewy i prawy widok" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Przełącz na okno następnego dokumentu" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Przełącza na następny panel okna\nNastępny panel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Przełącz na okno poprzedniego dokumentu" @@ -9652,21 +9801,21 @@ msgstr "Przełącz na okno poprzedniego dokumentu" msgid "Switch/Checkout" msgstr "Przełącz/pobierz" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Przełącz/Pobierz do" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Przełącz/Pobierz do..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Przełącz kopię roboczą na inną gałąź/etykietę" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Przełącza porównanie Lewy<->Prawy" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9676,23 +9825,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Synchronizacja..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9702,13 +9851,13 @@ msgstr "Usunięto wpisy w rejestrze systemu oraz ewentualne pliki INI." msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9722,7 +9871,7 @@ msgstr "Tabulator" msgid "Tab size:" msgstr "Rozmiar tabulatora:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Tag" @@ -9730,16 +9879,16 @@ msgstr "Tag" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Oznaczenie kopii roboczej jako %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Tagi" @@ -9747,11 +9896,11 @@ msgstr "Tagi" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Zadania" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Panel zadań" @@ -9763,11 +9912,11 @@ msgstr "" msgid "Test" msgstr "Testuj" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Tylko testuj" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9775,13 +9924,19 @@ msgstr "" msgid "Thai" msgstr "tajski" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "Istnieją niezapisane modyfikacje!\nChcesz zapisać lub odrzucić zmiany?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9789,64 +9944,78 @@ msgid "" "Do you really want to delete it?" msgstr "Gałąź \"%s\" jest gałęzią zdalną.\n\nCzy naprawdę chcesz ją usunąć?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Rozmiar bloku nie pokrywa się z liczbą dodanych/usuniętych linii!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Opis zatwierdzenia nie może być pusty." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Adres URL pomocnika poświadczeń \"%s\" już istnieje.\nCzy chcesz go zamienić?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "Pomocnik poświadczeń został zmieniony.\nCzy chcesz go zapisać czy odrzucić zmiany?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Proces porównywania został przerwany z powodu następującego błędu:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Plik %s nie istnieje!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Plik %s nie został znaleziony w pliku poprawek!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Plik \"%s\" nie istnieje w kopii roboczej.\nCzy chcesz wybrać inny plik różnicowy?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9855,15 +10024,15 @@ msgid "" "Do you want to remove the file?" msgstr "Plik\n%s\njest pusty.\nNa pewno chcesz usunąć plik?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Plik jest zbyt duży" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Plik jest zbyt duży, aby go otworzyć." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9871,7 +10040,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Plik\n%s\njuż istnieje! Czy chcesz zamienić istniejący plik?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9879,14 +10048,14 @@ msgid "" "is not a valid text file!" msgstr "Plik\n%s\nnie jest poprawnym plikiem tekstowym!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Folder %s\nzawiera niewersjonowane i/lub zmienione pliki. Czy mimo tego chcesz go usunąć?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9895,78 +10064,78 @@ msgid "" "Would you like to create it first?" msgstr "Folder\n%s\nnie istnieje.\nCzy chcesz go utworzyć?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Skrypt przechwytujący zwrócił błąd:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Obraz nie może być pokazany." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Nie można utworzyć dostawcy dla systemu śledzenia błędów. Sprawdź, czy jest on zainstalowany poprawnie." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Dostawca dla systemu śledzenia błędów nie był stanie zweryfikować podanych parametrów" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Oczekiwano linii wskazującej nowy plik w linii %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Numer linii musi być pomiędzy %d i %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "Nazwy lokalnej i zdalnej gałęzi są puste.\nKontynuować?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "The local branch/tag name is empty. This results in a remote removal.\nContinue?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Maksymalna liczba linii dziennika akcji.\nJakiekolwiek linie dodane powyżej tego limitu usuną stare z pliku." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Operacja zakończona niepowodzeniem." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Parametry '/path' i '/pathfile' wzajemnie się wykluczają.\nMusisz użyć tylko jednego z nich." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9976,7 +10145,7 @@ msgid "" "do not match!" msgstr "Plik poprawek wydaje się być przedawniony! Linia w pliku\n%s\ni linia w poprawce\n%s\nnie pokrywają się!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9987,7 +10156,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Scieżka/URL którą wprowadziłeś wygląda na nieprawidłową\nw Windows! Możesz próbować jej użyć, ale później może wystąpić błąd.\n\nPoprawna ścieżka w Windows nie może zawierać '<<>|\"?*:' lub jednej z następujących nazw urządzeń:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nCzy mimo to chcesz kontynuować? " -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9998,36 +10167,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Ścieżka\n%s\nwydaje się nie pasować do ścieżek w pliku poprawki.\nJednakże TortoiseGitMerge odkrył, że ścieżka\n%s\npasuje lepiej. Czy chcesz użyć zasugerowanej ścieżki?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "Wyrażenie regularne jest niepoprawne!\nProszę podaj poprawne wyrażenie regularne." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Plik %s już istnieje.\nCzy chcesz zamienić istniejący plik?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Repozytorium zostało utworzone poprawnie." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Wybrany plik prawdopodobnie wciąż zawiera wewnątrz markery konfliktu.\nCzy na pewno chcesz oznaczyć ten plik jako plik z rozwiązanym konfliktem?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10035,7 +10211,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10044,7 +10220,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10053,26 +10229,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Folder docelowy\n%s\nnie jest pusty!\nCzy na pewno chcesz zainicjować repozytorium git wewnątrz tego folderu?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" -msgstr "" +msgstr "Treść jest taka sama, jednak pliki różnią się!\nZnaleziono następujące różnice:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Czas w sekundach, po którym zatrzymuje się parsowanie wybranych plików.\r\nMniejsza wartość spowoduje, że lista podpowiedzi będzie dostępna wcześniej,\r\njednak mogą nie zostać zeskanowane wszystkie pliki." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Dwa wybrane adresy URL nie zostały utworzone ze wspólnego pnia.\nNie jest możliwe pokazanie opisów zmian pomiędzy nimi!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10082,34 +10258,34 @@ msgstr "" msgid "Their file:" msgstr "Ich plik:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Ich" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Obecnie zainstalowane jest %d uchwytów nakładek oprócz używanych przez Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" -msgstr "" +msgstr "Jest więcej widoków do zapisu.\nKtóry widok należy zapisać?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Nie ma dostępnych dostawców dla systemów śledzenia błędów." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10118,85 +10294,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "W linii %d pozostał nierozwiązany konflikt!\nZaleca się, aby przed zapisaniem pliku rozwiązać wszystkie konflikty.\nCzy na pewno chcesz zapisać plik z nierozwiązanymi konfliktami?\nJeśli klikniesz TAK, to konflikty trzeba będzie rozwiązać ręcznie za pomocą innego edytora!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Istnieją niezapisane modyfikacje!\nCzy chcesz zapisać zmiany?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Brak elementów do dodania. Wszystkie pliki lub foldery są już objęte kontrolą wersji, albo zostały zignorowane z użyciem atrybutu svn:ignore lub globalnego ustawienia konfiguracyjnego do ignorowania plików." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Słownik" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Te dokumenty są aktualniejsze niż obecnie otwarte i zawierają zmiany, które zostały wprowadzone przed zamknięciem aplikacji." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "To pole jest wymagane i nie może być puste." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "To nie jest poprawny adres URL.\nWprowadź adres URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "To nie jest właściwa ścieżka!\nPoprawna ścieżka w Windows nie może zawierać '<<>|\"?*:' lub jednej z następujących nazw urządzeń:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Program jest połączony z brakującym eksportem %s w pliku %s. Ten komputer może mieć niekompatybilną wersję %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Ten program wymaga pliku %s, który nie został znaleziony w systemie." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Ten atrybut dotyczy wyłącznie folderów, nie plików." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "To zadanie wymaga czystego drzewa pracy." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "To usunie rekord z twoimi komendami, które użyłeś w tej aplikacji i przywróci domyślny zestaw widocznych komend dla menu i pasków narzędzi. Nie cofnie to żadnych indywidualnych dostosowań. Jesteś pewien, że chcesz tego użyć?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Trójstronne porównanie" @@ -10212,14 +10388,14 @@ msgstr "Porządkuj pozi&omo" msgid "To" msgstr "Do" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10231,13 +10407,13 @@ msgstr "" msgid "To:" msgstr "Do:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Przełącz widok jednej/dwóch zakładek\nPrzełącz widok jednej/dwóch zakładek" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10249,11 +10425,11 @@ msgstr "Pasek narzędzi" msgid "Toolbar Name" msgstr "Nazwa paska narzędzi" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opcje paska narzędzi" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Wewnętrzny błąd paska narzędzi. Skontaktuj się z dostawcą aplikacji." @@ -10269,16 +10445,16 @@ msgstr "Narzędzia" msgid "Tools:" msgstr "Narzędzia:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10288,20 +10464,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit wykrył podobne nazwy plików. Czy chcesz również\nzmienić nazwy plików:%s?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit nie wyświetli następujących nakładek: %s" @@ -10310,18 +10486,18 @@ msgstr "TortoiseGit nie wyświetli następujących nakładek: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame został już zainicjowany dla repozytorium \"%s\". Nie można przejść do innego repozytorium (\"%s\") w czasie działania." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10337,7 +10513,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10345,7 +10521,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10359,36 +10535,36 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge nie może przetworzyć pliku poprawki. Nazwa pliku \"%s\" pojawia się więcej niż jeden raz." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10427,11 +10603,11 @@ msgstr "Śledź" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Transferuję z %s" @@ -10440,39 +10616,35 @@ msgstr "Transferuję z %s" msgid "Transparent &color..." msgstr "&Kolor przezroczysty..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" -msgstr "" +msgstr "Przytnij z prawej" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Spróbuj użyć opcji 'Uporządkuj'. Jeśli to nie pomoże, na nowo pobierz dane." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Spróbuj ponownie" - #. Resource IDs: (65535) msgid "Turkish" msgstr "turecki" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Dostosuj TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Typ" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Typ:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10496,24 +10668,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Nie udało się załadować systemu obsługi poczty." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Nie można wykonać polecenia, serwer jest zajęty." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Nie można odczytać %1, jest otwarty przez kogoś innego." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Nie można odczytać. Jest ustawiony atrybut ." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10521,91 +10693,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Nie udało się zrekonstruować ścieżko kopii roboczej!\nTo może się zdarzyć, jeżeli plik został przemianowany.\nUruchom okno logu na tym samym pliku, a następnie cofnij zmiany\nz górnego panelu w oknie logu." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Nie można zapisać. Jest ustawiony atrybut ." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Nie można zapisać %1, jest przeznaczony tylko do odczytu lub jest otwarty przez kogoś innego." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Odznacz" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Cofnij" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Cofnij %d Akcji" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Cofnij 1 Akcję" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Cofnij Dodaj..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Cofa ostatną operację\nCofnij" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Cofa ostatnie zmiany\nCofnij" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Nieodpowiedni format pliku." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Odsłoń" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Niesformatowany tekst\ntekst bez formatowania" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Plik różnicowy &głównych (HEAD) wersji" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Nieznany" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Nieznana głębokość" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Nierozwiązane konflikty!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Bez nazwy" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Niewersjonowane" @@ -10613,7 +10789,7 @@ msgstr "Niewersjonowane" msgid "Unversioned files mark parent folder as modified" msgstr "Niewersjonowane pliki skutkują oznaczeniem nadrzędnego folderu jako zmodyfikowany" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Odwersjonowanie %s" @@ -10624,25 +10800,25 @@ msgstr "Do góry" #. Resource IDs: (1710) msgid "Update" -msgstr "" +msgstr "Uaktualnij" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Aktualizuj podmoduł" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Uaktualniono" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Uaktualnianie obiektów ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Aktualizacja indeksu" @@ -10654,30 +10830,26 @@ msgstr "Użyj &domyślnego obrazu: " msgid "Use &one-pane view as default for 2-file diff" msgstr "Porównując dwa pliki użyj widoku &jednego panelu" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Użyj innego &bloku tekstu" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Użyj bloku tekstu z 'mój'" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Użyj bloków tekstu z 'mój' przed 'ich'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Użyj bloku tekstu z 'ich'" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Użyj bloków tekstu z 'ich' przed 'mój'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Użyj bloków" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Użyj składnika ścieżki HTTP" @@ -10698,15 +10870,15 @@ msgstr "Użyj uproszczonego pakietu (dla wolnych połączeń sieciowych)" msgid "Use Unified Diff from &clipboard" msgstr "Użyj pliku różnicowego ze &schowka" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10716,7 +10888,7 @@ msgstr "Użyj całej zawartości z lewej strony\nUżyj lewego pliku" msgid "Use block from left before right" msgstr "Użyj bloku z lewej przed prawym" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10726,25 +10898,25 @@ msgstr "Użyj bloku z lewej strony przed blokiem z prawej\nUżyj bloku z lewej p msgid "Use block from right before left" msgstr "Użyj bloku z prawej przed lewym" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Użyj bloku z prawej strony przed blokiem z lewej\nUżyj bloku z prawej przed lewym" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Użyj obu bloków tekstu (ten jako pierwszy)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Użyj obu bloków tekstu (ten jako ostatni)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Użyj lewego bloku" @@ -10760,77 +10932,77 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Użyj kosza przy wycofywaniu zmian" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Użyj wyrażenia regularnego" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" -msgstr "" +msgstr "Użyj prawego bloku" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" -msgstr "" +msgstr "Użyj spacji" #. Resource IDs: (1426) msgid "Use system locale for date/time" msgstr "Użyj systemowych ustawień daty/czasu" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Użyj bloku tekstu z '&mój'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Użyj bloku tekstu z '&ich'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Użyj bloku tekstu z 'mó&j' przed 'ich'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Użyj bloku tekstu z 'mój' przed 'ich'\nUżyj 'mój' blok tekstu a następnie 'ich'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Użyj bloku tekstu z 'mój'\nUżyj 'mój' blok tekstu" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Użyj bloku tekstu z 'ic&h' przed 'mój'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Użyj bloku tekstu z 'ich' przed 'mój'\nUżyj 'ich' blok tekstu a następnie 'mój'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Użyj bloku tekstu z 'ich'\nUżyj 'ich' blok tekstu" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Użyj bloku tekstu z lewego pliku\nUżyj lewy blok tekstu" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Użyj tego &bloku tekstu" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10838,7 +11010,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10850,19 +11022,19 @@ msgstr "" msgid "Use this" msgstr "Użyj tego" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Użyj tego w &całym pliku" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" -msgstr "" +msgstr "Użyj tego bloku z lewej strony" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Użyj &innego pliku w całości" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10878,11 +11050,11 @@ msgstr "Info o użytkowniku" msgid "User Name:" msgstr "Nazwa użytkownika:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Przerwane przez użytkownika" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10892,11 +11064,11 @@ msgstr "Nazwa użytkownika i e-mail muszą być ustawione przed zatwierdzeniem.\ msgid "User&name:" msgstr "Nazwa &użytkownika:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Użytkownik:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10913,9 +11085,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "Poprawnymi opcjami linii poleceń są:\n/base:<ścieżka do pliku bazowego>\n/basename:\n/theirs:<ścieżka do ich pliku>\n/theirsname:\n/mine:<ścieżka do mojego pliku>\n/minename:\n/merged:<ścieżka do wynikowego pliku scalenia>\n/mergedname:\n/diff:<ścieżka do zunifikowanego pliku różnic>\n/patchpath:<ścieżka do folderu>\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Wartość" @@ -10923,24 +11095,24 @@ msgstr "Wartość" msgid "Version" msgstr "Wersja" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Wersja %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Wersja 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Wersja 2 (bazowa)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10948,11 +11120,11 @@ msgstr "" msgid "Version Information" msgstr "Informacja o wersji" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Wersja:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Wersjonowany" @@ -10964,23 +11136,27 @@ msgstr "wietnamski" msgid "View" msgstr "Przeglądaj" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Zobacz poprawkę" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Zobacz poprawkę>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Podgląd wersji dla ścieżki w &przeglądarce" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Zobacz zmiany w alternatywnym edytorze" @@ -10992,11 +11168,11 @@ msgstr "" msgid "Visit our website" msgstr "Odwiedź naszą stronę internetową" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11007,7 +11183,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "UWAGA:\r\nZmieniaj te ustawienia tylko wtedy, kiedy jesteś pewien, co robisz!\r\nAby przywrócić wartości domyślne, wyczyść pola tekstowe." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Czekaj" @@ -11015,7 +11191,7 @@ msgstr "Czekaj" msgid "Wait for the script to finish" msgstr "Czekaj na zakończenie skryptu" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11023,15 +11199,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Ostrzeżenie" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Uwaga!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11039,7 +11215,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Sieć" @@ -11047,56 +11223,56 @@ msgstr "Sieć" msgid "Western European" msgstr "zachodnioeuropejski" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Podczas stosowania poprawki ignoruj różnice w białych znakach w liniach kontekstu" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Kiedy włączone, elementy poddane kontroli wersji pokazane w oknie zatwierdzania zmian będą automatycznie zaznaczone" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11106,15 +11282,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" -msgstr "" +msgstr "Zmiany białych znaków (tabulatory, spacje)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Białe znaki" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Położenie okna" @@ -11122,15 +11298,15 @@ msgstr "Położenie okna" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11174,11 +11350,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "W pliku" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Kopia robocza" @@ -11186,29 +11362,25 @@ msgstr "Kopia robocza" msgid "Working Tree Path:" msgstr "Ścieżka kopii roboczej:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Zmiana katalogu roboczego" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Zawijaj długie linie" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Zawijanie długich linia na prawym brzegu widoku\nZawijaj długie linie" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Tak" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Tak dla wszystkich" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Masz już zainstalowaną najnowszą wersję." @@ -11218,119 +11390,119 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Możesz tutaj wyłączyć wybrane uchwyty nakładek.\nWyłączone uchwyty nie będą wykorzystywać slotów i pozwolą innym rozszerzeniom na pokazanie ich nakładek." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Możesz wkleić bitmapę tylko o rozmiarach (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Nie możesz utworzyć więcej niż %d pasków narzędzi użytkownika!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Nie można ustawić tego atrybutu dla folderu. Działa tylko na plikach!\nJeśli chcesz ustawić atrybut dla wszystkich plików w tym folderze,\naktywuj opcję 'rekurencja'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" -msgstr "" +msgstr "Zaznaczyłeś zmienione bloki. Jak powinny zostać zapisane te bloki?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Zmodyfikowałeś atrybuty bez uprzedniego ich zapisania.\nCzy chcesz zapisać je teraz?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" "For every of these items a new instance of the diff viewer will be started.\n" "Do you really want to show the diff for so many items at once?" -msgstr "" +msgstr "Wybrano %d elementów do przejrzenia różnic.\nDla każdego z tych elementów zostanie uruchomiona przeglądarkaróżnic.\nCzy na pewno pokazać różnice dla tak wielu elementów na raz?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Nie podano numeru zgłoszenia!\nCzy na pewno chcesz zatwierdzić zmiany bez podania tego numeru?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Możesz zdefiniować do %d narzędzi." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Musisz wpisać wiadomość logu dla zatwierdzenia" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Musisz uruchomić ponownie komputer aby zmiany odniosły efekt." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Musisz wybrać nazwę dla pliku zip!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Wybrano folder.\nEksport jest możliwy tylko do pliku (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Zaznaczyłeś plik nie objęty kontrolą wersji.\nPodczas zatwierdzania zmian plik ten zostanie dodany do systemu kontroli." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Powinieneś wpisać tekst!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Powinieneś wybrać obraz!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Zmieniono zestaw ikon z %s na %s.\nZmiana będzie widoczna dopiero po ponownym uruchomieniu komputera lub przelogowaniu użytkownika!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11340,7 +11512,7 @@ msgstr "Poprzednio wprowadzony przez ciebie opis zmian został zapisany.\nKlikni msgid "Your version is:" msgstr "Twoja wersja:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Twoja wersja: %d.%d.%d.%d" @@ -11350,10 +11522,10 @@ msgid "Zip File" msgstr "Plik zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Po&mniejsz" +msgid "Zoo&m out\t-" +msgstr "Po&mniejsz\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Powiększenie" @@ -11365,80 +11537,80 @@ msgstr "Pow&iększ" msgid "Zoom &Out" msgstr "P&omniejsz" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Powiększenie 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Powiększ\nPowiększ" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Pomniejsz\nPomniejsz" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Po&większ" +msgid "Zoom i&n\t+" +msgstr "Po&większ\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Powiększ" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Pomniejsz" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Dopasuj do okna" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Dopasuj do wysokości" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Dopasuj do szerokości" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Domyślny]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Nieprzypisany]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" jest niepoprawny." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" nie jest repozytorium git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11452,7 +11624,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "dodane" @@ -11460,7 +11632,7 @@ msgstr "dodane" msgid "added files" msgstr "dodane pliki" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "plik bez nazwy" @@ -11468,14 +11640,19 @@ msgstr "plik bez nazwy" msgid "and support the developers" msgstr "i wspieraj twórców programu" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "Oparte na TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11508,30 +11685,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "zatwierdzenia zmian" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "w stanie konfliktu" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "skopiowany z \r\n%s - w wersji %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dzień" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "usunięte" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11543,7 +11720,7 @@ msgstr "pusty" msgid "eMail settings" msgstr "Ustawienia email" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11552,16 +11729,16 @@ msgid "" "%s" msgstr "wyeksportowany\n%s\ndo\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "zewnętrzny" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "Polecenie git nie zostało zakończone pomyślnie (kod wyjścia %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorowany" @@ -11569,23 +11746,23 @@ msgstr "ignorowany" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "niekompletny" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "element trzymany lokalnie" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "zachowaj listę plików po angielsku" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11594,7 +11771,7 @@ msgid "" "%s = %ld" msgstr "wiersz: %d(+) %d(-) plików: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11609,11 +11786,11 @@ msgstr "wiersz: %d(+) %d(-) plików: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "główny/master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "scalono" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "Nie znaleziono" @@ -11621,7 +11798,7 @@ msgstr "Nie znaleziono" msgid "missing/deleted/replaced" msgstr "brakujące/usunięte/zastąpione" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "zmodyfikowane" @@ -11629,7 +11806,7 @@ msgstr "zmodyfikowane" msgid "modified/copied" msgstr "zmodyfikowane/skopiowane" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "miesiąc" @@ -11637,40 +11814,44 @@ msgstr "miesiąc" msgid "new branch" msgstr "nowa gałąź" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nie" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "opis tej komendy nie jest dostępny" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "poza kontrolą wersji" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normalne" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "nie znaleziono" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "niedostępny" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "na %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "piksele" @@ -11678,11 +11859,11 @@ msgstr "piksele" msgid "possible or real conflict/obstructed" msgstr "możliwy lub prawdziwy konflikt/zablokowany" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "kwartał roku" @@ -11690,35 +11871,35 @@ msgstr "kwartał roku" msgid "renamed" msgstr "zmień nazwę" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "Zastąpiono" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "ścieżka skanowania:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "pomiń-drzewo-robocze" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "przełączono do\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "do %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "do %s" @@ -11727,35 +11908,35 @@ msgstr "do %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "tydzień" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - wszyszy użytkownicy Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - bieżący użytkownik Windows" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - wyłącznie bieżące repozytorium" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - bieżący użytkownik Windows" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - wyłącznie bieżące repozytorium" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "rok" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "tak" diff --git a/Languages/Tortoise_pt_BR.po b/Languages/Tortoise_pt_BR.po index 28209b334..78cd0da60 100644 --- a/Languages/Tortoise_pt_BR.po +++ b/Languages/Tortoise_pt_BR.po @@ -8,15 +8,15 @@ # lengli , 2014 # Rafael Neri , 2014 # Ricardo Souza , 2012 -# Ricardo Souza , 2012-2014 -# Sven Strickroth , 2012-2014 -# Victor Westmann , 2012 +# Ricardo Souza , 2012-2015 +# Sven Strickroth , 2012-2015 +# Victor Westmann , 2012,2015 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/tortoisegit/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -47,138 +47,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autores exibidos individualmente:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB transferidos" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 continha um objeto inesperado." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 contém um caminho incorreto." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 contém um esquema incorreto." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 tem um formato inválido." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 não foi encontrado." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! Dia atrás" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! Dias atrás" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! Hora atrás" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! Horas atrás" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! Minuto atrás" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! Mês atrás" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! Meses atrás" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! Segundo atrás" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! Segundos atrás" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! Semana atrás" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! Semanas atrás" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! Ano atrás" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! Anos atrás" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! itens selecionados" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minuto atrás" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nExibindo %2!d! arquivos, %3!d! submódulos e %4!d! pastas, %5!d! itens no total" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nTamanho %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nContinuar executando o script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -186,52 +186,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nNão pode encontrar o arquivo.\nVerifique se o caminho e nome do arquivo estão sendo informados corretamente." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" -msgstr "" +msgstr "%HOME%/.gitconfig ou %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes transferidos" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB transferidos" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d submissões a frente de \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d arquivos modificados" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d arquivos removidos." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d arquivos revertidos para %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d arquivos selecionados, %d arquivos no total" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d autor(es) mais ativos com pelo menos %d submissões cada (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -239,78 +239,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% opacidade\nclique para alternar a opacidade\nclique duplo para alternar a opacidade automaticamente" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minuto(s) e %ld segundo(s)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld de %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - na revisão: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Recuperado]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s em %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s requer Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, em %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Cópia de Trabalho" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Exportar (%d) de %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Exportar de %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nNão pode ser corrigido normalmente." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nVocê gostaria de removê-lo mesmo assim?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -326,6 +326,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "Comb. &3 vias" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Abortar" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Sobre TortoiseGitBlame..." @@ -354,15 +358,15 @@ msgstr "&Adicionar Filtro" msgid "&Add New/Save" msgstr "&Novo/Salvar" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Adicionar" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Adicionar ou Remover Botões" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Adicionar..." @@ -402,7 +406,7 @@ msgstr "&Atribuir" msgid "&Associate double-click event with:" msgstr "&Associar evento de duplo-clique com:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Auto Ocultar" @@ -418,15 +422,15 @@ msgstr "C&arregar SSH" msgid "&Backup original file" msgstr "Fazer &backup do arquivo original" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Culpar" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "Alterações de &responsabilidade" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Acusar revisões" @@ -450,7 +454,7 @@ msgstr "&Ramo:" msgid "&Browse Dir" msgstr "&Procurar Dir" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Navegar repositório" @@ -486,7 +490,7 @@ msgstr "&Categoria:" msgid "&Choose commands from:" msgstr "&Selecionar comandos de:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Limpar..." @@ -510,7 +514,7 @@ msgstr "&Fechar Janela(s)" msgid "&Command:" msgstr "&Comando:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Submeter" @@ -518,23 +522,27 @@ msgstr "&Submeter" msgid "&Commit submodule..." msgstr "&Submeter submódulo..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Submeter s/" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Submeter..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Comparar Revisões" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "Gráfico &Compacto" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Continuar" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copiar" @@ -554,11 +562,11 @@ msgstr "&Personalizado" msgid "&Default" msgstr "&Padrão" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Excluir" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Excluir (manter local)" @@ -566,7 +574,7 @@ msgstr "&Excluir (manter local)" msgid "&Delete Filter" msgstr "&Excluir Filtro" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Excluir remoto && local" @@ -578,11 +586,11 @@ msgstr "&Detectar linhas movidas ou copiadas" msgid "&Detect moved or copied lines:" msgstr "&Detectar linhas movidas ou copiadas:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Comparar" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Comparar com revisão anterior" @@ -594,7 +602,7 @@ msgstr "&Diretório:" msgid "&Disabled" msgstr "&Desabilitado" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Descartar" @@ -602,19 +610,23 @@ msgstr "&Descartar" msgid "&Do the same for the rest" msgstr "&Fazer o mesmo para o resto" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Ancoragem" #. Resource IDs: (1032) msgid "&Don't ask me again" -msgstr "" +msgstr "&Não me pergunte novamente" + +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "&Não mostrar esta mensagem novamente" #. Resource IDs: (1384) msgid "&Down" msgstr "&Baixo" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Baixar" @@ -622,11 +634,11 @@ msgstr "&Baixar" msgid "&Edit" msgstr "&Editar" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Editar .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Editar TODOS" @@ -634,7 +646,7 @@ msgstr "&Editar TODOS" msgid "&Edit Filter" msgstr "&Editar Filtro" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Editar conflitos" @@ -659,10 +671,10 @@ msgid "&Enable edit" msgstr "&Habilitar edição" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "" +msgid "&Exit\tCtrl+W" +msgstr "&Saída\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportar seleção para..." @@ -674,27 +686,27 @@ msgstr "&Externo" msgid "&File" msgstr "&Arquivo" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Localizar" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Localizar\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Ajustar imagens na janela" +msgid "&Fit images in window\tF" +msgstr "&Ajustar imagens na janela\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "Unidades &Fixas" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flutuante" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Seguir renomeações" @@ -706,7 +718,7 @@ msgstr "&Fonte para mensagens de histórico:" msgid "&Font:" msgstr "&Fonte:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Forçar" @@ -726,7 +738,7 @@ msgstr "Estilo de Submissão do &Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Ir para\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "&Ofuscar Caminhos Alterados Não Relacionados" @@ -738,7 +750,7 @@ msgstr "&Verde:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Ajuda" @@ -746,7 +758,7 @@ msgstr "&Ajuda" msgid "&Help Topics" msgstr "Tópicos da &Ajuda" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Ocultar" @@ -754,11 +766,11 @@ msgstr "&Ocultar" msgid "&Icon Set:" msgstr "Conjunto de &Ícones:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorar" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorar %d itens por nome" @@ -772,14 +784,14 @@ msgid "&Image" msgstr "&Imagem" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Info da &Imagem" +msgid "&Image info\tI" +msgstr "Info da &Imagem\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr " &Imagem apenas" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importar..." @@ -791,7 +803,7 @@ msgstr "Diretório &inicial:" msgid "&Initialize submodules (--init)" msgstr "&Inicializar submódulos (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Instalar" @@ -803,11 +815,11 @@ msgstr "&Pular para a primeira diferença ao carregar" msgid "&Keep CR" msgstr "&Manter CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Manter estado atual" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Rótulos" @@ -835,7 +847,7 @@ msgstr "&Limite:" msgid "&Line number" msgstr "Número da &linha" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "número da &linha (%d - %d)" @@ -852,7 +864,7 @@ msgstr "Visão de &Lista" msgid "&Local Branch:" msgstr "Ramo &Local:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "Ramos &locais" @@ -876,11 +888,11 @@ msgstr "Animações de &menu:" msgid "&Menu contents:" msgstr "Conteúdo &Menu :" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Combinar" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Combinar..." @@ -936,6 +948,10 @@ msgstr "&Próximo >" msgid "&Next Page" msgstr "&Próximo Página" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Não" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Sem evento de duplo-clique" @@ -952,31 +968,27 @@ msgstr "&Nenhum" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Uma página" #. Resource IDs: (1828) msgid "&Onto" -msgstr "" +msgstr "&Em" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Abrir" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Abrir WebSite do Git para Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -989,18 +1001,18 @@ msgid "&Overlay Icon:" msgstr "Ícone de &Sobreposição:" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Sobrepor imagens" +msgid "&Overlay images\tO" +msgstr "S&obrepor imagens\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Senha:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Colar" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Pegar TODOS" @@ -1008,7 +1020,7 @@ msgstr "&Pegar TODOS" msgid "&Port:" msgstr "&Porta:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "Visualizar &Impressão" @@ -1016,11 +1028,15 @@ msgstr "Visualizar &Impressão" msgid "&Print..." msgstr "&Imprimir..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Imprimir...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Prosseguir" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Puxar" @@ -1028,10 +1044,14 @@ msgstr "&Puxar" msgid "&Push all branches" msgstr "&Empurrar todos os ramos" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&Nova Submissão" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "&Reorganizar" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "Mensagens &recentes" @@ -1044,7 +1064,7 @@ msgstr "&Recursivo" msgid "&Red:" msgstr "&Vermelho:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Refazer" @@ -1060,15 +1080,15 @@ msgstr "&Atualizar" msgid "&Regular Expression" msgstr "Expressão &Regular" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" -msgstr "" +msgstr "&Lembrar-me depois" #. Resource IDs: (1617) msgid "&Remote Branch:" msgstr "&Ramo Remoto:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "Ramos &remotos" @@ -1076,7 +1096,7 @@ msgstr "Ramos &remotos" msgid "&Remote:" msgstr "&Remoto:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Remover" @@ -1088,7 +1108,7 @@ msgstr "&Remover este arquivo do índice" msgid "&Replace" msgstr "&Substituir" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Navegador de &repositório" @@ -1096,7 +1116,7 @@ msgstr "Navegador de &repositório" msgid "&Reset" msgstr "&Reiniciar" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Restaurar Barra de Ferramentas" @@ -1112,23 +1132,27 @@ msgstr "&Limpar meus dados" msgid "&Reset to Default" msgstr "&Restaurar Padrão" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Resolvido" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Restaurar" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Restaurar estado antigo" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "&Tentar novamente" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Reverter mudanças feitas nesta submissão" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Reverter mudanças feitas nestas submissões" @@ -1140,7 +1164,7 @@ msgstr "Cliente &SSH:" msgid "&Saturation:" msgstr "&Saturação:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Salvar" @@ -1148,15 +1172,19 @@ msgstr "&Salvar" msgid "&Save authentication" msgstr "&Salvar autenticação" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Salvar gráfico como..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Salvar lista de arquivos selecionadas para..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Salvar\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Definir caminho do Git" @@ -1164,7 +1192,7 @@ msgstr "&Definir caminho do Git" msgid "&Set upstream/track remote branch" msgstr "&Definir upstream/rastrear ramo remoto" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Configurações" @@ -1184,7 +1212,7 @@ msgstr "&Exibir rótulos de texto" msgid "&Signing key ID:" msgstr "ID da chave de &assinatura:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Pular" @@ -1192,7 +1220,7 @@ msgstr "&Pular" msgid "&Squash" msgstr "&Esmagar" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Esmagar TUDO" @@ -1204,7 +1232,7 @@ msgstr "&Iniciar" msgid "&Start Group" msgstr "&Iniciar Grupo" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Reservar" @@ -1224,7 +1252,7 @@ msgstr "Visão de &Símbolos" msgid "&Tab size:" msgstr "Tamanho do &Tab:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "Documento com &Abas" @@ -1232,7 +1260,7 @@ msgstr "Documento com &Abas" msgid "&Tag" msgstr "&Etiqueta" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Etiquetas" @@ -1268,7 +1296,7 @@ msgstr "&Barras de Ferramentas e Janelas Ancoradas" msgid "&Toolbars:" msgstr "&Barras de Ferramentas:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1280,7 +1308,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Tronco:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "&Tente Novamente" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Duas Páginas" @@ -1288,15 +1320,15 @@ msgstr "&Duas Páginas" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Desfazer" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Diferenças &unificadas" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "Diferenciar &unificado com" @@ -1308,7 +1340,7 @@ msgstr "Unidades &desconhecidas" msgid "&Up" msgstr "&Acima" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Atualizar Item Para Revisão" @@ -1320,11 +1352,11 @@ msgstr "&Rio acima:" msgid "&Use auto-completion of file paths and keywords" msgstr "&Usar auto completar para caminhos de arquivo e palavras-chave" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Usuário:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Exibir" @@ -1332,7 +1364,7 @@ msgstr "&Exibir" msgid "&View:" msgstr "&Exibir:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Avisar sobre ausência de Signed-Off-by na submissão" @@ -1348,6 +1380,10 @@ msgstr "Palavra &inteira" msgid "&Within file" msgstr "&Dentro do arquivo" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "&Sim" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&ignorar dif. de espaço" @@ -1356,46 +1392,46 @@ msgstr "&ignorar dif. de espaço" msgid "&known changes" msgstr "mudanças &conhecidas" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(Padrão TortoiseGit)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(from %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(sem lista de alterações)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(sem numeração de linhas)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(sem valor)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(não encontrado)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(desconhecido)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- tudo -" @@ -1403,13 +1439,14 @@ msgstr "- tudo -" msgid "--&all" msgstr "--&tudo" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1417,7 +1454,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config na raiz do repositório" @@ -1433,13 +1470,13 @@ msgstr ".gitignore nos diretórios dos itens" msgid ".gitignore in the repository root" msgstr ".gitignore na raiz do repositório" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig na raiz do repositório" #. Resource IDs: (1020) msgid "< &Previous" -msgstr "" +msgstr "< &Anterior" #. Resource IDs: (16506) msgid "<.....>" @@ -1449,31 +1486,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1482,66 +1519,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit é uma extensão da shell.\nIsto significa que é integrada no Windows explorer.\nPara usar o TortoiseGit, por favor, use o explorer e clique com o botão direito em qualquer pasta que quiser\npara trazer o menu de contexto onde você poderá encontrar todas os comandos do TortoiseGit.\nE ler o manual!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Aviso: Não foi verificado se estes ramos foram combinados completamente no HEAD." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Aviso: Esta ação irá remover os ramos no servidor remoto." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Aviso: Este ramo não foi combinado completamente no HEAD." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" -msgstr "" +msgstr " HEAD atual desanexado, você está trabalhando em (nenhum ramo).\nVocê quer criar uma ramificação agora?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Você realmente quer excluir TODAS as reservas?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Aplicação de reserva falhou!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Estouro de reserva falhou!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Reserva falhou!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "diretório de reorganização anterior \"rebase-apply\" ainda existe mas foi dado um mbox\n\nVocê quer" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Aplicação de reserva falhou, há conflitos" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Estouro de reserva falhou, há conflitos" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Aplicação de reserva com sucesso" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Estouro de reserva com sucesso" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Reservado com sucesso" @@ -1549,7 +1586,7 @@ msgstr "Reservado com sucesso" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1561,71 +1598,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Um ramo com o mesmo nome que você entrou já existe (ou a referência curta é ambígua).\nIsto pode causar problemas, então você deve evitar isto." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Um ramo com este nome já existe." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Um processo de mesclagem está ativo, então esta submissão será uma submissão de mesclagem. Para cancelar a mesclagem você tem que fazer uma reversão ou restauração forçada" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Uma nova versão está disponível. Por favor baixe a versão atual!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Uma lista de caminhos separados por quebra-de-linha para os quais as sobreposições de ícones serão exibidas.\nSe você adicionar um caractere '*' ao final do caminho, todos os arquivos e subdiretórios dentro do caminho também serão inclusos." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Uma lista de caminhos separados por quebra-de-linha para os quais o menu de contexto será exibido.\nSe você adicionar um caractere '*' ao final do caminho, todos os arquivos e subdiretórios dentro desse caminho também serão inclusos.\nUma lista vazia irá permitir o menu de contexto em todos os caminhos." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Uma lista de caminhos separados por quebra-de-linha para os quais não será utilizada sobreposição de ícones.\nSe você adicionar um caractere '*' ao final de um caminho, todos os arquivos e subdiretórios dentro desse caminho também são excluídos.\nUma lista vazia irá permitir sobreposição de ícones em todos os caminhos." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Um recurso necessário estava indisponível." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Uma etiqueta com o mesmo nome que você entrou já existe (ou a referência curta é ambígua).\nIsto pode causar problemas, então você deve evitar isto." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Uma etiqueta com este nome já existe." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Um visualizador de arquivos para arquivos de comparação GNU (arquivos de correção).\nSe você não possui um, use o Bloco de Notas." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "A&bortar" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "So&bre" @@ -1639,13 +1676,13 @@ msgstr "Abreviar renomeações" #. Resource IDs: (65535) msgid "Abbreviated size" -msgstr "" +msgstr "Tamanho abreviado" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Interromper" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Abortar &Combinação" @@ -1653,11 +1690,11 @@ msgstr "Abortar &Combinação" msgid "Abort Merge" msgstr "Cancelar Mesclagem" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Cancela uma mesclagem em execução." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Sobre" @@ -1675,14 +1712,14 @@ msgstr "Sobre oTortoiseGitMerge" #. Resource IDs: (1) msgid "Accept certificate" -msgstr "" +msgstr "Aceitar certificado" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "O acesso a %1 foi negado." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Ação" @@ -1690,26 +1727,26 @@ msgstr "Ação" msgid "Action log" msgstr "Histórico de Ações" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Ações" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Ativar Lista de Tarefas" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Arquivos ativos" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Objetos ActiveX não podem ser salvos ao sair do Windows!\nDescartar todas as mudanças em %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Adicionar" @@ -1717,7 +1754,7 @@ msgstr "Adicionar" msgid "Add &Signed-off-by" msgstr "Adicionar &Signed-off-by" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Adicionar '%s' ao dicionário" @@ -1730,15 +1767,15 @@ msgstr "Adicionar Remoto" msgid "Add \"&Signed-off-by\"" msgstr "Adicionar \"&Signed-off-by\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" -msgstr "" +msgstr "Adicionar outro commit?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Adicionar programa de comparação para extensão específica" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Adicionar programa de combinação para extensão específica" @@ -1746,15 +1783,15 @@ msgstr "Adicionar programa de combinação para extensão específica" msgid "Add new files automatically to Git" msgstr "Adicionar novos arquivos automaticamente ao Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Adicionar à lista de &ignorados" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Adicionar à Barra de Ferramentas de Acesso Rápido" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Adicionar..." @@ -1762,11 +1799,11 @@ msgstr "Adicionar..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Adicionar/Editar Programa de Comparação/Combinação para Extensão Específica" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Adicionado" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1774,25 +1811,25 @@ msgid "" "to the ignore list." msgstr "Adicionado(s) o(s) padrão(ões) de arquivo\n%s\nà lista de ignorados." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Adicionando" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Adicionar arquivo(s) ao controle do Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Adiciona os arquivo(s) selecionado(s) ou a máscara de arquivos à lista de 'ignorados'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ajustar preferências\nPreferências" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avançado" @@ -1800,91 +1837,91 @@ msgstr "Avançado" msgid "Advanced Diff/Merge Settings" msgstr "Opções de Comparação/Combinação Avançadas" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Opções avançadas de comparação" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Opções avançadas de combinação" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Tudo" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Todos os comandos" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Todos os Arquivos (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Todos os Arquivos (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Todos os Pais" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Todas as ramificações locais" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" -msgstr "" +msgstr "Todas as refs" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" -msgstr "" +msgstr "Todas as tags" #. Resource IDs: (9690) msgid "All tags only" msgstr "Apenas etiquetas" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Todas as suas mudanças serão perdidas! Você realmente quer restaurar todas as barras de ferramentas e menus?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Todas as suas mudanças serão perdidas! Você realmente quer restaurar os atalhos de teclado?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Todas as suas mudanças serão perdidas! Você realmente quer restaurar o menu '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Todas as suas mudanças serão perdidas! Você realmente quer restaurar a barra de ferramentas '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Permitir Edição nesta visualização\nPermitir Edição" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Permitir utilizar URL do Gravatar personalizada" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." -msgstr "" +msgstr "Permite para criar um commit vazia que tem apenas uma mensagem de confirmação e não arquivos (cf. git commit - permitir-vazio)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Já está atualizado." @@ -1898,13 +1935,13 @@ msgstr "Sempre empurrar para o ramo remoto selecionado para este ramo local" #. Resource IDs: (1805) msgid "Always show long format" -msgstr "" +msgstr "Sempre mostrar formato longo" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Sempre usar as configurações de local e tempo do sistema para exibir horas e datas" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Corrigir" @@ -1912,12 +1949,12 @@ msgstr "Corrigir" msgid "Amend &Last Commit" msgstr "Corrigir &Última submissão" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Um editor alternativo. Deve preferivelmente suportar quebras-de-linha *nix." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1928,7 +1965,7 @@ msgid "" "%mine: the modified file" msgstr "Um programa de comparação externo, usado\npara comparar diferentes revisões de arquivos\n\nVocê pode especificar os seguintes parâmetros para o caminho:\n%base: o arquivo base\n%mine: o arquivo modificado" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1941,34 +1978,34 @@ msgid "" "%base: the original file without your changes" msgstr "Um programa de combinação externo, usado\npara comparar resolver conflitos.\n\nVocê pode especificar os seguintes parâmetros para o caminho:\n%merged: o arquivo com conflitos, onde salvar\n%theirs: o arquivo como está no repositório\n%mine: seu próprio arquivo, com suas mudanças\n%base: o arquivo original sem suas mudanças" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Um arquivo inválido foi associado com %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Ocorreu um erro desconhecido." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Ocorreu um erro desconhecido ao acessar %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Um tipo de linha desconhecido foi encontrado na linha %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" -msgstr "" +msgstr "Tags anotadas" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Anexar bloco direito" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Anexar este bloco à esquerda" @@ -1978,13 +2015,13 @@ msgstr "Menus de Molduras da Aplicação:" #. Resource IDs: (32780) msgid "Apply &Patch..." -msgstr "" +msgstr "Aplicar &Patch..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Aplicar Série de Correções..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Aplicar Correções..." @@ -1992,7 +2029,7 @@ msgstr "Aplicar Correções..." msgid "Apply Patches" msgstr "Aplicar Correções" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Aplica uma série de arquivos de correções de uma caixa de e-mail" @@ -2000,7 +2037,7 @@ msgstr "Aplica uma série de arquivos de correções de uma caixa de e-mail" msgid "Apply unified diff" msgstr "Apicar Comparação Unificada" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Estilo Aqua" @@ -2008,39 +2045,39 @@ msgstr "Estilo Aqua" msgid "Arabic" msgstr "Arábico" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Tem certeza de que quer restaurar as colunas?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Tem certeza de que quer abortar o processo de reorganização?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Você tem certeza que deseja marcar o(s) arquivo(s) em conflito como resolvido(s)?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Você tem certeza de que quer reverter %d item(s)? Você irá perder todas as alterações desde a última atualização!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Tem certeza de quer deseja salvar para \"%s\"?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Organizar &verticalmente" +msgid "Arrange &vertical\tV" +msgstr "Organizar &verticalmente\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Associado a lista de alterações '%s'" @@ -2049,11 +2086,11 @@ msgstr "Associado a lista de alterações '%s'" msgid "Assigned to:" msgstr "Associado a:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Assumir Não Modificado" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Assumir valido/não modificado" @@ -2065,34 +2102,34 @@ msgstr "Assumit válido/não modificado (\"Needs-lock\" no TortoiseSVN)" msgid "At file &creation" msgstr "Na &criação do arquivo" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "Na criação do arquivo" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Na revisão: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "No momento, você só pode renomear ramos." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Houve uma tentativa de realizar uma operação não suportada." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Tentativa de acessar %1 feita depois de seu término." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Tentativa de leitura feita em %1 que está sendo escrito." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Tentativa de escrita feita em %1 que está sendo lido." @@ -2109,11 +2146,11 @@ msgstr "Autenticação" msgid "Authentication data" msgstr "Dados de Autenticação" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Autor Email" @@ -2121,7 +2158,7 @@ msgstr "Autor Email" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autores" @@ -2143,11 +2180,11 @@ msgstr "Converter automaticamente CrLf" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Ocultar automaticamente" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Ocultar Todos Automaticamente" @@ -2155,23 +2192,23 @@ msgstr "Ocultar Todos Automaticamente" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Fechar automaticamente se não houver conflitos" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Fechar automaticamente se não houver erros" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Auto fechar se mais nenhuma opção estiver disponível" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Fechar automaticamente se não houver combinações, adições ou exclusões" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2185,7 +2222,7 @@ msgstr "Auto Carregar &Chave SSH" msgid "Autoload Putty &Key" msgstr "Auto Carregar &Chave do Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automático" @@ -2205,25 +2242,25 @@ msgstr "Média" msgid "B&rowse..." msgstr "&Navegar..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Voltar" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Fundo" #. Resource IDs: (65535) msgid "Baltic" msgstr "Báltico" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Gráfico em Barra" #. Resource IDs: (1385) msgid "Base" -msgstr "" +msgstr "Base" #. Resource IDs: (1522) msgid "Base On" @@ -2237,7 +2274,7 @@ msgstr "Arquivo Base:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Baseado em TortoiseIDiff do TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Informações básicas" @@ -2249,45 +2286,45 @@ msgstr "Entre arquivos:" msgid "Big5 (Traditional)" msgstr "Big5 (Tradicional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bifurcação ruim" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bifurcação boa" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Restaurar bifurcação" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Iniciar bifurcação" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\num bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Estilo Preto" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Responsabilidade" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Erro de acusação" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Acusar revisão anterior" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Atribui a responsabilidade de cada linha de um arquivo a um autor" @@ -2295,26 +2332,30 @@ msgstr "Atribui a responsabilidade de cada linha de um arquivo a um autor" msgid "Blend alpha" msgstr "Mesclar transparência" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Estilo Azul" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Corpo" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Os parâmetros /logmsg e /logmsgfile foram especificados!\nSomente um destes pode ser especificado." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "O caminho para o arquivo de correção e o caminho do alvo precisam ser caminhos absolutos!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Visão Inferior:" @@ -2326,30 +2367,30 @@ msgstr "&Navegar..." msgid "Branc&h:" msgstr "&Ramo:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ramo" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Criar ramo %s atrás de %s\n%s irá avançar rápido para %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Ramificação (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Nome do Ramo" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Nome do ramo/etiqueta inválido." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Nome do ramo/etiqueta não pode ser vazio ou é inválido." @@ -2361,11 +2402,11 @@ msgstr "Ramo:" msgid "Bro&wse" msgstr "&Procurar" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Navegar referências" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Buscar pelo programa externo de comparação" @@ -2377,7 +2418,7 @@ msgstr "Navegar referências" msgid "Browse..." msgstr "Navegar..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" @@ -2389,7 +2430,7 @@ msgstr "&Expressão Bug-ID:" msgid "Bug-ID/Issue-Nr:" msgstr "Bug-ID/Issue-Nr:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-IDs" @@ -2405,7 +2446,7 @@ msgstr "Testador de Regex Bugtraq - TortoiseGit" msgid "Button Appearance" msgstr "Aparência do Botão" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Botão1" @@ -2421,7 +2462,7 @@ msgstr "&Verificar Agora" msgid "C&ommands:" msgstr "C&omandos:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&ria um ramo/rótulo a partir da revisão" @@ -2429,11 +2470,11 @@ msgstr "C&ria um ramo/rótulo a partir da revisão" msgid "C&urrent Keys:" msgstr "Chaves At&uais:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "Cor&tar" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2449,11 +2490,11 @@ msgstr "Calcular" msgid "Can double-click in log list to compare with previous revision" msgstr "Duplo clique na lista do histórico para comparar com versão anterior" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Impossível ativar um objeto ActiveX estático." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2462,80 +2503,80 @@ msgid "" "%s" msgstr "Não é possível copiar \n%s\npara\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Não é possível copiar imagem bitmap para o clipboard!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Não foi possível criar uma nova imagem!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Não é possível editar os menus!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Não é possível colar imagem bitmap a partir do clipboard!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Cancelar" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Cancelar\nNão sai do TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Cancelar\nNão alterna as visões" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Cancelar\nManter o arquivo vazio." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Cancelar\nResolver os conflitos primeiro." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Cancelar\nManter os arquivos atuais" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Cancelar\nManter as configurações atuais" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Não é possível combinar submissões agora.\nCertifique-se de que você está visualizando o histórico do ramo atual sem filtros aplicados." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Não é possível forçar a atualização do ramo atual. Use o comando restaurar se você quer fazê-lo." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Não é possível exibir culpar. \"%s\" não está sob o controle de versão do git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Não é possível exibir a comparação por causa de quebras de linha inconsistentes no fim do arquivo." @@ -2547,9 +2588,9 @@ msgstr "Casca&ta" msgid "Cascaded context menu" msgstr "Menu de contexto em cascata" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Maiúsculas e minúsculas" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2565,39 +2606,39 @@ msgstr "Centro Europeu" #. Resource IDs: (65535) msgid "Certificate verification failed!" -msgstr "" +msgstr "Verificação de certificado falhou!" #. Resource IDs: (1697) msgid "Change log" msgstr "Histórico de mudanças" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Mude a impressora e as opções de impressão\nOpções de Impressão" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Alterar opções de impressão\nConfigurar de Página" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Muda o estilo da aplicação\nAlterar Estilo" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Alterar posição da janela" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Alterar o tamanho da janela" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Mudar o tipo" @@ -2605,38 +2646,38 @@ msgstr "Mudar o tipo" msgid "Changed Files" msgstr "Arquivos Alterados" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Arquivos modificados entre %s e %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Arquivos alterados entre %s, %s e %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Arquivos alterados: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Linhas alteradas incluindo arquivos adicionados/excluídos" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Linhas alteradas incluindo arquivos adicionados/excluídos por data" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Linhas alteradas não incluindo arquivos adicionados/excluídos" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Linhas alteradas não incluindo arquivos adicionados/excluídos por data" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Lista de alterações %s foi movida" @@ -2645,7 +2686,7 @@ msgstr "Lista de alterações %s foi movida" msgid "Changes made (double-click on file for diff):" msgstr "Alterações feitas (duplo clique no arquivo para comparar):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Muda o estilo da aplicação" @@ -2653,7 +2694,7 @@ msgstr "Muda o estilo da aplicação" msgid "Char position where to show a border line in commit text boxes:" msgstr "Posição do caractere onde exibir uma linha de borda nas caixas de texto de submissão:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Verificar" @@ -2665,31 +2706,31 @@ msgstr "Verificar Por Atualizações - TortoiseGit" msgid "Check For Updates..." msgstr "Verificar Atualizações..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Verificar &alterações" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Verifique o caminho e/ou a URL entrados." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Marque as entradas de menu que você quer que apareça no menu de contexto principal ao invés do submenu TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Marque as entradas de menu que você quer que apareça apenas no menu de contexto estendido (SHIFT + clique direito)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Marque para exibir tempos relativos em mensagens de histórico" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Marque para usar um formato de data e hora mais conciso nos comentários" @@ -2697,31 +2738,31 @@ msgstr "Marque para usar um formato de data e hora mais conciso nos comentários msgid "Check:" msgstr "Checar:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Obter" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" -msgstr "Restaurar com merclagem" +msgstr "Restaurar com mesclagem" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Escolha Seletiva" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Escolha Seletiva falhou" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Escolha Seletiva nas submissões selecionadas..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Escolha Seletiva nesta submissão..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "A escolha seletiva falhou! Pular esta submissão?" @@ -2729,11 +2770,11 @@ msgstr "A escolha seletiva falhou! Pular esta submissão?" msgid "Chinese" msgstr "Chinês" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Escolha Repositório" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Cronológica invertida (padrão do git)" @@ -2745,78 +2786,78 @@ msgstr "Limpar" msgid "Clean Type" msgstr "Limpar Tipo" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Excluir permanentemente" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Mover para a lixeira" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Limpar ramos remotos órfãos" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Limpando" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Limpando." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Falha ao efetuar a limpeza dos seguintes caminhos:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "A limpeza foi efetuada com sucesso nos seguintes caminhos:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Limpar" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Ferramenta Limpar\nLimpar" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Limpar %ld URLs armazenadas para %ld cópias de trabalho" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Limpar %ld mensagens de histórico para %ld cópias de trabalho" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Limpar %ld pares usuário/senha, %ld certificados ssl e %ld usuários" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Limpar históricos armazenados dos %ld repositórios" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Apagar as autenticações gravadas.\nVocê terá que digitar seu nome de usuário e senha novamente para todos os repositórios." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Limpar os tamanhos e posições salvos de %ld diálogos" @@ -2825,7 +2866,7 @@ msgstr "Limpar os tamanhos e posições salvos de %ld diálogos" msgid "Click here to go to the website" msgstr "Clique aqui para acessar o website" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Clique aqui para selecionar uma das mensagens recentes" @@ -2841,17 +2882,17 @@ msgid "" "extension" msgstr "Clique em \"Avançado\" para especificar programas de combinação alternativos baseados na extensão do arquivo" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Clique para ser os comandos para mover blocos de texto\nUsar blocos de texto" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Área de transferência" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Clonar" @@ -2859,7 +2900,7 @@ msgstr "Clonar" msgid "Clone Existing Repository" msgstr "Clonar Repositório Existente" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Clonar um repositório" @@ -2867,49 +2908,49 @@ msgstr "Clonar um repositório" msgid "Clone into Bare Repo" msgstr "Clonar em um Repositório Nu" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Clonar..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Fechar" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Fechar Tela Cheia" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Fechar Visualização de Impressão\n&Fechar" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Fechar manualmente" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Fechar modo de visualização de impressão\nCancelar Visualização" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Fechar o documento ativo\nFechar" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela ativa e pede para salvar os documentos" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Encolher" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2935,7 +2976,7 @@ msgstr "Cores:" msgid "Combine One Mail" msgstr "Combinar em Um E-mail" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Combinar em uma submissão" @@ -2943,11 +2984,11 @@ msgstr "Combinar em uma submissão" msgid "Comman&ds:" msgstr "Coman&dos:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Comando" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Linha de Comando" @@ -2955,7 +2996,7 @@ msgstr "Linha de Comando" msgid "Command Line To Execute:" msgstr "Linha de Comando para Executar:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Comando falhou." @@ -2963,41 +3004,41 @@ msgstr "Comando falhou." msgid "Commands" msgstr "Comandos" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Submeter" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." -msgstr "" +msgstr "A submissão %s NÃO está visível neste momento." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Submissão %s não encontrada em \"%s\". Atualizar submódulo agora?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Submeter Data" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Submeter Email" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Término da Submissão" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Submeter Info" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Mensagem de Submissão" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Submeter Nome" @@ -3005,7 +3046,7 @@ msgstr "Submeter Nome" msgid "Commit Ordering:" msgstr "Ordem das Submissões:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Submeter super projeto" @@ -3013,19 +3054,19 @@ msgstr "Submeter super projeto" msgid "Commit to:" msgstr "Submeter em:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Submeter..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Submissões por autor" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Submissões por data" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Submeter cada %s" @@ -3034,15 +3075,15 @@ msgstr "Submeter cada %s" msgid "Commits each week:" msgstr "Submissões a cada semana:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Submete as suas alterações para o repositório" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Email de quem submeteu" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3052,54 +3093,54 @@ msgstr "Adicionar uma pasta não versionada não irá adicionar suas subpastas r #. Resource IDs: (65535) msgid "Common Name:" -msgstr "" +msgstr "Nome Comum:" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Comparar revisões do &HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Comparar referências selecionadas" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Comparar dois arquivos" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Comparar espaços em branco" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Comparar com a cópia de &trabalho" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Comparar com a b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Comparar com revisão anterior" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Compara todos espaços em branco ao comparar\nComparar espaços em branco" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Compara o arquivo com a última revisão submetida para exibir as alterações que você fez" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Comparando %s to %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Concluído" @@ -3115,7 +3156,7 @@ msgstr "Fonte da config" msgid "Config type:" msgstr "Tipo de configuração:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Configurar Expressões de Filtro" @@ -3149,11 +3190,11 @@ msgstr "Configurar visualizador para arquivos comparação GNU (arquivos de corr msgid "Confirm to kill running git process" msgstr "Confirmar finalização do processo do git em execução" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Conflito" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Conflitar Arquivos" @@ -3161,15 +3202,15 @@ msgstr "Conflitar Arquivos" msgid "Conflict resolved" msgstr "Conflito resolvido" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Conflitante" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflitos" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflitos: %d" @@ -3182,124 +3223,124 @@ msgstr "Menus de Contexto:" msgid "Context lines for patches" msgstr "Linhas de contexto para correções" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continuar" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Janela ancorada de contrato" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Converter espaços para tabulações" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Converter tabulações para espaços" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Cop&iar" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copiado" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copiar" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copiar %s para %s, Revisão %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Copiar SHA-1 para o clipboard" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Ferramenta Copiar\nCopiar" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copiar todas as informações para a área de transferência" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copiar e renomear" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Copiar mensagens de histórico para a área de trabalho" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Copiar histórico para a área de transferência" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copiar caminhos para a área de transferência" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Copiar nomes das referências" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copiar seleção para a área de &transferência" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copiar a seleção e colocá-la na área de transferência\nCopiar" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copiar para a área de transferência" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copiar: Novo nome para %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Copiando %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Copiando..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Correções" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "%s não pôde ser adicionado à lista de ignorados!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Não foi possível verficar a existência de uma nova versão!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" -msgstr "" +msgstr "Não foi possível verificar por uma nova versão! %s (Error code: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3307,76 +3348,76 @@ msgid "" "%s" msgstr "Não foi possível copiar os arquivos!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 não pôde ser criado porque o diretório está cheio." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Não foi possível determinar a revisão mais recente submetida!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Não foi possível encontrar o Super-projeto" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Não foi possível obter o status!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 não pôde ser aberto porque há um número excessivo de arquivos abertos." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Não foi possível abrir o arquivo\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 não pôde ser removido porque é o diretório atual." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Não foi possível remover %s da lista de ignorados" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Não foi possível restaurar à primeira submissão (primeiro passo). Abortando..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Não foi possível restaurar para a última submissão (segundo passo). Abortando..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Não foi possível restaurar para o HEAD original." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Não foi possível recuperar a URL do arquivo!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Não foi possível recuperar a revisão %s do arquivo %s.\nNão é possível fazer a correção!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Não foi possível iniciar TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3384,7 +3425,7 @@ msgid "" "%s" msgstr "Não foi possível iniciar o comparador!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3392,7 +3433,7 @@ msgid "" "%s" msgstr "Não foi possível iniciar o programa de comparação externo!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3400,11 +3441,11 @@ msgid "" "%s" msgstr "Não foi possível iniciar o programa de combinação externo!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Não foi possível iniciar o trabalho de impressão." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3412,11 +3453,11 @@ msgid "" "%s" msgstr "Não foi possível iniciar o visualizador de texto!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Não foi possível iniciar o Agente Putty (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Não foi possível iniciar a thread!" @@ -3424,7 +3465,7 @@ msgstr "Não foi possível iniciar a thread!" msgid "Coun&t" msgstr "Con&tar" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Contagem: %u correspondências." @@ -3437,15 +3478,15 @@ msgstr "Criar &Bibilioteca" msgid "Create .gitignore file" msgstr "Criar arquivo .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Criar Ramo" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Criar Ramo nesta versão..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Criar Ramo..." @@ -3457,29 +3498,29 @@ msgstr "Criar Lista de Alterações" msgid "Create New Branch" msgstr "Criar Novo Ramo" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Criar Série de Arquivos de Correção" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Criar Etiqueta" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Criar Etiqueta nesta versão..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Criar Etiqueta..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Criar um novo documento\nNovo" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3488,49 +3529,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Cria um clone superficial com o histórico parcial até o número especificado de revisões. Um repositório superficial tem um número de limitações (você não pode clonar ou obter dele, nem empurrar de nenhum lugar para ele), mas é adequado se você está apenas interessado no histórico recente de um grande projeto com um longo histórico, e quer enviar correções como arquivos de correções." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Criar arquivo de correções" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Criar &pedido de puxar" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Criar &repositório aqui..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Criado" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Cria um ramo ou etiqueta" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Cria uma pasta biblioteca com configurações especiais para cópias de trabalho do Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Cria um arquivo de correções com as diferenças dos dos arquivos\nCriar arquivo de correções" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Cria um repositório no local corrente" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Cria um arquivo de comparação unificado com todas as alterações feitas por você" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Criando pedido de puxar..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "O assistente de credenciais não pode ficar vazio." @@ -3542,7 +3583,7 @@ msgstr "Assistente de credenciais:" msgid "Credentials" msgstr "Credenciais" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Recortar" @@ -3550,7 +3591,7 @@ msgstr "&Recortar" msgid "Current" msgstr "Atual" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Ramo Atual" @@ -3558,7 +3599,7 @@ msgstr "Ramo Atual" msgid "Current Branch:" msgstr "Remificação Atual:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3570,7 +3611,7 @@ msgstr "O ramo atual %s já está atualizado\n\nSe você quer forçar a reorgani msgid "Current version is:" msgstr "A versão atual é:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "A versão atual é: %s" @@ -3583,7 +3624,7 @@ msgstr "&Personalizar..." msgid "Custom" msgstr "Customizado" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personalizar" @@ -3591,19 +3632,19 @@ msgstr "Personalizar" msgid "Customize Keyboard" msgstr "Configurar Teclado" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Configurar Barra de Ferramentas de Acesso Rápido" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Configurar Barra de Ferramentas de Acesso Rápido..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Customizar..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3617,88 +3658,92 @@ msgstr "Cirílico" msgid "DCommit Type" msgstr "DSubmeter Tipo" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Servidor" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Data" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Data da Última Submissão" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Padrão" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menu Padrão" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Menu padrão da aplicação. Aparece quando nenhum documento está aberto." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Usar codificação UTF-8 por padrão" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Excluir" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Excluir %d ramos" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Excluir %d ramos remotos" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Excluir %d etiquetas" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Excluir &local" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Excluir Referência..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Excluir todas as etiquetas" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Excluir e &ignorar %d itens por nome" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Excluir e adicionar para a lista de &ignorados" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Excluir e ignorar %d itens por &extensão" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Excluir ramo" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Excluir ramo/etiqueta" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Excluir ramo remoto" @@ -3706,34 +3751,34 @@ msgstr "Excluir ramo remoto" msgid "Delete remote tag - TortoiseGit" msgstr "Excluir etiqueta remota - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Excluir etiquetas remotas em \"%s\"..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Excluir etiquetas remotas..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Apagar submódulo" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Apagar etiqueta" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Exclua o ramo existente ou use um nome direfente." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Excluir\nO arquivo é removido." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Excluído" @@ -3741,36 +3786,36 @@ msgstr "Excluído" msgid "Deleted merge conflict" msgstr "Conflito de combinação excluído" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Exclui e adiciona os arquivos selecionados ou a máscara de arquivos à lista de 'ignorados'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Excluir arquivos/pastas do controle de versão" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Excluir arquivos/pastas do controle de versão, mas mantêm o arquivo" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Exclui o arquivo de histórico de ações" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Excluindo" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Apagando dados em cache" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Apagando arquivo" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Excluindo referências remotas..." @@ -3780,17 +3825,17 @@ msgstr "Envio:" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Profundidade" #. Resource IDs: (65535) msgid "Describe" -msgstr "" +msgstr "Descreva" #. Resource IDs: (65535) msgid "Describe Strategy" -msgstr "" +msgstr "Descreva Estratégia" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Descrição" @@ -3798,7 +3843,7 @@ msgstr "Descrição" msgid "Description:" msgstr "Descrição:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Desmarcar lista de alterações" @@ -3806,33 +3851,33 @@ msgstr "Desmarcar lista de alterações" msgid "Destination" msgstr "Destino" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "O disco de destino está cheio." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detectar e destacar blocos movidos" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Detectar linhas movidas ou copiadas dos arquivos existentes em qualquer submissão" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Detectar linhas movidas ou copiadas de arquivos existentes na submissão que o arquivo de destino foi criado" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Detectar linhas movidas ou copiadas dos arquivos modificados na mesma submissão" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Detectar linhas movidas ou copiadas em um arquivo" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3846,11 +3891,15 @@ msgstr "Dimensões e posições dos diálogos" msgid "Dialogs" msgstr "Diálogos" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Opções de Comparação" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Diferenciar Duas Submissões" @@ -3864,15 +3913,15 @@ msgstr "Visualizador de Diferenças::Ferramenta de Combinação" #. Resource IDs: (65535) msgid "Diff added lines" -msgstr "" +msgstr "Linhas adicionadas ao Diff" #. Resource IDs: (65535) msgid "Diff command" -msgstr "" +msgstr "Comando Diff" #. Resource IDs: (65535) msgid "Diff comment" -msgstr "" +msgstr "Comentário Diff" #. Resource IDs: (65535) msgid "Diff file:" @@ -3880,26 +3929,26 @@ msgstr "Arquivo de comparação:" #. Resource IDs: (65535) msgid "Diff header" -msgstr "" +msgstr "Cabeçalho Diff" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Comparar depois" #. Resource IDs: (65535) msgid "Diff position" -msgstr "" +msgstr "Posição do Diff" #. Resource IDs: (65535) msgid "Diff removed lines" -msgstr "" +msgstr "Linhas removidas do Diff" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Comparar com \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Comparar com o pai %d" @@ -3912,19 +3961,19 @@ msgstr "Diferença entre" msgid "Diffing" msgstr "Comparando" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Comparando submissões" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Compara o arquivo da cópia de trabalho com um antes da última submissão" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Diferenciar duas submissões quaisquer" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Dir..." @@ -3934,28 +3983,28 @@ msgstr "Diretório:" #. Resource IDs: (1796) msgid "Disable sounds" -msgstr "" +msgstr "Desabilitar sons" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Desabilite esta opção se você tem cópias de trabalho realmente grandes e experimentar\nmuito acesso ao disco ao navegar pela cópia de trabalho" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" -msgstr "" +msgstr "Desabilitar checagem de atualizações" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Desabilitado" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disco cheio ao acessar %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Disparar exceção: %1" @@ -3964,47 +4013,55 @@ msgstr "Disparar exceção: %1" msgid "Display &buttons in this order" msgstr "Exibição e &botões nesta ordem" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Exibir páginas inteiras\nVisualizar Impressão" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Exibe a ajuda para os botões, menus e janelas clicadas\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Exibe a ajuda para a tarefa ou comando atual\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Exibe as instruções de uso da ajuda\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Exibe informações do programa, número da versão e direitos autorais\nSobre" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "Exibir assunto e corpo das mensagens de submissão" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "&Não exibir este aviso novamente (se Continue estiver selecionado)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "&Não exibir esta mensagem novamente (se Ignorar estiver selecionado)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" -msgstr "Não autoselecionar submódulos" +msgstr "Não selecionar submódulos automaticamente" #. Resource IDs: (65535) msgid "Do not show the context menu for the following paths:" @@ -4014,54 +4071,71 @@ msgstr "Não exibir o menu de contexto para os seguintes caminhos:" msgid "Do not use recycle bin" msgstr "Não utilizar a lixeira" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Você realmente quer excluir %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Você realmente deseja excluir a barra de ferramentas '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." -msgstr "" +msgstr "Você quer realmente desligar as verificações automáticas de atualização para o TortoiseGit?\n\nAs verificações de atualização automáticas podem ser ser reativadas nas configurações do TortoiseGit na página Geral." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Você realmente deseja marcar o(s) arquivo(s) selecionado(s) como \"assumir válido\"?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Você realmente deseja marcar o(s) arquivo(s) selecionado(s) como \"pular pasta de trabalho\"?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Você realmente deseja mover esse arquivo ou pasta?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Você realmente quer excluir permanentemente %d referências selecionadas? Isto NÃO pode ser recuperado!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "Você realmente quer remover \"%s\" do índice?" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Você realmente quer remover \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "Você quer realmente remover os %d arquivos/diretórios selecionados do índice?" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "Você quer realmente remover os %d arquivos/diretórios selecionados?" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Você realmente quer restaurar a cópia? Você irá perder todas as mudanças que você tiver feito após criar a cópia." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4069,7 +4143,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Você deseja reverter todas as alterações em\n%s\ne voltar para esta revisão? As alterações serão desfeitas revertendo as combinações da revisão de sua cópia de trabalho." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,21 +4151,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Você deseja reverter todas as alterações em\n%s\nque foram feitas nesta revisão? As alterações serão desfeitas revertendo as combinações da revisão de sua cópia de trabalho." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "Você realmente deseja desmarcar os arquivos selecionados como skit-worktree ou assume-unchanged?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Você quer obter ramos remotos do remoto que foi adicionado?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Você deseja carregar os arquivos modificados?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4099,21 +4173,21 @@ msgid "" "as resolved?" msgstr "Você quer marcar o arquivo\n%s\ncomo resolvido?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Você quer recuperar estes documentos salvos automaticamente?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Você deseja recarregar os documentos para refletir as configurações alteradas?\nNota: você perderá todas as alterações que você fez!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Quer visualizar as mudanças?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Você quer restaurar a reserva agora?" @@ -4121,28 +4195,28 @@ msgstr "Você quer restaurar a reserva agora?" msgid "Document :" msgstr "Documento :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Não sei o que empurrar por causa de um ramo desconhecido \"%s\"" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Não sei o que empurrar porque você não informou a URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Não recuperar documentos salvos automaticamente\nUsar as últimas versões salvas explicitamente." -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Não salvar\nFechar a visualização sem salvar as modificações" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4150,13 +4224,13 @@ msgstr "Não salvar\nRecarregar a visualização sem salvar as modificações" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" -msgstr "" +msgstr "Não exibir os itens selecionados: (pressione a tecla shift para exibí-los)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Não exibir essa mensagem novamente" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Feito" @@ -4168,7 +4242,7 @@ msgstr "Abaixo" msgid "Download" msgstr "Baixar" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Arraste para fazer este menu flutuar" @@ -4196,6 +4270,10 @@ msgstr "Botão Fictício do Formulário " msgid "Dumy Group For locat TabCtr" msgstr "Grupo Falso Para localizar TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "E&ditar não selecionados" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "E&xcluir caminhos:" @@ -4204,7 +4282,7 @@ msgstr "E&xcluir caminhos:" msgid "E&xit" msgstr "&Sair" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportar..." @@ -4224,11 +4302,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Leste Europeu" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Editar" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Editar .gitconfig &global" @@ -4244,23 +4322,23 @@ msgstr "Editar .tgitconfig" msgid "Edit Button Image" msgstr "Editar Imagem do Botão" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Editar Notas" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Editar autor" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Editar descrição" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Editar programa de comparação para extensões específicas" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Atribuir programa de combinação para extensões específicas" @@ -4270,13 +4348,13 @@ msgstr "Editar .gitconfig gl&obal" #. Resource IDs: (1718) msgid "Edit global &XDG git/config" -msgstr "" +msgstr "Editar configuração global &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Editar git config local" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Editar mensagem de histórico" @@ -4290,31 +4368,31 @@ msgstr "Editar..." #. Resource IDs: (1827) msgid "Edit/Split commit" -msgstr "" +msgstr "Editar/Dividir commit" #. Resource IDs: (1770) msgid "Effective" msgstr "Efetivo" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Nome ou IP do servidor proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Ferramenta Elipse\nElipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Os endereços de e-mail Para e CC não pode ser vazios ao mesmo tempo." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "E-mails" @@ -4322,7 +4400,7 @@ msgstr "E-mails" msgid "Empty" msgstr "Vazio" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Habilitar Edição" @@ -4338,7 +4416,7 @@ msgstr "Habilitar Gravatar" msgid "Enable drag context menu" msgstr "Habilitar menu de contexto ao arrastar" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Permitir carregar/salvar arquivos de cachê do log (tortoisegit.data, tortoisegit.index)" @@ -4347,10 +4425,14 @@ msgstr "Permitir carregar/salvar arquivos de cachê do log (tortoisegit.data, to msgid "Enable log cache" msgstr "Permitir cachê do log" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Habilitar exibição de imagens do Gravatar na Janela de Hitórico" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "Ativar destaque de sintaxe" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Manipuladores de Sobreposição Ativados" @@ -4359,35 +4441,35 @@ msgstr "Manipuladores de Sobreposição Ativados" msgid "Encode" msgstr "Codificar" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Codificação" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Foi encontrado um erro E/S de hardware durante o acesso a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Uma violação de bloqueio ocorreu ao acessar %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Uma violação de compartilhamento ocorreu durante o acesso a %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Um argumento incorreto foi encontrado." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Um erro inesperado ocorreu durante a leitura de %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Um erro inesperado ocorreu durante a escrita de %1." @@ -4400,11 +4482,11 @@ msgstr "Criptografia" msgid "End" msgstr "Fim" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Estilo do final de linha" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Expandir a janela para a tela cheia" @@ -4412,23 +4494,23 @@ msgstr "Expandir a janela para a tela cheia" msgid "Enter Log Message" msgstr "Inserir Mensagem de Histórico:" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Inserir URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Insira um GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Insira uma moeda." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Insira uma data e/ou hora." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Insira uma data." @@ -4436,33 +4518,33 @@ msgstr "Insira uma data." msgid "Enter a name for the changelist:" msgstr "Digite um nome para a lista de alterações:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Insira um número entre %1 e %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Insira um número." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Insira um inteiro positivo." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Insira uma hora." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Insira um inteiro entre %1 e %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Insira um inteiro entre 0 and 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Insira um inteiro." @@ -4474,7 +4556,7 @@ msgstr "Entre o conteúdo do arquivo para testar abaixo:" msgid "Enter log &message:" msgstr "Insira &mensagem de histórico:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Não insira mais que %1 caracteres." @@ -4483,43 +4565,43 @@ msgstr "Não insira mais que %1 caracteres." msgid "Enter the regex string below:" msgstr "Entre a expressão regular abaixo:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Apaga tudo\nApagar Todos" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Apagar a seleção\nApagar" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Erro" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Erro ao resconstruir o cache de ícones do Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" -msgstr "" +msgstr "Erro ao validar certificado do servidor para \"%s\":" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Erro durante leitura/escrita da chave de registro %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Tudo atualizado." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4529,28 +4611,28 @@ msgstr "Executável (*.exe)|*.exe|Arquivos de comando (*.com)|*.com|Informaçõe msgid "Executable (+x)" msgstr "Executável (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existente" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Sair" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Expandir (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Expandir janelas ancoradas" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Explorar" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportar" @@ -4558,36 +4640,36 @@ msgstr "Exportar" msgid "Export Zip File" msgstr "Exportar Arquivo Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportar diretório:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exportar seleção para..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exportar esta versão..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportar também arquivos sem controle de versão" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportando %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportando..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exporta uma revisão para um arquivo zip" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extensão" @@ -4603,7 +4685,7 @@ msgstr "Extensão:" msgid "Extern DLL Path:" msgstr "Caminho para DLL Externa:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Externo" @@ -4611,101 +4693,101 @@ msgstr "Externo" msgid "External Program:" msgstr "Programa Externo:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Esmaecer" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Falha" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Reversão falhou" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Falha ao restaurar arquivo \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Falha ao restaurar arquivo \"%s\" da revisão %s to \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Falha ao conectar.\nO link pode estar quebrado." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Falha ao converter objeto ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Falha ao criar documento vazio." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Falha ao criar objeto. Tenha certeza de que a aplicação está vinculada ao registro do sistema." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Falha ao criar pedido de puxar" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Falha ao acessar arquivo base." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Falha ao acessar arquivo de combinação" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Falha ao invocar a ajuda." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Falha ao lançar aplicação servidora." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Falha ao abrir documento." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Falha ao executar operação no servidor." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Falha ao salvar documento." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Falha ao definir/remover a lista de alterações '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Falha ao iniciar o provedor COM do rastreador de problemas '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Falha esperando por pegeant terminar de carregar a chave." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Falhou!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Avanço Rápido" @@ -4713,62 +4795,62 @@ msgstr "Avanço Rápido" msgid "Fast Forward o&nly" msgstr "Apenas &Avanço Rápido" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Avançar rápido para %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "&Obter" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Obter" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Obter && Re&organizar" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Obter de um repositório SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Obter de \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Obter && Re&organizar" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Obter..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Obtendo Estado..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Obtendo arquivos modificados..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Obtendo arquivo..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Obtendo revisão %s do arquivo:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Arquivo" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Codificação do arquivo" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Mudanças no arquivo em cada %s" @@ -4777,27 +4859,27 @@ msgstr "Mudanças no arquivo em cada %s" msgid "File changes each week:" msgstr "Alterações de arquivos a cada semana:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Diferenças entre arquivos" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "O arquivo não tem conflitos" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "O arquivo está vazio." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Lista de arquivos vazia" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Correções de arquivo" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4809,7 +4891,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do arquivo:\t\t\t%s (%s)\nLargura:\t\t\t%ld pixel\nAltura:\t\t\t%ld pixel\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4829,7 +4911,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do arquivo:\t\t%s (%s)\nLargura:\t\t\t%ld pixel\nAltura:\t\t\t%ld pixel\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nTamanho do arquivo:\t\t%s (%s)\nLargura:\t\t\t%ld pixel\nAltura:\t\t\t%ld pixel\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bitZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4841,7 +4923,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do arquivo:\t\t\t%s (%s)\nLargura:\t\t\t%ld pixel\nAltura:\t\t\t%ld pixel\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4861,7 +4943,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do arquivo:\t\t\t%s (%s)\nLargura:\t\t\t%ld pixel\nAltura:\t\t\t%ld pixel\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nTamanho do arquivo:\t\t\t%s (%s)\nLargura:\t\t\t%ld pixel\nAltura:\t\t\t%ld pixel\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bitZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nome do arquivo" @@ -4869,17 +4951,17 @@ msgstr "Nome do arquivo" msgid "Files" msgstr "Arquivos" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Ferramenta Preencher\nPreencher" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrar por" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtro de caminhos para arquivos" @@ -4891,11 +4973,11 @@ msgstr "Filtro:" msgid "Filter: " msgstr "Filtrar:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Localizar" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4903,43 +4985,43 @@ msgstr "Localizar o texto especificado\nLocalizar" #. Resource IDs: (65535) msgid "Find:" -msgstr "" +msgstr "Encontrar:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Localizar: Não foi possível encontrar o texto \"%s\"" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Localizar: Primeira ocorrência do final encontrada. Início do documento alcançado." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Localizar: Primeira ocorrência do topo encontrada. Fim do documento alcançado." #. Resource IDs: (65535) msgid "Fingerprints" -msgstr "" +msgstr "Digitais" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Término" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Reorganização concluída." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Concluído!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Primeiro Pai" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Somente o Primeiro Pai" @@ -4948,18 +5030,18 @@ msgid "First known &bad:" msgstr "Primeira &ruim conhecida:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Ajustar à &altura das imagens" +msgid "Fit image &heights\tH" +msgstr "Ajustar à &altura das imagens\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Ajustar à &largura das imagens" +msgid "Fit image &widths\tW" +msgstr "Ajustar à &largura das imagens\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Disquetes (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Pasta" @@ -4971,38 +5053,34 @@ msgstr "Seguir renomeações" msgid "Font" msgstr "Fonte" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Para ajuda, pressione F1. Role a barra de rolamento horizontalmente com CTRL-roda do mouse" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Para histórico completo deselecione 'Parar em cópia/renomeação'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forçar" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Forcar criação de um ramo/etiqueta - mesmo que uma com o mesmo nome já exista." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "Força empurrar apenas se a referência remota aponta para a mesma submissão que o ramo remoto rastreado.\nIsto pode fazer com que o repositório remoto perca submissões; use com cuidado.\nEsta opção corresponde a opção --force-with-lease do git." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "Força empurrar para a referência remota selecionada e a sobrescreve sem qualquer checagem de segurança.\nIsto pode fazer com que o repositório remoto perca submissões não vistas; use com cuidado.\nEsta opção corresponde a opção --force do git." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5014,26 +5092,26 @@ msgstr "Forçar: Pode descartar" #. Resource IDs: (65535) msgid "Foreground" -msgstr "" +msgstr "Cor de primeiro plano" #. Resource IDs: (312) msgid "Format Patch" msgstr "Formatar Correção" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Formatar Arquivo de Correções..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Encaminhar" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Avançar %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5063,11 +5141,11 @@ msgstr "De arquivos &modificados" msgid "From SVN Repository" msgstr "De Repositório SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "De arquivos existentes" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "De arquivos modificados" @@ -5075,7 +5153,7 @@ msgstr "De arquivos modificados" msgid "From:" msgstr "De:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Tela Cheia" @@ -5083,7 +5161,7 @@ msgstr "Tela Cheia" msgid "Full text search" msgstr "Busca de texto completa" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Completamente recursivo" @@ -5091,7 +5169,7 @@ msgstr "Completamente recursivo" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Mais opções para a janela de submissão estão na página Diálogos 3." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5099,24 +5177,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplificado)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ não pôde ser iniciado!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ não pôde criar um objeto bitmap. Você provavelmente não possui memória suficiente." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" -msgstr "" +msgstr "GPG assina a tag, veja o manual para detalhes" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Obtendo informações. Por favor, aguarde..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Reunindo estatísticas" @@ -5160,29 +5238,29 @@ msgstr "Geral::Diálogos 3" msgid "General::Set Extend Menu Item" msgstr "Geral::Definir Item de Menu Estendido" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Pegar histórico de combinação" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Obtendo arquivo %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Obtendo arquivo %s, revisão %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Obtendo informações..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Obtendo informação requisitada..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Obtendo comparação unificada" @@ -5194,23 +5272,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Progresso do Comando Git" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Copiar e adicionar arquivos para esta Cópia de Trabalho (WC) com o Git" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Copiar e renomear itens versionados aqui com o Git" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Copiar itens versionados aqui com o Git" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Exportar todos os itens aqui com o Git" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Exportar itens versionados aqui com o Git" @@ -5218,35 +5296,35 @@ msgstr "Exportar itens versionados aqui com o Git" msgid "Git Init" msgstr "Git Init" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Caminho de Instalação do Git" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Log" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Mover e renomear itens versionados aqui com o Git" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Mover itens versionados aqui com o Git" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Configurações do Git Remoto" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Lista de Revisão Git" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "DCommit do Git SVN" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Reorganização do Git SVN" @@ -5258,7 +5336,7 @@ msgstr "Sincronização Git" msgid "Git clone - TortoiseGit" msgstr "Git clone - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Diretório do Git não definido (veja página de configurações \"Geral\")." @@ -5266,23 +5344,23 @@ msgstr "Diretório do Git não definido (veja página de configurações \"Geral msgid "Git for Windows" msgstr "Git para Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." -msgstr "" +msgstr "Git para Windows (https://msysgit.github.io/) não encontrado." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git reportou um erro ao criar repositório!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "A lista de revisões do Git contém o histórico completo de arquivos" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "A lista de revisões do Git segue renomeações de arquivo" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5303,7 +5381,7 @@ msgstr "Git::Credencial" msgid "Git::Remote" msgstr "Git::Remoto" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5315,47 +5393,47 @@ msgstr "Ir Para Linha" msgid "Go to line" msgstr "Ir para linha" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Ir para o próximo conflito\nPróximo conflito" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Ir para a próxima diferença\nPróxima diferença" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Ir para a próxima diferença em linha\nPróxima diferença em linha" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Ir para conflito anterior\nConflito anterior" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Ir para diferença anterior\nDiferença anterior" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Ir para a diferença em linha anterior\nDiferença em linha anterior" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Ir para Linha" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Gráfico" @@ -5371,11 +5449,11 @@ msgstr "Cinza" msgid "Greek" msgstr "Grego" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Agrupar listas de alterações" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "&Ocultar Caminhos Alterados Não Relacionados" @@ -5391,7 +5469,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Rígido" @@ -5403,7 +5481,7 @@ msgstr "Hard: Restaura a cópia de trabalho e o índice (descarta todas as mudan msgid "Hebrew" msgstr "Hebreu" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Ajuda" @@ -5427,11 +5505,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Ocultar Menus para caminhos não versionados" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Ocultar Correções" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Ocultar janela ancorada" @@ -5439,25 +5517,25 @@ msgstr "Ocultar janela ancorada" msgid "Hide the script while running" msgstr "Ocultar scrip durante execução" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Assumir Não Modificado" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Ocultar referências não modificadas na Lista de Comparação de Referências" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Ocultar/Exibir a lista de arquivos de correção" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Ocultar/Exibir a lista de arquivos corrigidos\nOculta ou exibe a lista de arquivos corrigidos" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Dica" @@ -5467,7 +5545,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Dica: selecione o menu de contexto, mude para \"Comandos\" e arraste os botões da barra de ferramentas para o menu da janela." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Home" @@ -5483,7 +5561,7 @@ msgstr "Scripts de Gancho::Configuração dos Rastreadores de Problemas" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Scripts de Gancho::Integração com o Rastreador de Problemas" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tipo de Gancho" @@ -5499,7 +5577,7 @@ msgstr "I&ncluir caminhos:" msgid "IBugTraqProvider" msgstr "Provedor IBugTraq" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5507,55 +5585,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" -msgstr "" +msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" -msgstr "" +msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" -msgstr "" +msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" -msgstr "" +msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" -msgstr "" +msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" -msgstr "" +msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5563,15 +5642,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5595,15 +5674,15 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" #. Accelerator Entry for Menu ID:32873; '' msgid "ID:32873:V C +E" -msgstr "" +msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5611,7 +5690,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5619,16 +5698,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5639,17 +5718,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5661,7 +5740,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5725,7 +5804,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Sobreposição de Ícones" @@ -5737,7 +5816,7 @@ msgstr "Sobreposição de Ícones::Conjunto de Ícones" msgid "Icon Overlays::Overlay Handlers" msgstr "Sobreposição de Ícones::Gerenciadores de Sobreposição" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5747,52 +5826,52 @@ msgstr "Ícones (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.b msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ícones/Design/Código:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" -msgstr "" +msgstr "Idêntico" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Se ativado, impede que as sobreposições ou menus de contexto apareçam nas caixas de diálogos \"Salvar como..\" ou \"Abrir\"" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Se marcado --track é passado para o git, se desmarcado --no-track é passado para o git, se não nenhum dos dois é passado para o git (veja a ajuda)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Se marcado, um clique duplo em uma revisão na lista do histórico compara o item com sua revisão anterior" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Se marcado, o diálogo de submissão será reaberto automaticamente após um erro,\npreservando sua última seleção e mensagem de histórico." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Se habilitado, o TortoiseGit checa uma vez por semana por uma nova versão disponível" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Se habilitado, as pastas da cópia de trabalho que estão excluídas de\nexibir as sobreposições ainda exibirão a sobreposição para o status 'normal'" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Se marcado, arquivos de pastas não versionadas poderão ser exibidos no controle de status.\nO controle de status é usado, por exemplo, no diálogo de submissão." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5805,16 +5884,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Se você planeja trabalhar nesta pasta, deixe isto desmarcado. Tipicamente um repositório nu pode apenas ter mudanças 'empurradas' para ele. (Por convenção, a pasta de um repositório nu deve ter um nome que termine em '.git')" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorar" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorar %d itens por &extensão" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignorar Comentários" @@ -5826,15 +5905,15 @@ msgstr "Ignorar Arquivo" msgid "Ignore Type" msgstr "Ignorar Tipo" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignorar todo espaço" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorar alterações de espaços em branco" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignorar linhas em branco" @@ -5842,7 +5921,7 @@ msgstr "Ignorar linhas em branco" msgid "Ignore case cha&nges" msgstr "Ignora alterações de &caixa" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5860,11 +5939,11 @@ msgstr "Ignorar itens recursivamente" msgid "Ignore line &endings (recommended)" msgstr "Ignorar &fins de linha (recomendado)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignorar espaços no FDL" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignorar alterações de espaço" @@ -5872,29 +5951,29 @@ msgstr "Ignorar alterações de espaço" msgid "Ignore whitespace" msgstr "Ignorar espaço em branco" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorar alterações de espaços em branco" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Ignorar espaços em branco quando comparar versões pai e filha" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorado" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Arquivos Ignorados" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignora todas alterações de espaços em branco ao comparar\nIgnorar todas alterações de espaços em branco" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5912,24 +5991,24 @@ msgstr "Imagem &e texto" msgid "Images" msgstr "Imagens" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Filhos diretos, incluindo pastas" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importar" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importar %s para %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importar Ignorados do SNV" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importar Ignorados do SNV..." @@ -5938,16 +6017,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importar arquivo de ignorados do svn para o arquivo .git/info/exclude (o arquivo será sobrescrito)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Obtendo arquivo %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Na Lista de Alterações" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Em Submissões" @@ -5965,30 +6044,30 @@ msgstr "Incluir arquivos &ignorados" #. Resource IDs: (1797) msgid "Include FETCH_HEAD in branch selection boxes" -msgstr "" +msgstr "Incluir FETCH_HEAD in caixas de seleção do branch" #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Incluir apenas esta faixa de revisões:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nome de arquivo incorreto." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Importação inicial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Repositório Git vazio inicializado em %s." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Comparação em linha" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Comparação em linha por palavra" @@ -6000,33 +6079,33 @@ msgstr "Diferenças em linha" msgid "Input" msgstr "Entrada" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Inserir o conteúdo da Área de Transferência\nColar" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Memória insuficiente para realizar a operação." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Erro interno da aplicação." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Moeda inválida." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Número de revisão inválido!" #. Resource IDs: (65535) msgid "Issuer:" -msgstr "" +msgstr "Problema:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6049,7 +6128,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Manter" @@ -6057,11 +6136,11 @@ msgstr "Manter" msgid "Keep changelists" msgstr "Manter listas de alterações" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Manter arquivo localmente?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6075,7 +6154,7 @@ msgstr "Teclado" msgid "Keyboard shortcuts:" msgstr "Atalhos de teclado:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Teclas" @@ -6119,19 +6198,39 @@ msgstr "LINHA8" msgid "Language:" msgstr "Idioma:" -#. Resource IDs: (85) -msgid "Last Author" -msgstr "Último Autor" - -#. Resource IDs: (68) -msgid "Last Commit" -msgstr "Última Submissão:" +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" -#. Resource IDs: (86) -msgid "Last Modified" -msgstr "Última Modificação" +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) +msgid "Last Author" +msgstr "Último Autor" + +#. Resource IDs: (1076) +msgid "Last Commit" +msgstr "Última Submissão:" + +#. Resource IDs: (1364) +msgid "Last Modified" +msgstr "Última Modificação" + +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Última Modificação:" @@ -6139,7 +6238,11 @@ msgstr "Última Modificação:" msgid "Last known &good:" msgstr "Ultimo &bom conhecido:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Executa um programa de comparação/combinação externo para resolver os conflitos" @@ -6147,17 +6250,17 @@ msgstr "Executa um programa de comparação/combinação externo para resolver o msgid "Least active author:" msgstr "Autor menos ativo:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Deixar como conflito\nO status de conflito do arquivo é mantido" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" -msgstr "" +msgstr "Deixar apenas blocos marcados" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Visão da Esquerda:" @@ -6165,11 +6268,11 @@ msgstr "Visão da Esquerda:" msgid "Left image" msgstr "Imagem esquerda:" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Gráfico em Linha" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6183,12 +6286,12 @@ msgstr "Linha da barra de diferenças" msgid "Line differences" msgstr "Diferenças de linha" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Linha movida da linha %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Linha movida para linha %ld" @@ -6201,26 +6304,26 @@ msgstr "Largura da linha" msgid "Line:" msgstr "Linha:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Linha: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Linhas adicionadas" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Linhas removidas" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Listar Tópicos de Ajuda \nTópicos de Ajuda" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6238,23 +6341,23 @@ msgstr "Carregar Imagens" msgid "Load Putty &Key" msgstr "Carregar &Chave do Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Carregar modificações\nAs modificações feitas no TortoiseGitMerge serão perdidos e substituidos com o novo contexto." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Carregar modificações\nAs visualizações são atualizadas com o novo contexto." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Carregando..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Local" @@ -6262,13 +6365,13 @@ msgstr "Local" msgid "Local Branch" msgstr "Ramo Local" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "Mudanças locais ignoradas (arquivos marcados como assumido como válido/não modificado ou pular diretório de trabalho)" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Status local" @@ -6276,7 +6379,7 @@ msgstr "Status local" msgid "Local:" msgstr "Local:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6286,7 +6389,7 @@ msgstr "Local onde o conteúdo da revisão\nselecionada do repositório será sa msgid "Locator Bar" msgstr "Barra de Localização" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Histórico" @@ -6326,12 +6429,12 @@ msgstr "Mensagens de histórico (Exibir diálogo de histórico)" msgid "Login:" msgstr "Login:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Revisão visível mais baixa: %ld - Revisão visível mais alta: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6342,7 +6445,7 @@ msgstr "Revisão visível mais baixa: %ld - Revisão visível mais alta: %ld - R msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6354,14 +6457,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL do sistema de correio inválida." -#. Resource IDs: (156) -msgid "Main" -msgstr "Principal" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Torná-lo Nu (Sem diretórios de trabalho)" @@ -6374,47 +6473,47 @@ msgstr "&Gerenciar" msgid "Manage" msgstr "Gerenciar" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Gerenciar Remotos" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Marcar como resolvido" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Marcar como resolvido\nO estado do arquivo foi alterado para modificado" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Marcado para comparação" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Marcar este block" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" -msgstr "" +msgstr "Blocos Marcados" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Marca um arquivo como resolvido no Git\nMarcar como resolvido" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Marcar revisão como ruim" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Marcar revisão como boa" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Coincidir &caixa" @@ -6438,7 +6537,7 @@ msgstr "Me&nus exibem comandos recentemente usados primeiro" msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Barra do Menu" @@ -6446,7 +6545,7 @@ msgstr "Barra do Menu" msgid "Menu s&hadows" msgstr "&Sombras de menus" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Combinar" @@ -6454,34 +6553,34 @@ msgstr "Combinar" msgid "Merge &Message" msgstr "&Mensagem de Combinação" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Ponto de mescla" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reintegrar Combinação" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Mesclar entre ramo original, conteúdo da pasta de trabalho, e ramo para o qual trocar" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Combinar com \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Combinado" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Arquivos Combinados" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Combina com outro ramo" @@ -6489,22 +6588,22 @@ msgstr "Combina com outro ramo" msgid "Merging" msgstr "Combinando" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Combinando de %s, revisão %s para %s, revisão %s em %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Combinar, requer diferentes revisões ou diferentes URLs em 'De:' e 'Para:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Combinando as revisões %s de %s em %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Mensagem" @@ -6516,7 +6615,7 @@ msgstr "&Apenas mensagem" msgid "Message part &expression:" msgstr "&Expressão para mensagem:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Mensagens" @@ -6524,11 +6623,11 @@ msgstr "Mensagens" msgid "Min" msgstr "Mín" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Meu" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimizar a Faixa de Opções" @@ -6540,7 +6639,11 @@ msgstr "Número mínimo de caracteres para uma mensagem de submissão:" msgid "Misc" msgstr "Miscelânea" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Ausente" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Misto" @@ -6548,35 +6651,35 @@ msgstr "Misto" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Deixar cópia de trabalho intocada, restaurar índice" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Data de modificação:" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Modificado" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Arquivos Modificados" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Mais" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Mais Botões" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Mais Comandos..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Mais cores..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Mais..." @@ -6596,41 +6699,41 @@ msgstr "Mover para &Baixo" msgid "Move &Up" msgstr "Mover para &Cima" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Mover item para baixo" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Mover item para cima" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Mover e renomear" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Mover para a lista de alterações" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Mover/Renomear" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Mover: Novo nome para %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Move os arquivos modificados para a lixeira antes de reverter" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Movendo %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Movendo..." @@ -6638,11 +6741,11 @@ msgstr "Movendo..." msgid "My file:" msgstr "Meu arquivo:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nome" @@ -6654,7 +6757,7 @@ msgstr "Nome:" msgid "Navigate" msgstr "Navegar" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6664,11 +6767,11 @@ msgstr "Navegar para uma linha específica na visualização\nIr para Linha" msgid "Navigation Pane Options" msgstr "Opções do Painel de Navegação" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opções do Painel de Navegação..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Aninhado" @@ -6680,7 +6783,7 @@ msgstr "Rede" msgid "Network::Email" msgstr "Rede::Email" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Novo" @@ -6689,43 +6792,43 @@ msgid "New &name:" msgstr "Novo &nome:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Novo Ramo\\Etiqueta" +msgid "New Branch/Tag" +msgstr "Novo Ramo/Etiqueta" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Novo Menu" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Nova cifra" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nova mensagem" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Novo nome para %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "O novo nome não pode ser vazio ou o mesmo que o nome original!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Novo nome:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Novo submódulo" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Nova hora de submissão" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Quebras-de-linha" @@ -6733,33 +6836,29 @@ msgstr "Quebras-de-linha" msgid "Next" msgstr "Próximo" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Próxima Página\nPróxima Página" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Próximo Conflito" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Próxima Diferença" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Próxima diferença em linha" -#. Resource IDs: (73) -msgid "No" -msgstr "Não" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Sem &Avanço Rápido" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Sem &combinações" @@ -6771,102 +6870,107 @@ msgstr "Sem Restaurar" msgid "No Co&mmit" msgstr "Não &Submeter" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "HEAD não encontrado" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Nenhum comando especificado!\n\nTortoiseGitProc.exe é utilizado pela extensão do sistema e não deve ser executado diretamente!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nenhum comando especificado!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Nenhuma diferença encontrada!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Nenhuma diferença encontrada! O submódulo pode estar atualizado. Atualizar submódulo agora?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Nenhuma messagem de erro." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Não ocorreu nenhum erro." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "Nenhuma outra alteração após a mesclagem" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Nenhum arquivo ou pasta foi modificado. Não há o que o TortoiseGit reverter!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Nenhum arquivo para exibir com as opções atuais.\nMarque uma ou mais opções abaixo para ver arquivos não versionados, ignorados e/ou não modificados.\nPara ver mudanças remotas, clique em 'Verificar Repositório'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "Nenhum arquivo para exibir com a configuração atual.\nVerifique uma ou mais configurações abaio para ver arquivos não versionados, ignorados e/ou não modificados." -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Nenhum arquivo foi alterado ou adicionado desde\na última submissão. Não há o que\no TortoiseGit fazer aqui..." +"the last commit." +msgstr "Nenhum arquivo foi alterado ou adicionado desde\na última submissão." -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Nenhum arquivo foi alterado ou adicionado desde\na última submissão. Não há o que\no TortoiseGit fazer aqui...\nVocê quer ver os arquivos não versionados?" +msgstr "Nenhum arquivo foi alterado ou adicionado desde\na última submissão.\nVocê deseja visualizar os arquivos não versionados?" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Nenhum gfáfico disponível" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Nenhum codificador de imagens encontrado para %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Não encontra mais revisões." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Nenhuma versão anterior." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Nenhuma referência encontrada" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Não há correções de ortografia" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Sem status de cache. Apenas as pastas com controle de versão são sobrepostas, os arquivos não são" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Não há sugestões de sinônimos" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Nenhum diretório de trabalho encontrado." @@ -6874,11 +6978,11 @@ msgstr "Nenhum diretório de trabalho encontrado." msgid "Node size" msgstr "Tamanho do nó" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Nenhum" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6890,30 +6994,30 @@ msgstr "Submissão Normal &SVN" msgid "North European" msgstr "Norte Europeu" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Arquivos Não Versionados" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Nem todos os arquivos puderam ser baixados e verificados." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nem todas as entradas de registro (ou arquivo INI) foram removidas." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Memória insuficiente para completar a operação." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Memória insuficiente!\nTente reduzir o tamanho do gráfico de revisões\nfechando nós ou reduzindo o zoom." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Nenhum arquivo de correção gerado." @@ -6921,7 +7025,7 @@ msgstr "Nenhum arquivo de correção gerado." msgid "Note node" msgstr "Nota do nó" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6930,7 +7034,7 @@ msgstr "Note que se você escolher recuperar os documentos, você precisa salvá #. Resource IDs: (65535) msgid "Note: These settings also apply to the Patch Viewer dialog." -msgstr "" +msgstr "Nota: Essas configurações se aplicam também a caixa de diálogo Visualizador de Patch." #. Resource IDs: (1481) msgid "Note: the folder contains unversioned items" @@ -6940,26 +7044,26 @@ msgstr "Nota: a pasta contém items não versionados" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Nota: isto afetar todos os aplicativos Tortoise, não apenas o TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notas" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Nada precisa ser reorganizado\n%s igual a %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Nada para Reorganizar" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Nada para submeter" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Aviso" @@ -6967,7 +7071,7 @@ msgstr "Aviso" msgid "Number Commits" msgstr "Numerar submissões" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Número de %s" @@ -6980,9 +7084,9 @@ msgstr "Número de autores:" msgid "Number of characters required for moved or copied line detection:" msgstr "Número de caracteres necessário para detecção de linhas movidas ou copiadas:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" -msgstr "" +msgstr "Número de caracteres para mostrar na parte de hash abreviada" #. Resource IDs: (1160) msgid "Number of weeks:" @@ -7052,41 +7156,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "A inicialização OLE falhou. Verifique se as bibliotecas OLE são da versão correta." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Cores do Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Cifra antiga" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Mensagem antiga" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Antiga hoa de submissão" @@ -7094,15 +7198,15 @@ msgstr "Antiga hoa de submissão" msgid "Older lines" msgstr "Linhas mais antigas" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Sob demanda" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Um ou mais documentos salvos automaticamente foram encontrados." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Um ou mais arquivos estão em estado de conflito." @@ -7114,29 +7218,29 @@ msgstr "Apenas o Ramo Atual" msgid "Only Local Branches" msgstr "Apenas Ramos Locais" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Apenas Arquivos Combinados" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Apenas arquivos filhos" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Apenas números (opcionalmente separados por\nvígulas) são permitidos!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Apenas esse ítem" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Abrir" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7144,53 +7248,54 @@ msgstr "Abrir um documento existente\nAbrir" #. Resource IDs: (1797) msgid "Open certificate" -msgstr "" +msgstr "Abrir certificado" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Abre arquivos para comparar ou aplicar correções\nAbrir arquivos" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Copiar a partir da área de transferência" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Abrir arquivo de imagem..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Abrir pasta acima" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" -msgstr "" +msgstr "Abrir arquivo de patch" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Abrir este documento" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Abrir com..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Abre a Ajuda\nTópicos de Ajuda" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Abre o Navegador de Referências." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Abre o navegador de repositório" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opção" @@ -7199,30 +7304,30 @@ msgid "Options" msgstr "Opções" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Tamanho ori&ginal" +msgid "Ori&ginal size\tS" +msgstr "Tamanho ori&ginal\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Nome da Origem" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Outro Painel de Tarefas" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Outros" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Fora da Lista de Alterações" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Fora das Submissões" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Sem memória." @@ -7230,7 +7335,7 @@ msgstr "Sem memória." msgid "Output Directory" msgstr "Diretório de Saída" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7238,20 +7343,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Sobrescrever ramo se já existir" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Sobrescrever" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "Sobrescreve mudanças do diretório de trabalho (force)" + #. Resource IDs: (32781) msgid "P&age setup..." -msgstr "" +msgstr "Configuração de p&ágina..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Página %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7262,15 +7371,15 @@ msgstr "Página %u\nPáginas %u-%u\n" msgid "Page :" msgstr "Página :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Painel 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Painel 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parâmetros" @@ -7278,25 +7387,25 @@ msgstr "Parâmetros" msgid "Parameters:" msgstr "Parâmetros:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Pai %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Pai %d não existe" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Parent 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Parent 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Pai(s)" @@ -7308,39 +7417,39 @@ msgstr "Parte do código veio do TortoiseSVN Blame" msgid "Password" msgstr "Senha" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Senha:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Colar" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Colar Mensagem Recente..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "Colar lista de &nomes de arquivo" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "Colar ú<ima mensagem de submissão" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "Colar mensagem &recente..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Ferramenta Colar\nColar" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Colar lista de nomes de arquivos" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Colar última mensagem de submissão" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Cola o caminho svn da área de transferência, resultando em uma operação de mover (recortar) ou copiar" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Correções" @@ -7356,32 +7465,32 @@ msgstr "Corrigir itens &selecionados" msgid "Patch As Attachment" msgstr "Correção Como Anexo" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Corrigir todos os arquivos" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Corrigir arquivos selecionados" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Arquivos de correção (*.diff,*.patch)|*.diff;*.patch|Todos os Arquivos (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Corrigindo" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Corrigindo arquivo '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Caminho" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Encontrado um caminho que corresponde melhor à correção." @@ -7389,21 +7498,21 @@ msgstr "Encontrado um caminho que corresponde melhor à correção." msgid "Path:" msgstr "Caminho:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Caminhos" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Ferramenta Lápis\nLápis" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Percentual de autoria" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Percentuais" @@ -7411,24 +7520,24 @@ msgstr "Percentuais" msgid "Personalized Menus and Toolbars" msgstr "Menus e Barras de Ferramentas Personalizados" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Pegar" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Pegar hash da submissão" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "Pegar &hash da submissão" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Pegar mensagem da submissão" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "Pegar &mensagem da submissão" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Selecionar %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7438,56 +7547,56 @@ msgstr "Figura (Metafile)\numa figura" msgid "Picture:" msgstr "Figura:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Imagens (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Gráficos (*.gv)|*.gv|Todos os arquivos (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Imagens (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Todos os arquivos (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Gráfico em Pizza" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Por favor especifique o script de gancho para executar." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Por favor especifique o caminho onde o script de gancho deve ser aplicado." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Por favor selecione um tipo de gancho" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Por favor, selecione o ramo" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Por favor, selecione o upstream" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Por favor, dê uma olhada nas submissões puladas" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Por favor, aguarde, cancelando..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Por favor, aguarde enquanto as diferenças são encontradas..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Por favor, aguarde..." @@ -7503,11 +7612,11 @@ msgstr "Porta:" msgid "Port:" msgstr "Porta:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Pós-Submeter Gancho" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Hook de Pós-Empurrar" @@ -7515,23 +7624,23 @@ msgstr "Hook de Pós-Empurrar" msgid "Pre&v Page" msgstr "Página &Anterior" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Pré-Submeter Gancho" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Hook de Pré-Empurrar" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Preparando submissão" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Inserir bloco direito" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Inserir este bloco à esquerda" @@ -7543,11 +7652,11 @@ msgstr "Pressione a &Nova Tecla de Atalho:" msgid "Press &new shortcut key:" msgstr "Pressione a &nova tecla de atalho:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Pré visualizar" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Pré visualizar arquivo corrigido" @@ -7559,51 +7668,51 @@ msgstr "Previsualização:" msgid "Previous" msgstr "Anterior" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Página Anterior\nPágina Anterior" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Versão Anterior" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflito anterior" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Diferença anterior" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Diferença em linha aterior" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Imprimir" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Imprimir Documento\n&Imprimir" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Imprimir o documento ativo usando as configurações atuais\nImpressão Rápida" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Imprimir o documento ativo\nImprimir" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Imprimir para Arquivo" @@ -7611,7 +7720,7 @@ msgstr "Imprimir para Arquivo" msgid "Printer :" msgstr "Impressora :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Arquivos de Impressora (*.prn)|*.prn|Todos os Arquivos (*.*)|*.*||" @@ -7619,11 +7728,11 @@ msgstr "Arquivos de Impressora (*.prn)|*.prn|Todos os Arquivos (*.*)|*.*||" msgid "Printing" msgstr "Imprimindo" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programa" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programas (*.exe)|*.exe|Todos os Arquivos (*.*)|*.*||" @@ -7631,11 +7740,11 @@ msgstr "Programas (*.exe)|*.exe|Todos os Arquivos (*.*)|*.*||" msgid "Progress" msgstr "Progresso" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Projeto" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Propriedade" @@ -7643,7 +7752,7 @@ msgstr "Propriedade" msgid "Property Page" msgstr "Página de Propriedade" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Provedor" @@ -7675,15 +7784,15 @@ msgstr "Aparar" msgid "Prune (All remotes)" msgstr "Aparar (Todos os remotos)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Puxar" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Puxar requer que o ramo local selecionado seja o ramo atual." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Puxar..." @@ -7691,19 +7800,19 @@ msgstr "Puxar..." msgid "Pull/Fetch" msgstr "Puxar/Obter" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Comparação Puxada" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Histórico Puxado" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "&Empurrar" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Empurrar" @@ -7719,11 +7828,11 @@ msgstr "URL para empurrar:" msgid "Push notes" msgstr "Notas de empurrar" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Empurrar &etiquetas" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Empurrar..." @@ -7731,22 +7840,22 @@ msgstr "Empurrar..." msgid "Putty Key:" msgstr "Chave Putty:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Chave Privada Putty (*.ppk)|*.ppk|All Files (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Encerra a aplicação; pede para salvar documentos\nSair" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7764,11 +7873,15 @@ msgstr "Unidades &RAM" msgid "R&eset" msgstr "R&estaurar" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "R&everter para essa revisão" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "REORGANIZAR" @@ -7776,7 +7889,7 @@ msgstr "REORGANIZAR" msgid "Randomize Sync Dialog startup position" msgstr "Alternar posição inicial da Janela de Sincronização" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7798,7 +7911,7 @@ msgstr "Re&moto:" msgid "Re&movable drives" msgstr "Mídias re&movíveis" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Re&nomear..." @@ -7814,15 +7927,15 @@ msgstr "Re&starurar Tudo" msgid "Re&store defaults" msgstr "Re&staurar padrões" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Re&verter..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Alcansável" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Leia o 'Guia de Uso Diário' antes que você fique empacado..." @@ -7830,21 +7943,21 @@ msgstr "Leia o 'Guia de Uso Diário' antes que você fique empacado..." msgid "Rebase" msgstr "Reorganizar" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Reorganizar \"%s\" sobre este..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Reorganizar..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Reorganizando ... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Recente" @@ -7856,21 +7969,21 @@ msgstr "Arquivo Recente" msgid "Recently modified lines" msgstr "Linhas recentemente modificadas" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Gravar" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Recuperar documentos salvos automaticamente\nAbrir versões salvas automaticamente em vez das salvas explicitamente" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Recuperar para o estado antes da reorganização" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7884,17 +7997,21 @@ msgstr "Recursar submodulo" msgid "Recursive" msgstr "Recursivo" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Refazer a ação previamente desfeita\nRefazer" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Reduz a janela a um ícone" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Referência" @@ -7902,31 +8019,31 @@ msgstr "Referência" msgid "Ref (Click it then go to)" msgstr "Referência (Clique e depois vá para)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Lista de Referências" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "ProcurarRef" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "RefLog" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Nome da referência" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Atualizar" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Atualizando..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Filtro de Expressões Regulares" @@ -7938,7 +8055,7 @@ msgstr "Filtros de Expressões Regulares" msgid "Regex:" msgstr "Expressão Regular:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7957,7 +8074,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtro de expressões regulares:\n. : qualquer caractere\nc+ : corresponde a 'c' uma ou mais vezes\nc* : corresponde a 'c' zero ou mais vezes\n^ : início de linha\n$ : fim de linha\n(texto){n} : corresponde ao 'texto' n vezes\n(abcd) : subexpressão\n[aei0-9] : corresponde a 'a,e,i' e '0..9'\n[^aei0-9] : qualquer coisa exceto 'a,e,i' e '0..9'\n\n\\w : corresponde a 'a-z,A-Z,0-9' e '_'\n\\W : qualquer caractere não alfa-numérico\n\\d : dígitos 0-9\n\\s : espaços em branco" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Pedaços de correção rejeitados para '%s'" @@ -7970,7 +8087,7 @@ msgstr "Tempos Relativos no histórico" msgid "Reload" msgstr "Recarregar" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8004,19 +8121,19 @@ msgstr "Ramo remoto &rastreado" msgid "Remote Branch" msgstr "Ramo Remoto" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "URL Remota não deve ser vazia." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Atualizar Remoto" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Nome remoto não pode ser vazio." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Status remoto" @@ -8028,12 +8145,12 @@ msgstr "Remoto:" msgid "Remove" msgstr "Remover" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Remover %ld itens" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Remover %s" @@ -8042,7 +8159,7 @@ msgstr "Remover %s" msgid "Remove &all untracked files (-fx)" msgstr "Remover &todos os arquivos não monitorados (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Remover &ramo" @@ -8050,21 +8167,21 @@ msgstr "Remover &ramo" msgid "Remove &non-ignored untracked files (-f)" msgstr "Remover arquivos não monitorados que não não são ignorados (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Remove todos os comentários antes de fazer a comparação para que mudanças dentro de comentários não apareçam como diferenças" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Remover da lista de &ignorados" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Remover da Barra de Acesso Rápido" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Remover da lista de alterações" @@ -8076,7 +8193,7 @@ msgstr "Remover arquivos ignorados (-fX)" msgid "Remove untracked directories (-d)" msgstr "Remover diretórios não monitorados (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Remover arquivos não monitorados da cópia de trabalho, ..." @@ -8084,11 +8201,11 @@ msgstr "Remover arquivos não monitorados da cópia de trabalho, ..." msgid "Removed" msgstr "Removido" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Removido da lista de alterações" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8096,7 +8213,7 @@ msgid "" "from the ignore list." msgstr "Removido(s) o(s) arquivo(s )modelo\n%s\nda lista de ignorados." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Remove o arquivo ou a máscara de arquivos da lista de ignorados" @@ -8104,11 +8221,11 @@ msgstr "Remove o arquivo ou a máscara de arquivos da lista de ignorados" msgid "Rena&me..." msgstr "Reno&mear..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Renomear" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Renomear %s" @@ -8117,20 +8234,20 @@ msgstr "Renomear %s" msgid "Rename - TortoiseGit" msgstr "Renomear - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Renomear \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Renomear/mover" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Renomeia arquivos/pastas dentro do controle de versão" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8140,7 +8257,7 @@ msgstr "Repetir a última ação\nRepetir" msgid "Replace &All" msgstr "Substituir &Todos" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8154,12 +8271,12 @@ msgstr "Substituir com:" msgid "Replace:" msgstr "Substituir:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Subistituídas %d correspondências" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Substituindo" @@ -8183,11 +8300,11 @@ msgstr "Pedir para puxar" msgid "Requests a username and a password" msgstr "Solicita um nome de usuário e uma senha" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Res&olver..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Redefinir" @@ -8199,152 +8316,148 @@ msgstr "Restaruar &Tudo" msgid "Reset Type" msgstr "Redefinir Tipo" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Redefinir \"%s\" para isso..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Redefinir ramo ativo" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Reiniciar colunas" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Restaurar o ramo atual \"%s\" para" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Resolver" #. Resource IDs: (4595) msgid "Resolve Submodule Conflict" -msgstr "" +msgstr "Resolver Conflito de Submódulo" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Resolver conflito usando \"meu\"" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Resolver conflito usando \"deles\"" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Resolvido" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Resolvido:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Resolve os arquivos com conflito" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Reiniciar" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Restaurar" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Restaurar padrão" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Restaurar depois de submissão" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Restaura a janela para o tamanho normal" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Restaurado" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Tentar novamente" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Tentando novamente em 2 segundos..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Reverter" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Reverter submissão" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Reverter submissão %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Reverter para a revisão pai" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Reverter para revisão %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Revertido" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Reverter todas as alterações que você fez desde a última atualização" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Reverte uma adição ao controle de versão" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Rever Correções com TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Rever/aplicar um arquivo de correções unificado com o TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Rever/aplicar única &correção..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisão" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisão %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisão %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Gráfico de revisão" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Arquivos de Revisão" @@ -8360,31 +8473,31 @@ msgstr "Filtro do Gráfico de revisão" msgid "Revision graph" msgstr "Gráfico de revisões" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Revisões revertidas. Todas as mudanças foram integradas em sua pasta de trabalho." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revisão:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Rebobinar" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Rebobinar %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntexto com formatação de fonte e parágrafo" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Visão da Direita:" @@ -8392,21 +8505,21 @@ msgstr "Visão da Direita:" msgid "Right image" msgstr "Imagem direita" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Linha %d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Linha %d-%d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Linha Abaixo" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Linha Acima" @@ -8414,11 +8527,11 @@ msgstr "Linha Acima" msgid "S&elect..." msgstr "S&elecionar..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Exibir Botões em Uma Linha" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Exibir Botões em Duas Linhas" @@ -8426,25 +8539,33 @@ msgstr "&Exibir Botões em Duas Linhas" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Exibir Barra de Acesso Rápido na Faixa de Opções" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "&Pular não selecionados" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "&Esmagar não selecionados" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "&Estatísticas" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "&Trocar/Restaurar" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8454,7 +8575,7 @@ msgstr "O Servidor SMTP requer autenticação" msgid "SMTP Server:" msgstr "Servidor SMTP:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, diretamente para o servidor de destino" @@ -8462,31 +8583,31 @@ msgstr "SMTP, diretamente para o servidor de destino" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "Tipo de Submissão do SVN" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "DCommit do SVN..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "Obter do SVN" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "Reorganização do SVN" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "Rev SVN" @@ -8498,15 +8619,15 @@ msgstr "CrLfSe&guro:" msgid "Safe Crlf:" msgstr "Crlf Seguro:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Mesmo" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Mesma hora de submissão" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8524,35 +8645,39 @@ msgstr "Mensagem de histórico de exemplo para testar cadeias regex de bugtraq:\ msgid "Sample text:" msgstr "Texto de amostra:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Salvar" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Salvar &como..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Salvar &como...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Salvar Como" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Salvar Arquivo Inferior Como\nVocê será perguntado onde salvar o arquivo inferior" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Salvar Arquivo" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Salvar Arquivo Esquerdo Como\nVocê será perguntado onde salvar o arquivo esquerdo" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8560,13 +8685,13 @@ msgid "" "%s" msgstr "Salvar Arquivo Esquerdo\nAs modificações serão salvas em\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Salvar Arquivo Direito Como\nVocê será perguntado onde salvar o arquivo direito" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8574,74 +8699,74 @@ msgid "" "%s" msgstr "Salvar Arquivo Direito\nAs modificações serão salvar em\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Salvar tudo\nOs arquivos foram salvos" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" -msgstr "" +msgstr "Salvar e excluir\nSuas alterações são salvas e o conteúdo original é usado." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Salvar e ignorar blocos marcados\nApenas edições manuais são salvas, blocos marcados são deixados como estavam" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "" +msgstr "Salvar e incluir\nSuas alterações são salvas e os blocos marcados são incluídos" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Salvar como" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Salvar como..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Salvar como\nVocê será perguntado onde salvar o arquivo" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Salvar alterações para %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Salvar modificações." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" -msgstr "" +msgstr "Salvar arquivo de patch" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Salvar revisão ¶..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Salvar o documento ativo com um novo nome\nSalvar Como" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Salvar o documento ativo\nSalvar" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8663,13 +8788,13 @@ msgstr "Salvar dif. unifi." msgid "Save unified diff since HEAD" msgstr "Salvar dif. unificadas desde o HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Salvar\nSalva o arquivo com as marcas de conflito." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8681,12 +8806,12 @@ msgstr "Salvar\nAs modificações serão salvas em\n%s" msgid "Saved Data" msgstr "Dados salvos" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Falha ao salvar configuração (chave: \"%s\", valor: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Falha ao salvar notas." @@ -8698,19 +8823,19 @@ msgstr "Escanear" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Rolar para Esquerda" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Rolar para Direita" #. Resource IDs: (32779) msgid "Se&ttings..." -msgstr "" +msgstr "Confi&gurações" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Pesquisar mensagens do &histórico..." @@ -8722,20 +8847,20 @@ msgstr "Procurar &acima" msgid "Search for:" msgstr "Localizar:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Procurando por um caminho melhor para aplicar correções..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Busca falhou em %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Selecionar" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Selecionar &Tudo" @@ -8751,59 +8876,59 @@ msgstr "Selecionar menu de &contexto:" msgid "Select &window:" msgstr "Selecionar &janela" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Selecionar Ferramenta de Cores\nSelecionar Cor" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Selecionar Arquivo..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Selecionar cliente SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Selecione um botão." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Selecionar um objeto para o qual obter Ajuda" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Selecionar lista de alterações" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Selecionar aplicação de comparação" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Selecionar arquivo" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Selecionar a pasta para associar ao rastreador de problemas" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Selecionar pasta para a qual exportar.\nVocê pode precisar criar uma nova pasta antes de exportar." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Selecionar pasta para execução do script" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Selecione a pasta onde os aquivos selecionados serão salvos" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Selecionar arquivo script de gancho" @@ -8811,20 +8936,20 @@ msgstr "Selecionar arquivo script de gancho" msgid "Select items automatically" msgstr "Selecionar itens automaticamente" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Selecionar aplicação de combinação" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Selecionar alvo para combinar" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8836,15 +8961,19 @@ msgid "" "checker used for commit messages." msgstr "Selecione o idioma que este projeto usa. Esta configuração afeta o corretor ortográfico usado para as mensagens de submissão." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "Selecionar ramo rastreado" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Selecionar visualizador para arquivos de comparação" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Selecione qual arquivo que deseja salvar como" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8854,15 +8983,15 @@ msgstr "Selecione que arquivo você quer salvar como\nNota: Existem conflitos n msgid "Select/deselect &all" msgstr "Marcar/desmarcar &todos" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" -msgstr "" +msgstr "Histórico de Seleção" #. Resource IDs: (1) msgid "Send" msgstr "Enviar" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Enviar Email" @@ -8870,11 +8999,11 @@ msgstr "Enviar Email" msgid "Send Mail after create" msgstr "Enviar Mail após criar" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "SendMail falhou ao enviar mensagem." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Enviar Mail..." @@ -8882,19 +9011,19 @@ msgstr "Enviar Mail..." msgid "Send Patch" msgstr "Enviar Arquivo de Correções" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Enviar Correções por E-mail" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Enviar Arquivos de Correção por E-Mail" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Enviando conteúdo" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Enviando..." @@ -8914,28 +9043,28 @@ msgstr "Definir au&tor" msgid "Set author &date" msgstr "Definir &data de autoria:" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Configura o remoto como o \"pushremote\" para o ramo local selecionado." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Configura o ramo remoto como o \"pushbranch\" para o ramo local selecionado." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Ajuste de propriedades..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Preferências" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Configurações - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8943,7 +9072,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Shell Estendido" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Cache de ícones do shell resconstruido!" @@ -8955,7 +9084,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Formato curto de &data/hora no histórico" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Lista de propriedades reduzida" @@ -8967,7 +9096,7 @@ msgstr "Exibir" msgid "Show &Accelerator for:" msgstr "Exibir &Acelerador para:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Exibir &Reflog" @@ -8975,15 +9104,15 @@ msgstr "Exibir &Reflog" msgid "Show &Unversioned Files" msgstr "Exibir Arquivos &Não Versionados" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Exibir &Todo o Projeto" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Exibir &alterações..." -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Exibir &histórico" @@ -8991,15 +9120,19 @@ msgstr "Exibir &histórico" msgid "Show &log..." msgstr "Exibir &histórico..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "Mostrar refs a&ninhadas" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Exibir &sobreposições e menu de contexto apenas no explorer" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Exibir Acima da Faixa de Opções" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Exibir Abaixo da Faixa de Opções" @@ -9007,35 +9140,35 @@ msgstr "Exibir Abaixo da Faixa de Opções" msgid "Show Environment Variables" msgstr "Exibir Variáveis de Ambiente" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Exibir Menos Botões" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Exibir nós da revisão HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Exibir Diferenças em Linhas palavra por palavra\nDiferença em linha por palavra" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Exibir Diferenças Em Linha\nDiferenças em Linha" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Exibir Mais Botões" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Exibir Barra de Acesso Rápido Acima da Faixa de Opções" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Exibir Barra de Acesso Rápido Abaixo da Faixa de Opções" @@ -9043,31 +9176,31 @@ msgstr "Exibir Barra de Acesso Rápido Abaixo da Faixa de Opções" msgid "Show Screen&Tips on toolbars" msgstr "Exibir &dicas em barras de ferramentas" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Exibir Espaços Em Branco" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Exibir resumo do gráfico inteiro" #. Resource IDs: (1074) msgid "Show asterisk log prefix" -msgstr "" +msgstr "Mostrar prefixo de log de asterisco" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" -msgstr "" +msgstr "Mostrar o prefixo do log asterisco na caixa de diálogo log" #. Resource IDs: (32775) msgid "Show author" msgstr "Exibir autor" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Exibir ramos que submissão está" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Exibir diferenças como comparação &unificada" @@ -9085,17 +9218,17 @@ msgstr "Exibir data" #. Resource IDs: (1804) msgid "Show describe in log" -msgstr "" +msgstr "Mostrar descrição no log" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" -msgstr "" +msgstr "Mostrar descrição na caixa de diálogo log" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Exibir pasta de destino" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Exibir diferenças" @@ -9107,11 +9240,15 @@ msgstr "Exibir comparação com a última submissão" msgid "Show excluded folders as normal" msgstr "Apresentar pastas apagadas como normal" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "Exibir outras alterações após a mesclagem" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Exibir menus &completos após uma breve pausa" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Mostrar nome do arquivo" @@ -9127,7 +9264,7 @@ msgstr "Exibir arquivos i&gnorados" msgid "Show ignore local changes flagged files" msgstr "Exibir arquivos marcados para ignorar mudanças locais" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Exibir apenas submissões &rotuladas" @@ -9135,90 +9272,90 @@ msgstr "Exibir apenas submissões &rotuladas" msgid "Show linenumber&s" msgstr "Exibir &números de linha" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Exibir histórico" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Exibir histórico &antes de renomear/copiar" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Exibir histórico de %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Exibir histórico do submódulo" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Exibir histórico desta pasta" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Exibir histórico..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" -msgstr "" +msgstr "Mostrar formato longo, mesmo que uma marca é exatamente sobre essa confirmação" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Exibir arquivos modificados na cópia de trabalho" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Exibir a próxima mudança na submissão selecionada\nExibir próxima" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Exibir nós mais velhos em cima" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Exibir ou ocultar a linha da barra de comparação\nAlternar LineDiffBar" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Exibir ou ocultar a barra de localização\nAlternar LocatorBar" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Exibir ou ocultar a barra de estado\nAlternar Barra de Estado" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Visualizar ou ocultar a barra de status\nAlternar Barra de Status" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Visualizar ou ocultar a barra de ferramentas\nAlternar Barra de Ferramentas" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Exibir número de linha original" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Exibir mudança anterior da submissão selecionada\nExibir anterior" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Exibir propriedades da revisão" @@ -9226,7 +9363,7 @@ msgstr "Exibir propriedades da revisão" msgid "Show shortcut &keys in ScreenTips" msgstr "Exibir &teclas de atalho nas dicas" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9234,9 +9371,9 @@ msgstr "Exibir caracteres especiais para espaços em branco\nExibir Espaços em #. Resource IDs: (1314) msgid "Show status of subrepositories in parent folders" -msgstr "" +msgstr "Mostrar status de subrepositories no pai pastas" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Exibir símbolos nos rótulos de referência para substituir parte dos nomes" @@ -9248,45 +9385,43 @@ msgstr "Exibir arquivos não &modificados" msgid "Show un&versioned files" msgstr "Exibir arquivos sem controle de &versão" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Exibir /Ocultar" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Exibindo %1!d! referência(s), %2!d! referência(s) selecionada(s)" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Exibindo %ld revisões, da revisão %s até a revisão %s - %ld revisões selecionadas, %ld arquivos selecionados\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Exibir representação gráfica de cópias/etiquetas/ramos" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Exibir todos os arquivos que foram alterados deste a última atualização, localmente e no repositório" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "Exibir todos os arquivos que foram alterados deste a última submissão." -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Exibe informações sobre o TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Exibir histórico de referência" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Exibe o arquivo de histórico de ações no editor de texto padrão" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Exibe o histórico para o arquivo/pasta selecionado" @@ -9296,9 +9431,9 @@ msgstr "&Assinar" #. Resource IDs: (65535) msgid "Significant contributions by: (see Git repository for a complete list)" -msgstr "" +msgstr "Contribuições significativas por: (Veja o repositório Git para obter uma lista completa)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Estilo Prata" @@ -9306,20 +9441,20 @@ msgstr "Estilo Prata" msgid "Since" msgstr "Desde" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Tamanho" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Pular" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Pular Correção: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Pular cópia de trabalho" @@ -9327,23 +9462,23 @@ msgstr "Pular cópia de trabalho" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Pular cópia de trabalho (\"Locked\" no TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Ignorado" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Arquivo ausente ignorado" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Deslizar" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Caractere de tabulação inteligente" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Suave" @@ -9351,13 +9486,13 @@ msgstr "Suave" msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Deixa a cópia de trabalho e o índice intocados" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Alguns arquivos foram alterados fora do TortoiseGitMerge.\nVocê quer carregar as alterações?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9371,7 +9506,7 @@ msgstr "Ordenar com contagem de submissões" msgid "Sort tag list in reversed order" msgstr "Ordenar lista de etiquetas em ordem inversa" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9381,49 +9516,53 @@ msgstr "Especifica quantos itens você quer manter no diálogo de mensagens de h msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Separar linhas" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Dividir a janela ativa em painéis\nDividir" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Esmagar" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "Mesclar (com o commit abaixo)" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Barra de Gráfico em Pilha" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Barra de Gráfico em Linha" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Padrão" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Iniciar (Av.Ráp.)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Iniciar Escolha Seletiva" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Iniciar Submissão de Gancho" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Reorganizar" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Iniciar modo de bifurcação..." @@ -9431,7 +9570,7 @@ msgstr "Iniciar modo de bifurcação..." msgid "Start registry editor" msgstr "Iniciar editor de registro" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Iniciar um servidor git rodando o protocolo git" @@ -9443,39 +9582,47 @@ msgstr "Reservar" msgid "Stash &Message" msgstr "&Mensagem de Reserva" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Aplicar Reserva" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Lista de Reserva" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Arrebentar Reserva" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Salvar Reserva" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Executando operação Stash..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Estático" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Estatísticas" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Status" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configuração da Barra de Status" @@ -9487,32 +9634,32 @@ msgstr "Status e cores de ações" msgid "Status cache" msgstr "Status do Cache" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Cachê de estado para uma pasta apenas, com sobreposições recursivas completas" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Cachê de estado mantido em um processo externo que detecta mudanças, pode exibir sobreposições recursivamente" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Cache de status para apenas uma pasta, sem sobreposições recursivas" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Para o modo de bifurcação" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "Armazena o caminho do arquivo à ser usado para uma comparação em um clique direito posterior. Segure a tecla Ctrl para remover o último caminho salvo." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Estratégia" @@ -9520,15 +9667,15 @@ msgstr "Estratégia" msgid "Strip lines starting with \"#\" in commit message" msgstr "Remover linhas iniciadas com \"#\" em mensagens de submissão" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Estilo" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Assunto" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Assunto:" @@ -9536,7 +9683,7 @@ msgstr "Assunto:" msgid "Submodule" msgstr "Submódulo" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "&Atualizar Submódulo" @@ -9544,7 +9691,7 @@ msgstr "&Atualizar Submódulo" msgid "Submodule Add" msgstr "Adicionar Submódulo " -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Adicionar Submódulo..." @@ -9552,15 +9699,15 @@ msgstr "Adicionar Submódulo..." msgid "Submodule Diff" msgstr "Comparar Submódulo" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Inicializar Submódulo" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Sincronizar Submódulo" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Atualizar Submódulo" @@ -9568,7 +9715,7 @@ msgstr "Atualizar Submódulo" msgid "Submodule Update Options" msgstr "Opções de Atualização de Submódulos" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9577,21 +9724,21 @@ msgstr "Submódulo \"%1!s!\"\nRevisão %2!s!" #. Resource IDs: (1585) msgid "Submodule of Project: " -msgstr "" +msgstr "Submódulo do Projeto:" #. Resource IDs: (1708) msgid "Submodules" msgstr "Submódulos" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Sucesso" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Mudar" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Alternar %s para %s, Revisão %s" @@ -9600,43 +9747,43 @@ msgstr "Alternar %s para %s, Revisão %s" msgid "Switch To" msgstr "Mudar Para" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Voltar ao painel anterior\nPainel Anterior" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Alternar entre visualização de painel único ou duplo" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Alternar entre visão de painel simples e dupla\nAlterna entre visão de painel simples e dupla" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Alternar visualização direita e esquerda" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Alternar os cunteúdos da visão da esquerda para a direita\nAlternar visão esquerda e direita" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Alternar para a próxima janela de documento" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Ir para o próximo painel\nPróximo Painel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Voltar à janela de documento anterior" @@ -9644,19 +9791,19 @@ msgstr "Voltar à janela de documento anterior" msgid "Switch/Checkout" msgstr "Trocar/Restaurar" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Trocar/Restaurar para" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Trocar/Restaurar para este ..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Trocar/Restaurar cópia de trabalho para outro ramo/etiqueta" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Inverte a comparação esquerda<->direita" @@ -9668,23 +9815,23 @@ msgstr "Simbolizar referências" msgid "Symlink" msgstr "Link simbólico" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Sincronizar Repositórios Remotos, incluindo puxar, empurrar, enviar correções por e-mail e o que mais puder" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sincronizar..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Sistema" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Sistema no modo off-line. Verifique o Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9694,13 +9841,13 @@ msgstr "As entradas no registro do sistema foram removidas e o arquivo INI (se e msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9714,7 +9861,7 @@ msgstr "Espaço Reservado para Tab" msgid "Tab size:" msgstr "Tamanho da Tabulação:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Etiqueta" @@ -9722,16 +9869,16 @@ msgstr "Etiqueta" msgid "Tag (FF)" msgstr "Etiqueta (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Informações da Etiqueta" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Etiquetada a cópia de trabalho para %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Etiquetas" @@ -9739,11 +9886,11 @@ msgstr "Etiquetas" msgid "Tags:" msgstr "Etiquetas:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tarefas" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Painel de Tarefas" @@ -9755,11 +9902,11 @@ msgstr "Arquivos temporários (incluindo imagens do Gravatar)" msgid "Test" msgstr "Teste" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Apenas Testar" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Arquivos de Texto (*.txt)|*.txt|Todos os Arquivos (*.*)|*.*||" @@ -9767,13 +9914,19 @@ msgstr "Arquivos de Texto (*.txt)|*.txt|Todos os Arquivos (*.*)|*.*||" msgid "Thai" msgstr "Tailandês" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "A Configuração Remota foi alterada.\nVocê quer salvar agora ou descartar as mudanças?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9781,64 +9934,78 @@ msgid "" "Do you really want to delete it?" msgstr "O ramo \"%s\" é um ramo remoto.\n\nVocê realmente quer excluí-lo?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "O tamanho do bloco não coincide com o número de linhas adicionadas/removidas!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "A mensagem de submissão não pode ser vazia." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "O endereço do auxiliar de credenciais \"%s\" já existe.\nVocê deseja sobrescreve-lo?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "O auxiliar de credenciais foi alterado.\nVocê deseja salvar agora ou descartar as mudanças?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "A cópia de trabalho atual não está limpa.\nVocê quer reservar as mudanças?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "O mecanismo de comparação foi interrompido devido a um erro:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "A referência informada é ambígua.\nVocê tem que torná-la única (ex.: adicionando \"refs/heads/\" como um prefixo para ramos ou \"refs/tags/\" para etiquetas)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "O arquivo %s não existe!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "O arquivo %s não foi encontrado no arquivo de correção!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "O arquivo \"%s\" não existe na sua cópia de trabalho.\nVocê quer selecionar outro arquivo para comparar?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9847,15 +10014,15 @@ msgid "" "Do you want to remove the file?" msgstr "O arquivo \n%s\nestá vazio.\nVocê deseja removê-lo?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "O arquivo é muito grande" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "O arquivo é muito grande para ser aberto." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9863,7 +10030,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "O arquivo\n%s\njá existe! Você deseja sobrescrevê-lo?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9871,14 +10038,14 @@ msgid "" "is not a valid text file!" msgstr "O arquivo\n%s\nnão é um arquivo de texto válido!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "A pasta %s\ncontém arquivo(s) sem controle de versão e/ou arquivo(s) modificado(s). Você quer remover mesmo assim?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9887,78 +10054,78 @@ msgid "" "Would you like to create it first?" msgstr "A pasta \n%s\nnão existe.\nGostaria de criá-la antes?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "O script de gancho retornou um erro:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "A imagem não pode ser exibida." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "O provedor do rastreador de problemas não pode ser criado. Por favor, verifique se ele foi instalado corretamente." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "O provedor do rastreador de problemas foi incapaz de validar a sequência de parâmetros" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "A linha indicando o novo arquivo era esperada na linha %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "O número de linha deve estar entre %d e %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "O ramo local \"%s\" não avança rápido para o ramo remoto \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "O nome do ramo local e do ramo remoto estão vazios.\nContinuar?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "O nome do ramo/etiqueta está vazio. Isto resulta em uma remoção remota.\nContinuar?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "O número máximo de linhas de ação para manter no histórico.\nQualquer linha adicionada acima do limite irá remover a mais antiga do arquivo." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "A operação falhou." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Os parâmetros '/path' e '/pathfile' são mutuamente exclusivos.\nVocê deve escolher apenas um deles." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "A correção não se aplica claramente à %s e nenhuma informação de versão foi dada.\nNão é possível aplicar a correção!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9968,7 +10135,7 @@ msgid "" "do not match!" msgstr "A correção parece desatualizada! A linha do arquivo\n%s\ne a linha da correção\n%s\nnão conincidem!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9979,7 +10146,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "O caminho/URL que você digitou parece ser ilegal no Windows!\nVocê pode tentar mesmo assim, mas isso poderá gerar um erro.\n\nUm caminho válido no windows não pode conter '<<>|\"?*:' ou um dos seguintes nomes de dispositivo:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nVocê deseja continuar?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9990,36 +10157,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "O caminho\n%s\nparece não combinar com os caminhos no arquivo de correções.\nMas o TortoiseGitMerge encontrou o caminho\n%s\nque combina melhor. Deseja utilizar o caminho sugerido?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "O processo ainda está em execução.\nTem certeza de que quer abortar?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "A expressão regulas é inválida!\nPor favor, entre uma expressão regular válida." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "O servidor remoto \"%s\" já existe.\nVocê quer sobrescrevê-lo?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "O repositório foi criado com sucesso." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "O arquivo selecionado parece ainda conter uma ou mais marcas de conflito.\nVocê tem certeza que quer marcar como resolvido?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10027,7 +10201,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "O submódulo \"%s\" está sujo.\nMeramente submetendo o superprojeto não pode rastrear ou salvar tais mudanças no submódulo.\nSubmeter o submódulo agora ou ignorar as mudanças sujas?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10036,72 +10210,72 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "A pasta alvo\n%s\né uma pasta especial e não é indicada para ser uma raiz de repositório!\nVocê tem certeza de que quer inicializar um repositório dentro desta pasta?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" "%s\n" "is not empty!\n" "Are you sure you want to initialize a git repository inside that folder?" -msgstr "A pasta destino ⏎ %s⏎ não está vazia!⏎ Você tem certeza de que você quer inicializar um repositório git dentro desta pasta?" +msgstr "A pasta destino\n%s\nnão está vazia!\nVocê tem certeza de que você quer inicializar um repositório git dentro desta pasta?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "O texto é idêntico, mas os arquivos não batem!\nAs seguintes diferenças foram encontradas:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "O tempo em segundos após o qual o processamento dos arquivos selecionados deverá parar.\nUm valor menor irá fazer a lista do autocompletar disponível mais rápido,\nmas talvez sem retornar todos os arquivos." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "As duas URL's selecionadas não foram criadas a partir da mesma raiz.\nNão é possível exibir as mensagens de histórico entre elas!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" -msgstr "" +msgstr "A árvore de trabalho não está limpa e contém unstaged changes.\nRever e enviar as alterações?" #. Resource IDs: (65535) msgid "Their file:" msgstr "Arquivo deles:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Deles" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Há mudanças ou itens não versionados dentro de um ou mais submódulos.\nEstes arquivos não são listados para submissão. Você precisa submeter estes arquivos neste submódulo" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Há atualmente %d gerenciadores de sobreposição além dos que o Tortoise usa." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Não há mais visualizações editáveis.\nQue visualização você deseja salvar?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Não há provedores de rastreadores de problemas disponíveis." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10110,85 +10284,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Ainda existem conflitos não resolvidos na linha %d!\nVocê deve resolver esses conflitos antes de salvar. \nVocê deseja salvar o arquivo mesmo com os conflitos?\nSe você clicar em SIM, você terá que resolver os conflitos manualmente usando outro editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Existem alterações não salvas!\nVocê deseja salvar suas alterações?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Não há o que adicionar. Todos os arquivos e pastas já estão sob controle de versão ou foram ignorados pela propriedade ignore ou pela configuração ignore global." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Sinônimos" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Existem versões mais recentes dos documentos abertos e contém mudanças que foram feitas antes da aplicação fechar." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Este campo é necessário e não pode ser vazio" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Essa não é uma URL válida.\nPor favor, tente outra URL aqui." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Esse não é um caminho válido!\nUm caminho válido não pode conter '<<>|\"?*:' ou um dos seguintes nomes de dispositivo:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." -msgstr "" +msgstr "Esta operação não pode ser iniciada enquanto a caixa de diálogo Registro ainda está carregando confirmações." -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Esse programa está associado à %s ausente no arquivo %s. Essa máquina contêm uma versão incompatível do %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Esse programa requer o arquivo %s, que não foi encontrado no sistema." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Essa propriedade é permitida apenas para pastas, não em arquivos." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "Este nome de remoto colide com a referência obtida de outros remotos\nPor favor, use outro nome" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Esta tarefa requer uma cópia de trabalho limpa." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Isto irá excluir os comandos que você usou nesta aplicação e restaurará o conjunto de comandos visíveis aos menus e ferramentas. Isto não irá desfazer qualquer customização explícita. Você tem certeza de que quer fazer isto?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Comparação de Três Vias" @@ -10204,14 +10378,14 @@ msgstr "Dividir Hori&zontalmente" msgid "To" msgstr "Para" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "Para evitar obter etiquetas incorretas, se este não é um remoto oficial,\né recomendável que você desabilite a obtenção de tags deste remoto.\nDesabilitar obtenção de tags?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10223,13 +10397,13 @@ msgstr "Para limpar arquivos temporários você deve se certificar que nenhuma o msgid "To:" msgstr "Para:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Alternar Exibição de Uma/Duas Páginas\nAlternar Exibição de Uma/Duas Páginas" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Alternar filtros" @@ -10241,11 +10415,11 @@ msgstr "Barra de Ferramentas" msgid "Toolbar Name" msgstr "Nome da Barra de Ferramentas" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opções da Barra de Ferramentas" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Erro interno da barra de ferramentas. Por favor contate o vendedor da sua aplicação." @@ -10261,16 +10435,16 @@ msgstr "Ferramentas" msgid "Tools:" msgstr "Ferramentas:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Construir %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10280,20 +10454,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit detectou que o arquivo \"%s\" não existe, mas está marcado como \"Adicionado\".\nA janela de submissão não consegue lidar com isto.\n\nDeseja remover o arquivo do índice?" +"Do you want to restore or remove it from the index?" +msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit detectou nomes de arquivos similares. Você quer que os arquivos: %s\nsejam renomeados também?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit não irá exibir as seguintes sobreposições: %s" @@ -10302,18 +10476,18 @@ msgstr "TortoiseGit não irá exibir as seguintes sobreposições: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame já foi inicializado para o repositório \"%s\". Não é possível trocar para outro repositório (\"%s\") em tempo de execução." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Versão %d.%d.%d.%d" @@ -10329,7 +10503,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10337,7 +10511,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseIDiff - Um comparador de imagens, parte do TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10351,16 +10525,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10369,18 +10543,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge não pôde processar este arquivo de correções. O arquivo \"%s\" aparece mais de uma vez." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10389,7 +10563,7 @@ msgid "" "/title:\"title to show for the viewer\"\n" "/? - this help dialog\n" "/p - read diff input from console pipe" -msgstr "" +msgstr "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n\nAvailable command line parameters are:\n/patchfile:\"path to unified diff file\"\n/title:\"title to show for the viewer\"\n/? - this help dialog\n/p - read diff input from console pipe" #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" @@ -10419,11 +10593,11 @@ msgstr "Monitorar" msgid "Tracked Remote Branch:" msgstr "Ramo Remoto Monitorado:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Ramo rastreado" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Transferindo a %s" @@ -10432,39 +10606,35 @@ msgstr "Transferindo a %s" msgid "Transparent &color..." msgstr "&Cor de transparência..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Aparar à direita" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Tente uma 'Limpeza'. Se isto não funcionar, você precisará fazer uma restauração fresca." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Tentar novamente" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turco" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Ajustar o TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tipo" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Tipo:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL e diretório não podem estar vazios." @@ -10488,24 +10658,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Impossível carregar o suporte ao sistema de correio." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Incapaz de processar comando, servidor ocupado." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Impossível ler de %1, está aberto por outra pessoa." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Impossível ler propriedade somente-escrita." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10513,91 +10683,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Impossível reconstruir caminho da cópia de trabalho!\nIsso pode acontecer quando o arquivo é renomeado.\nPor favor, inicie o diálogo de histórico apenas nesse arquivo específico e então reverta as alterações\na partir do painel superior no diálogo de histórico." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Impossível escrever propriedade somente-leitura." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Impossível escrever para %1, é somente-leitura ou está aberto por outra pessoa." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Desmarcar" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Desfazer" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Desfazer Ações %d" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Desfazer 1 Ação" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Desfazer Adicionar..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Desfazer a última ação\nDesfazer" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Desfazer as últimas alterações\nDesfazer" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Formato de arquivo inesperado." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "Desmarcar como skip-worktree e assume-unchanged" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Desdobrar" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Texto sem Formatação\ntexto sem nenhuma formatação" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "&Correções unificadas das revisões do HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Desconhecido" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Profundidade desconhecida" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Desmarcar este bloco" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Conflitos não resolvidos!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "Remover ramo rastreado" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Sem Título" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Não versionado" @@ -10605,7 +10779,7 @@ msgstr "Não versionado" msgid "Unversioned files mark parent folder as modified" msgstr "Arquivos sem controle de versão marcam o diretório pai como modificado" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Retirando do controle de versões de %s" @@ -10618,23 +10792,23 @@ msgstr "Acima" msgid "Update" msgstr "Atualizar" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Atualizar referência" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Atualizando Submódulos" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Atualizado" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Atualizando os objetos ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Atualizando índice" @@ -10646,30 +10820,26 @@ msgstr "Usar Imagem &Padrão:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Usar visualização de &um painel por padrão para comparação de 2 arquivos" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Usar &outro bloco de texto" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Usar 'meu' bloco de texto" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Usar 'meu' bloco de texto e então o 'deles'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Usar bloco de texto 'deles'" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Usar bloco de texto 'deles' depois o 'meu'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Usar Blocos" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Usar componente de caminho HTTP" @@ -10690,15 +10860,15 @@ msgstr "Usar &Pacote Fino (Para conexões lentas)" msgid "Use Unified Diff from &clipboard" msgstr "Usar Comparação Unificada a partir da área de transferência" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Use um nome direfente ou use a opção \"Forçar\" para sobrescrevê-lo." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Use um nome diferente ou use a opção \"Sobrepor ramo\"." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10708,7 +10878,7 @@ msgstr "Usar o conteúdo completo da esquerda\nUsar arquivo da esquerda" msgid "Use block from left before right" msgstr "Usar bloco de texto da esquerda antes do da direita" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10718,25 +10888,25 @@ msgstr "Usar bloqueio da visualização esquerda antes do bloqueio da visualiza msgid "Use block from right before left" msgstr "Usar bloco de texto da direita antes do da esquerda" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Usar bloqueio da visualização direita antes do bloqueio da visualização esquerda\nUsar bloqueio da direita antes da esquerda" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Use ambos blocos de texto (este aqui primeiro)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Use ambos blocos de texto (este aqui último)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" -msgstr "" +msgstr "Usar servidor configurado" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Usar bloco da esquerda" @@ -10752,15 +10922,15 @@ msgstr "Usar cor do ramo local para o ramo atual" msgid "Use recycle bin when reverting" msgstr "Usar lixeira para fazer reversão" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Usar expressão regular" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Usar bloco direito" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Usar espaços" @@ -10768,61 +10938,61 @@ msgstr "Usar espaços" msgid "Use system locale for date/time" msgstr "Usar local do sistema para data/hora" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Use bloco de texto de '&meu'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Use bloco de texto de '&deles'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Use bloco de texto de '&meu' antes de 'deles'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Usar bloco de texto do 'meu' antes do 'deles'\nUsar bloco do 'meu', depois do 'deles'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Usar bloco de texto do 'meu'\nUsar 'meu' bloco de texto" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Usar bloco de texto 'd&eles' antes do 'meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Usar bloco de texto 'deles' antes do 'meu'\nUsar bloco 'deles' antes do 'meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Usar bloco de texto 'deles'\nUsar bloco 'deles'" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Usar bloco de texto da esquerdae \"deles\"\nUse \"deles\" do bloco de texto" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Usar &esse bloco de texto" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." -msgstr "" +msgstr "Use o tempo atual, definindo a autor-data para a data de confirmação." -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10830,7 +11000,7 @@ msgid "" "%s" msgstr "Usar o caminho encontrado.\nAplicar correção à\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10840,21 +11010,21 @@ msgstr "usar o caminho original.\nAplicar a correção à\n%s" #. Resource IDs: (1825, 1826) msgid "Use this" -msgstr "" +msgstr "Use isso" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Use esse arquivo &inteiro" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Usar este bloco à esquerda" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Use o outro &arquivo inteiro" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Usado para corrigir a ponta do ramo atual." @@ -10870,11 +11040,11 @@ msgstr "Info do Usuário" msgid "User Name:" msgstr "Nome do Usuário:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Cancelado pelo usuário" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10884,11 +11054,11 @@ msgstr "O nome de usuário e e-mail devem ser configurados antes de submeter.\nV msgid "User&name:" msgstr "&Nome de usuário:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Usuário:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10905,9 +11075,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "Opções de linha de comando válidas são:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valor" @@ -10915,24 +11085,24 @@ msgstr "Valor" msgid "Version" msgstr "Versão" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Versão %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Versão 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Versão 1 (Nova hora de submissão)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Versão 2 (Base)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Versão 2 (Base) (Nova hora de submissão)" @@ -10940,11 +11110,11 @@ msgstr "Versão 2 (Base) (Nova hora de submissão)" msgid "Version Information" msgstr "Informação sobre a versão" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versão:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versionados" @@ -10956,23 +11126,27 @@ msgstr "Vietnamita" msgid "View" msgstr "Exibir" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Ver .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Ver Correções" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Ver Correções>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Visualizar revisão do caminho no &webviewer" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Ver revisão no editor alternativo" @@ -10984,11 +11158,11 @@ msgstr "Visualizar gitconfig do &sistema" msgid "Visit our website" msgstr "Visite nosso website" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10999,7 +11173,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "AVISO:\nSomente mude estas configurações se você tem certeza absoluta do que está fazendo!\nPara ajustar estes valores para o padrão, exclua o texto do valor." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Aguarde" @@ -11007,7 +11181,7 @@ msgstr "Aguarde" msgid "Wait for the script to finish" msgstr "Aguardar encerramento do script" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Aguardando por entrada" @@ -11015,15 +11189,15 @@ msgstr "Aguardando por entrada" msgid "Walk Be&haviour" msgstr "&Comportamento de Travessia" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Aviso" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Aviso!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11031,7 +11205,7 @@ msgid "" "Do you really want to continue?" msgstr "Aviso: \"%s\" irá ser permanentemente excluído. NÃO será possível recuperá-lo!\n\nTem certeza de que quer continuar?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11039,58 +11213,58 @@ msgstr "Web" msgid "Western European" msgstr "Oeste Europeu" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Quando ativado, segure a tecla SHIFT quando clicar com o botão direito para ter os menus TortoiseGit adicionados ao menu de contexto" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Ao aplicar uma correção, ignorar mudanças no espaço em branco nas linhas de contexto se necessário" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Ao fechar uma janela de progresso com um processo do git em execução, pedir confirmação antes de finalizá-lo" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Quando habilitada, o TortoiseGit move os itens do menu de contexto para estarem disponíveis quando arrastar pastas / arquivos" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Quando habilitado, números maiores de versão vem primeiro. Isto é porque últimas revisões geralmente são mais úteis." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Quando habilitado, os itens com controle de versão listados no diálogo de submissão serão automaticamente selecionados " -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Quando as correções não são aplicadas corretamente, recorrer à combinação de 3 vias se a correção tem a identificação dos registros que é suposta a aplicar e estes estão disponíveis localmente." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "Quando você digitar a URL, o nome remoto será preenchido automaticamente com \"origin\" se o nome remoto estiver vazio, para que você não precise digitar." -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" -msgstr "" +msgstr "Quando referenciar tags anotadas, todas as marcas ou todas as referências" #. Resource IDs: (1409) msgid "" @@ -11098,15 +11272,15 @@ msgid "" "authentication and/or encryption." msgstr "Enquanto executar o daemon, todos os dados deste repositório serão expostos sem autenticação e/ou codificação." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Mudanças de espaço em branco (tabulações, espaços)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Espaços em branco" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Posição da janela" @@ -11114,15 +11288,15 @@ msgstr "Posição da janela" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11166,11 +11340,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "Dentro de um arquivo:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Dentro do arquivo" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Cópia de Trabalho" @@ -11178,29 +11352,25 @@ msgstr "Cópia de Trabalho" msgid "Working Tree Path:" msgstr "Caminho da Cópia de Trabalho:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Mudanças no diretório de trabalho" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Quebrar linhas longas" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Quebrar linhas longas na borda direita da visualização\nQuebrar linhas longas" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Sim" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Sim para todos" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Você já possui a versão mais atual instalada." @@ -11210,51 +11380,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Você pode desabilitar gerenciadores de Sobreposição aqui.\nGerenciadores desabilitados não usarão o espaço e darão a chance de outas extensões do shell exibirem suas sobreposições." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Você pode colar bitmaps apenas com o tamanho (%d x %d) !" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Você não pode criar mais do que %d barras de ferramentas definidas pelo usuário!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Essa propriedade não pode ser atribuida a diretórios, somente a arquivos!\nSe deseja atribuí-la aos arquivos que pertencem a esse diretório, \ndeve ativar a caixa de seleção 'recursivo'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Você não pode mudar o tipo desta referência ao renomear." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." -msgstr "" +msgstr "Você tem uma versão antiga do Git para Windows (https://msysgit.github.io/) instalada que contém issues.\n\nVocê deve considerar uma atualização para 1.9.5+." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Você marcou \"incluir não rastreados\".\nIsto inclui uma chamada \"git clean -fd\", então arquivos/diretórios ignorados serão removidos sem usar a lixeira." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" -msgstr "" +msgstr "Você marcou blocos alterados. Como é que aqueles blocos devem ser salvos?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Você modificou propriedades, mas não salvou.\nDeseja salvá-las agora?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11262,67 +11432,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Você selecionou %d itens para exibir as diferenças.\nPara cada um destes itens, uma nova instância do visualizador de diferenças será iniciada.\nVocê realmente deseja exibir as diferenças de tantos itens de uma vez?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Você não informou um número de ocorrência!\nVocê tem certeza de que quer gravar sem um número de ocorrência?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Você não inseriu sua linha Signed-Off-By!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Você marcou alguns arquivos como \"Restaurar após submissão\".\nVocê quer restaurá-los agora? Você pode perder todas as mudanças que fez nestes arquivos após marcá-los." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Você pode definir no máximo %d ferramentas." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Você deve escrever uma mensagem de histórico antes de submeter" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "O sistema deve ser reiniciado " -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Você deve escolher um nome de arquivo para o arquivo Zip!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Você selecionou uma pasta.\nÉ possível expotar apenas para um arquivo (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Você selecionou um arquivo sem controle de versão.\nO arquivo será adcionado ao controle de versão quando você gravar." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Você deveria ter preenchido com um texto!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Você deveria ter selecionado uma imagem!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Você alterou o conjunto de ícones de %s para %s.\nEssa alteração não terá efeito até que você reinicie seu computador ou efetue logoff e logon novamente!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11332,7 +11502,7 @@ msgstr "Suas mensagens de histórico anteriores foram salvas. \nClique aqui para msgid "Your version is:" msgstr "Sua versão é:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Sua versão é: %d.%d.%d.%d" @@ -11342,10 +11512,10 @@ msgid "Zip File" msgstr "Arquivo Zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Menos zoom" +msgid "Zoo&m out\t-" +msgstr "Menos zoo&m\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zoom" @@ -11357,80 +11527,80 @@ msgstr "Ma&is zoom" msgid "Zoom &Out" msgstr "&Menos zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Mais Zoom\nMais Zoom" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Menos zoom\nMenos zoom" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Ma&is zoom" +msgid "Zoom i&n\t+" +msgstr "Ma&is zoom\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Mais zoom" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Menos zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zoom para caber" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zoom para altura" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zoom para largura" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Padrão]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Não assinado]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "\"%s\" contém um repositório do git. Ele não funcionará como um submódulo como está.\nVocê quer excluir o .git-entry e adicionar todos os arquivos ao repositório principal ou mantê-lo como um repositório separado em uma sub pasta?" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" contém um submódulo do git. É provável que ele não funcione mais no destino após a cópia.\nVocê quer excluir o .git-entry e adicionar todos os arquivos ao repositório principal ou ignorar este possível problema e mantê-lo?" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" é inválido." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" não é um repositório git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11444,7 +11614,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "adicionar \"coletado seletivamente de\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "adicionado" @@ -11452,7 +11622,7 @@ msgstr "adicionado" msgid "added files" msgstr "arquivos adicionados" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "um arquivo sem nome" @@ -11460,14 +11630,19 @@ msgstr "um arquivo sem nome" msgid "and support the developers" msgstr "e apóie os desenvolvedores" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "assume-valid" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "autor (>= 0,5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "baseado em TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11500,32 +11675,32 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "submissões" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "em conflito" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copiado de\r\n%s - revisão %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dia" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "excluído" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" -msgstr "" +msgstr "comparação de pipe" #. Resource IDs: (58116) msgid "dummy" @@ -11535,7 +11710,7 @@ msgstr "modelo" msgid "eMail settings" msgstr "Configurações de eMail" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11544,16 +11719,16 @@ msgid "" "%s" msgstr "exportado\n%s\npara\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "externo" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "o git não saiu corretamente (código de saída %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorado" @@ -11561,15 +11736,15 @@ msgstr "ignorado" msgid "include &untracked" msgstr "incluir &não monitorados" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incompleto" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "herdar" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "ítem mantido localmente" @@ -11577,7 +11752,7 @@ msgstr "ítem mantido localmente" msgid "keep the file lists in English" msgstr "manter listas de arquivo em inglês" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11586,7 +11761,7 @@ msgid "" "%s = %ld" msgstr "linhas: %d(+) %d(-) arquivos: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11601,11 +11776,11 @@ msgstr "linhas: %d(+) %d(-) arquivos: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "mestre" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "combinado" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "ausente" @@ -11613,7 +11788,7 @@ msgstr "ausente" msgid "missing/deleted/replaced" msgstr "faltando/excluído/substituído" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "modificado" @@ -11621,7 +11796,7 @@ msgstr "modificado" msgid "modified/copied" msgstr "modificado/copiado" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mês" @@ -11629,40 +11804,44 @@ msgstr "mês" msgid "new branch" msgstr "novo ramo" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "não" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "não existe descrição para esse comando" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "sem controle de versão" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" -msgstr "" +msgstr "nenhum" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "não encontrado" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "obstruído" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "em %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixels" @@ -11670,11 +11849,11 @@ msgstr "pixels" msgid "possible or real conflict/obstructed" msgstr "conflito/obstrução possível ou real" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestre" @@ -11682,35 +11861,35 @@ msgstr "trimestre" msgid "renamed" msgstr "renomeado" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "substituído" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "analisando caminho:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "skip-worktree" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "alternado para\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "cuidar de mudanças de submódulos" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "para %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "para %s" @@ -11719,35 +11898,35 @@ msgstr "para %s" msgid "u&nknown changes" msgstr "mudanças &desconhecidas" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "semana" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - todos usuários do Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - usuário atual do Windows" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - apenas este repositório" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - usuário atual do Windows" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - apenas este repositório" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "ano" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "sim" diff --git a/Languages/Tortoise_pt_PT.po b/Languages/Tortoise_pt_PT.po index 7ae923cc3..0ee642260 100644 --- a/Languages/Tortoise_pt_PT.po +++ b/Languages/Tortoise_pt_PT.po @@ -6,19 +6,23 @@ # Translators: # Abel Maio , 2013 # Abel Maio , 2013 +# alfalb_mansil, 2014 +# Abel Maio , 2013 # JustinoAveiro , 2011,2013 # Lübbe TortoiseSVN , 2011 # Lübbe , 2012 -# Lübbe TortoiseSVN , 2011 +# Lübbe TortoiseSVN , 2011-2012 +# Luis Xavier Baena Mourão , 2015 +# Michel Apt , 2015 # JustinoAveiro , 2013 # Sandro Amaral , 2011 # Sven Strickroth , 2013 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/tortoisegit/language/pt_PT/)\n" "MIME-Version: 1.0\n" @@ -27,7 +31,7 @@ msgstr "" "Language: pt_PT\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -49,138 +53,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autores indicados individualmente:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "" +msgstr "%.2f MiB transferidos" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 continha um objecto inesperado." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 contém um caminho incorrecto." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 contém um esquema incorrecto." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 tem um formato inválido." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 não foi encontrado." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! Dia atrás" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! Dias atrás" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! Hora atrás" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! Horas atrás" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! Minuto atrás" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! Mês atrás" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! Meses atrás" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! Segundo atrás" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! Segundos atrás" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! Semana atrás" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! Semanas atrás" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! Ano atrás" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! Anos atrás" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minutos atrás" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nContinuar a executar o script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -188,52 +192,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nO arquivo não foi encontrado.\nVerifique se o caminho e o nome do arquivo foram correctamente especificados." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bytes transferidos" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "%I64d KiB transferidos" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d ficheiros selecionados, %d ficheiros no total" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d autore(s) mais activos com pelo menos %d sumições cada (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -241,78 +245,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nclica para alternar alfa\nduplo clique para automaticamente alternar alfa" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minuto(s) and %ld sgundo(s)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld de %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - na revisão: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Recuperado]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s em %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, em %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Exportar (%d) de %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Exportar de %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nDeseja removê-lo de qualquer forma?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -328,6 +332,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Sobre o TortoiseGitBlame..." @@ -350,21 +358,21 @@ msgstr "&Adicionar >>" #. Resource IDs: (1505) msgid "&Add Filter" -msgstr "" +msgstr "&Adicionar Filtro" #. Resource IDs: (1382) msgid "&Add New/Save" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Adicionar ou Remover Botões" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Adicionar..." @@ -404,7 +412,7 @@ msgstr "&Atribuir" msgid "&Associate double-click event with:" msgstr "&Associar evento de duplo clique a:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Ocultar Automaticamente" @@ -420,15 +428,15 @@ msgstr "" msgid "&Backup original file" msgstr "Fazer &cópia de segurança do arquivo original" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Responsabilizar pelas alterações" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Responsabilizar pelas revisões" @@ -438,7 +446,7 @@ msgstr "&Azul:" #. Resource IDs: (65535) msgid "&Border:" -msgstr "" +msgstr "&Margem:" #. Resource IDs: (1512) msgid "&Branch" @@ -452,7 +460,7 @@ msgstr "" msgid "&Browse Dir" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Navegar repositório" @@ -488,7 +496,7 @@ msgstr "&Categoria:" msgid "&Choose commands from:" msgstr "Escolher &comandos de:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Limpar..." @@ -512,7 +520,7 @@ msgstr "Fe&char Janela(s)" msgid "&Command:" msgstr "&Comando:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "" @@ -520,23 +528,27 @@ msgstr "" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Submeter..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Comparar revisões" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copiar" @@ -556,19 +568,19 @@ msgstr "&Personalizado" msgid "&Default" msgstr "Por &omissão" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Remover" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Remover (manter local)" #. Resource IDs: (1507) msgid "&Delete Filter" -msgstr "" +msgstr "&Apagar Filtro" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "" @@ -580,11 +592,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Comparar" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Comparar com revisão anterior" @@ -596,7 +608,7 @@ msgstr "" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "" @@ -604,7 +616,7 @@ msgstr "" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Ancorar" @@ -612,11 +624,15 @@ msgstr "&Ancorar" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "" @@ -624,19 +640,19 @@ msgstr "" msgid "&Edit" msgstr "&Editar" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "" #. Resource IDs: (1506) msgid "&Edit Filter" -msgstr "" +msgstr "&Editar Filtro" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Editar conflitos" @@ -658,13 +674,13 @@ msgstr "&Activar Servidor Proxy" #. Resource IDs: (32976) msgid "&Enable edit" -msgstr "" +msgstr "Activar &editar" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportar selecção para..." @@ -676,27 +692,27 @@ msgstr "&Externo" msgid "&File" msgstr "&Arquivo" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Localizar" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "A&justar Imagens na janela" +msgid "&Fit images in window\tF" +msgstr "A&justar Imagens na janela\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "Unidades &fixas" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flutuar" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -708,7 +724,7 @@ msgstr "&Tipo de letra para mensagens de registo:" msgid "&Font:" msgstr "&Tipo de letra:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -728,7 +744,7 @@ msgstr "" msgid "&Go to\tCtrl+G" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -740,7 +756,7 @@ msgstr "&Verde:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Ajuda" @@ -748,7 +764,7 @@ msgstr "&Ajuda" msgid "&Help Topics" msgstr "&Tópicos de Ajuda" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Ocultar" @@ -756,11 +772,11 @@ msgstr "&Ocultar" msgid "&Icon Set:" msgstr "&Conjunto de Ícones:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorar %d itens por nome" @@ -774,14 +790,14 @@ msgid "&Image" msgstr "&Imagem" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Info da Imagem" +msgid "&Image info\tI" +msgstr "&Info da Imagem\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "Apenas a &imagem" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importar..." @@ -793,7 +809,7 @@ msgstr "Pasta &inicial:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -805,11 +821,11 @@ msgstr "&Saltar para a primeira diferença ao carregar" msgid "&Keep CR" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -831,13 +847,13 @@ msgstr "&Limitar procura às linhas alteradas" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Limite:" #. Resource IDs: (1078) msgid "&Line number" msgstr "Número de &Linha" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Número de &Linha (%d - %d)" @@ -854,7 +870,7 @@ msgstr "Vista em &Lista" msgid "&Local Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -878,11 +894,11 @@ msgstr "Animações de &menu:" msgid "&Menu contents:" msgstr "Conteúdo de &menu:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Integrar" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Integrar..." @@ -904,7 +920,7 @@ msgstr "&Minimizar" #. Resource IDs: (32880) msgid "&Moved blocks" -msgstr "" +msgstr "Blocos &Movidos" #. Resource IDs: (1515) msgid "&Name" @@ -932,12 +948,16 @@ msgstr "&Novo..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Próximo >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Próxima Página" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Sem evento de duplo clique" @@ -954,11 +974,11 @@ msgstr "&Nenhum" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Uma Página" @@ -966,19 +986,15 @@ msgstr "&Uma Página" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Abrir" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -991,18 +1007,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Sobrepor imagens" +msgid "&Overlay images\tO" +msgstr "&Sobrepor imagens\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Palavra-passe:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Colar" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1010,7 +1026,7 @@ msgstr "" msgid "&Port:" msgstr "&Porto:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Prever Impressão" @@ -1018,11 +1034,15 @@ msgstr "&Prever Impressão" msgid "&Print..." msgstr "&Imprimir..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Imprimir...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1030,10 +1050,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "Mensagens &recentes" @@ -1046,7 +1070,7 @@ msgstr "" msgid "&Red:" msgstr "&Vermelho:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Refazer" @@ -1062,7 +1086,7 @@ msgstr "&Refrescar" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1070,7 +1094,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1078,7 +1102,7 @@ msgstr "" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Remover" @@ -1088,9 +1112,9 @@ msgstr "" #. Resource IDs: (1511) msgid "&Replace" -msgstr "" +msgstr "&Substituir" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Navegador de &repositório" @@ -1098,7 +1122,7 @@ msgstr "Navegador de &repositório" msgid "&Reset" msgstr "&Reiniciar" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Reiniciar Barra de Ferramentas" @@ -1114,23 +1138,27 @@ msgstr "&Reiniciar os meus dados de utilização" msgid "&Reset to Default" msgstr "&Restaurar Valor por Omissão" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1142,7 +1170,7 @@ msgstr "Cliente &SSH:" msgid "&Saturation:" msgstr "&Saturação:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Guardar" @@ -1150,15 +1178,19 @@ msgstr "&Guardar" msgid "&Save authentication" msgstr "&Guardar a autenticação" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Guardar grafo como..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Guardar a lista de arquivos seleccionados em..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Guardar\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1166,7 +1198,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Preferências" @@ -1186,7 +1218,7 @@ msgstr "&Mostrar etiquetas textuais" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "" @@ -1194,7 +1226,7 @@ msgstr "" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1206,7 +1238,7 @@ msgstr "" msgid "&Start Group" msgstr "&Iniciar Grupo" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1226,7 +1258,7 @@ msgstr "&Vista de Símbolos" msgid "&Tab size:" msgstr "&Tamanho do tabulador:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Documento com separadores" @@ -1234,7 +1266,7 @@ msgstr "&Documento com separadores" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Etiquetas" @@ -1270,7 +1302,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Barras de Ferramentas:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1282,7 +1314,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Duas Páginas" @@ -1290,15 +1326,15 @@ msgstr "&Duas Páginas" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Desfazer" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Comparação &unificada" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1310,7 +1346,7 @@ msgstr "Dispositivos &desconhecidos" msgid "&Up" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Actualizar item para revisão" @@ -1322,11 +1358,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Usar completação automática para caminhos de arquivo e palavras-chave" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Nome de utilizador:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Ver" @@ -1334,7 +1370,7 @@ msgstr "&Ver" msgid "&View:" msgstr "&Ver:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1350,6 +1386,10 @@ msgstr "&Palavra inteira" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -1358,46 +1398,46 @@ msgstr "" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(sem lista de alterações)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(sem número de linha)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(sem valor)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(não encontrado)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(desconhecido)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "" @@ -1405,13 +1445,14 @@ msgstr "" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1419,7 +1460,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1435,7 +1476,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1451,31 +1492,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1484,66 +1525,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit é uma extensão de shell.\nO que significa que está integrada com o explorador do Windows.\nPara usar o TortoiseGit abrir por favor o explorador e clicar à direita em qualquer pasta para abrires o menu de contexto, onde encontrarás todos os comandos do TortoiseGit.\nE lê o manual!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1551,7 +1592,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1563,71 +1604,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Uma lista de caminhos separados por fins-de-linha para os quais será utilizada a sobreposição de ícones. Se adicionar\num caractere '*' ao final de um caminho, todos os arquivos e pastas abaixo desse caminho serão também incluídos." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Uma lista de caminhos separados por fins-de-linha para os quais não será utilizada a sobreposição de ícones.\r\nSe adicionar um carácter '*' ao final de um caminho, todos os arquivos e pastas dentro desse caminho serão\r\ntambém excluídos. Uma lista vazia permitirá a sobreposição de ícones em todos os caminhos." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Uma lista de caminhos separados por fins-de-linha para os quais não será utilizada a sobreposição de ícones.\nSe adicionar um caractere '*' ao final de um caminho, todos os arquivos e pastas abaixo desse caminho serão.\ntambém excluídos. Uma lista vazia permitirá a sobreposição de ícones em todos os caminhos." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Um recurso necessário estava indisponível." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Um programa visualizador de arquivos de diferenças GNU (arquivos de correcção).\r\nSe não possuir nenhum destes programas, use o Bloco de Notas." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "So&bre" @@ -1643,23 +1684,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Abortar" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "Abortar &Integração" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Sobre" @@ -1679,12 +1720,12 @@ msgstr "Sobre o TortoiseGitMerge" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "O acesso a %1 foi negado." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Acção" @@ -1692,26 +1733,26 @@ msgstr "Acção" msgid "Action log" msgstr "Registo de acções" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Acções" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Activar Lista de Tarefas" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Arquivos Activos" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Os objectos ActiveX não podem ser guardados quando se está a sair do Windows!\nDescartar todas as alterações a %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Adicionar" @@ -1719,7 +1760,7 @@ msgstr "Adicionar" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Adicionar '%s' ao dicionário" @@ -1732,15 +1773,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Adicionar programa de comparação para extensão específica" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Adicionar de programa de combinação para extensão específica" @@ -1748,15 +1789,15 @@ msgstr "Adicionar de programa de combinação para extensão específica" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Adicionar à lista de &ignorados" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Adicionar à Barra de Ferramentas de Acesso Rápido" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Adicionar..." @@ -1764,11 +1805,11 @@ msgstr "Adicionar..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Adicionar/Editar Programa de Comparação/Integração para Extensão Específica" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Adicionado" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1776,25 +1817,25 @@ msgid "" "to the ignore list." msgstr "Adicionado(s) o(s) padrão(ões) de arquivo\n%s\nà lista de ignorados." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Adicionando" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Adiciona o(s) ficheiros(s) seleccionado(s) ou a máscara de arquivos à lista de ignorados" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ajustar as preferências\nPreferências" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avançado" @@ -1802,43 +1843,43 @@ msgstr "Avançado" msgid "Advanced Diff/Merge Settings" msgstr "Preferências de Comparação/Integração Avançadas" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Preferências de comparação avançadas" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Preferências de integração avançadas" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Todos" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Todos os Comandos" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Todos os Ficheiros(*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Todos os Ficheiros (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1846,47 +1887,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Todas as alterações serão perdidas! Deseja realmente repor todas as barras de ferramentas e todos os menus?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Todas as alterações serão perdidas! Deseja realmente repor as atribuições do teclado?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Todas as alterações serão perdidas! Deseja realmente repor o menu '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Todas as alterações serão perdidas! Deseja realmente repor a barra de ferramentas '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" -msgstr "" +msgstr "Permitir edição nesta vista\nPermitir edição" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1902,11 +1943,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Usa sempre as preferências regionais do sistema para mostrar horas e datas" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1914,12 +1955,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1930,7 +1971,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1943,36 +1984,36 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Um manipulador de arquivo inválido foi associado a %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Ocorreu um erro desconhecido." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Ocorreu um erro desconhecido ao aceder %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Um tipo de linha desconhecido foi encontrado na linha %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" -msgstr "" +msgstr "Anexar bloco direito" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" -msgstr "" +msgstr "Anexar este bloco à esquerda" #. Resource IDs: (65535) msgid "Application Frame Menus: " @@ -1982,11 +2023,11 @@ msgstr "Menus da Moldura da Aplicação:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Aplicar Correcção..." @@ -1994,7 +2035,7 @@ msgstr "Aplicar Correcção..." msgid "Apply Patches" msgstr "Aplicar Correções" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -2002,7 +2043,7 @@ msgstr "" msgid "Apply unified diff" msgstr "Aplicar comparação unificada" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Estilo Aqua" @@ -2010,39 +2051,39 @@ msgstr "Estilo Aqua" msgid "Arabic" msgstr "" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Tem a certeza de que deseja marcar o(s) arquivo(s) em conflito como resolvido(s)?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Tem a certeza de que quer reverter %d item(s)? Perderá todas as alterações realizadas desde a última actualização!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Organização &vertical" +msgid "Arrange &vertical\tV" +msgstr "Organização &vertical\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Atribuído à lista de alterações '%s'" @@ -2051,11 +2092,11 @@ msgstr "Atribuído à lista de alterações '%s'" msgid "Assigned to:" msgstr "Atribuído a:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2067,34 +2108,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Na revisão: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Tentativa de realizar uma operação não suportada." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Tentativa de aceder a ponto depois do final de %1." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Tentativa de leitura da escrita de %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Tentativa de escrita para a leitura de %1." @@ -2111,11 +2152,11 @@ msgstr "Autenticação" msgid "Authentication data" msgstr "Dados de autenticação" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2123,7 +2164,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor: \t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autores" @@ -2145,11 +2186,11 @@ msgstr "" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Ocultar Automaticamente" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Ocultar Tudo Automaticamente" @@ -2157,23 +2198,23 @@ msgstr "Ocultar Tudo Automaticamente" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Fechar automaticamente se não houver conflitos" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Fechar automaticamente se não houver erros" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Fechar automaticamente se não houver integrações, adições ou remoções" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2187,7 +2228,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automático" @@ -2197,7 +2238,7 @@ msgstr "Verificar automaticamente, todas as semanas, se existem &novas versões" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Testador de Texto Automático" #. Resource IDs: (1157) msgid "Average" @@ -2207,19 +2248,19 @@ msgstr "Média" msgid "B&rowse..." msgstr "&Navegar..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Retroceder" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Fundo" #. Resource IDs: (65535) msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Gráfico de Barras" @@ -2239,7 +2280,7 @@ msgstr "Arquivo base:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2251,45 +2292,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Mapa de bits\num mapa de bits" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Estilo Black" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Responsabilidade" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Responsabiliza um autor por cada linha de um arquivo" @@ -2297,28 +2338,32 @@ msgstr "Responsabiliza um autor por cada linha de um arquivo" msgid "Blend alpha" msgstr "Misturar alfa" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Estilo Blue" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Tanto /logmsg como /logmsgfile foram indicadas!\nSó se pode indicar uma delas." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Ambos os caminhos para a correcção e destino devem ser absolutos!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" -msgstr "" +msgstr "Vista de fundo:" #. Resource IDs: (1007) msgid "Br&owse..." @@ -2328,30 +2373,30 @@ msgstr "&Navegar..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ramo" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2363,11 +2408,11 @@ msgstr "Ramo:" msgid "Bro&wse" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Navegar para procurar o programa de comparação externo" @@ -2379,19 +2424,19 @@ msgstr "" msgid "Browse..." msgstr "Navegar..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID de Erro" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "E&xpressão Bug-ID:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "IDs de erro" @@ -2407,7 +2452,7 @@ msgstr "" msgid "Button Appearance" msgstr "Aparência do Botão" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2423,7 +2468,7 @@ msgstr "&Verificar agora" msgid "C&ommands:" msgstr "C&omandos:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&ria um ramo/etiqueta a partir da revisão" @@ -2431,17 +2476,17 @@ msgstr "C&ria um ramo/etiqueta a partir da revisão" msgid "C&urrent Keys:" msgstr "Teclas C&orrentes:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "Cor&tar" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" #. Resource IDs: (65535) msgid "CC:" -msgstr "" +msgstr "CC:" #. Resource IDs: (1741) msgid "Calculate" @@ -2451,11 +2496,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Faça um duplo clique na lista de mensagens de registo para comparar com uma revisão anterior" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Impossível activar um objecto ActiveX estático." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2464,80 +2509,80 @@ msgid "" "%s" msgstr "Não é possivel copiar de\n%s\npara\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Impossível copiar a imagem de mapa de bits para a área de transferência!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Impossível criar uma nova imagem!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Impossível personalizar os menus!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Impossível colar a imagem de mapa de bits a partir da área de transferência!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Cancelar" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "" +msgstr "Cancelar\nNão troques de vistas" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "" +msgstr "Cancelar\nmantém o ficheiro vazio." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "" +msgstr "Cancela.r\nResolve primeiro o conflito" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" -msgstr "" +msgstr "Cancelar\nManter ficheiros actuais" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" -msgstr "" +msgstr "Cancelar\nManter preferências actuais" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Impossível mostrar a comparação devido à inconsistência dos fins-de-linha no arquivo." @@ -2549,9 +2594,9 @@ msgstr "Casca&ta" msgid "Cascaded context menu" msgstr "Menu de atalho em cascata" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Sensível á capitalização" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2573,33 +2618,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Altera o estilo da aplicação\nAlterar estilo" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Alterar a posição da janela" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Alterar o tamanho da janela" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2607,38 +2652,38 @@ msgstr "" msgid "Changed Files" msgstr "Arquivos Alterados" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Ficheiros alterados entre %s, %s e %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Arquivos alterados: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "A lista de alterações %s foi movida" @@ -2647,15 +2692,15 @@ msgstr "A lista de alterações %s foi movida" msgid "Changes made (double-click on file for diff):" msgstr "Alterações feitas (duplo clique no arquivo para comparar):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Altera o estilo da aplicação" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Posição onde visualizar uma linha de margem nas caixas de texto de submissão: " -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Verificar" @@ -2667,31 +2712,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Verificar Actualizações..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Veri&ficar alterações" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Verifique o caminho e/ou URL que introduziu." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Marca as entradas do menu que queres que apareçam no menu de contexto de topo, em vez de no submenu TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Picar para mostrar tempos relativos nas mensagens de registo" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Marque para usar um formato de data e hora mais conciso nas mensagens de registo" @@ -2699,31 +2744,31 @@ msgstr "Marque para usar um formato de data e hora mais conciso nas mensagens de msgid "Check:" msgstr "Verificar:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Checkout" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2731,11 +2776,11 @@ msgstr "" msgid "Chinese" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2747,78 +2792,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Limpando" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "A limpar." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Falha ao limpar os seguintes caminhos:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "A limpeza foi efectuada com sucesso nos seguintes caminhos:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Apagar" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Ferramenta para Apagar\nApagar" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Apaga %ld pares nome de utilizador/palavra-passe, %ld certificados SSL e %ld nomes de utilizador" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Apaga registos em cache de %ld repositórios" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Apaga as credenciais armazenadas.\r\nTerá que introduzir novamente as credenciais para todos os repositórios." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Apaga os tamanhos e posições armazenados de %ld caixas de diálogo" @@ -2827,7 +2872,7 @@ msgstr "Apaga os tamanhos e posições armazenados de %ld caixas de diálogo" msgid "Click here to go to the website" msgstr "Carregue aqui para aceder ao sítio Web" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Carregue aqui para seleccionar uma mensagem recente" @@ -2843,17 +2888,17 @@ msgid "" "extension" msgstr "Carregue em \"Avançado\" para especificar programas de integração alternativos baseados na extensão do arquivo" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Clica para ver os comandos para mover blocos de texto\nUsar blocos de texto" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Área de transferência" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2861,7 +2906,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Clonar repositório existente" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "" @@ -2869,49 +2914,49 @@ msgstr "" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Clonar..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Fechar" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Terminar Tela Cheia" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Fechar Previsão de Impressão\nFe&char" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Fechar manualmente" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Fecha a janela activa e pergunta se se deseja guardar os documentos" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "colapsar" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2923,7 +2968,7 @@ msgstr "Cor" #. Resource IDs: (32785) msgid "Color by age, &continuous" -msgstr "" +msgstr "Cor por idade, &continua" #. Resource IDs: (138, 16961, 65535) msgid "Colors" @@ -2937,7 +2982,7 @@ msgstr "Cores:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2945,11 +2990,11 @@ msgstr "" msgid "Comman&ds:" msgstr "Coman&dos:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Comando" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Linha de Comando" @@ -2957,7 +3002,7 @@ msgstr "Linha de Comando" msgid "Command Line To Execute:" msgstr "Linha de Comando A Executar:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Comando falhou." @@ -2965,41 +3010,41 @@ msgstr "Comando falhou." msgid "Commands" msgstr "Comandos" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Submeter" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "" @@ -3007,7 +3052,7 @@ msgstr "" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3015,19 +3060,19 @@ msgstr "" msgid "Commit to:" msgstr "Submeter a:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Submeter..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Submissões por autor" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Submissões por data" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Submete cada %s" @@ -3036,15 +3081,15 @@ msgstr "Submete cada %s" msgid "Commits each week:" msgstr "Submissões cada semana:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Submete as suas alterações ao repositório" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3056,52 +3101,52 @@ msgstr "Submeter uma pasta sem controlo de versões não adicionará recursivame msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Comparar as &Revisões HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Compara dois ficheiros" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Comparar espaços em branco" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Comparar com a b&ase" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Comparar com a revisão anterior" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Incluir todos os espaços em branco ao comparar\nComparar espaços em branco" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Compara o ficheiro com a última revisão submetida para mostrar as alterações que lhe fez" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Comparando %s com %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Concluído" @@ -3117,9 +3162,9 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" -msgstr "" +msgstr "Configura Regex do filtro " #. Resource IDs: (236) msgid "Configure Hook Scripts" @@ -3151,11 +3196,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "" @@ -3163,15 +3208,15 @@ msgstr "" msgid "Conflict resolved" msgstr "Conflito resolvido" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Em conflito" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflitos: %d" @@ -3182,126 +3227,126 @@ msgstr "Menus de Atalho:" #. Resource IDs: (65535) msgid "Context lines for patches" -msgstr "" +msgstr "Linhas de contexto para patches" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continuar" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Contrair janela ancorada" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" -msgstr "" +msgstr "Converte espaços em tabs" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" -msgstr "" +msgstr "Converte tabs para espaços" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Cop&iar" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copiado" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copiar" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copiar %s para %s, Revisão %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Ferramenta de Cópia\nCopiar" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copiar todas as informações para a área de transferência" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copiar e alterar o nome" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copiar caminhos para a área de transferência" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copiar selecção ¶ a área de transferência" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copiar a selecção e colocá-la na área de transferência\nCopiar" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copiar para a área de transferência" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copiar: Novo nome para %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "A copiar %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Copiando..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Correcções" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "%s não pôde ser adicionado à lista de ignorados!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Não foi possível verificar a existência de uma nova versão!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3309,76 +3354,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 não pôde ser criado porque o directório está cheio." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Não foi possível determinar a revisão mais recente submetida!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Não foi possível obter o estado!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 não pôde ser aberto porque há um número excessivo de arquivos abertos." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Não foi possível abrir o arquivo\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Não foi possível remover %1, uma vez que é o directório corrente." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Não foi possível remover %s da lista de ignorados" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Não foi possível recuperar o URL do arquivo!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Não foi possível recuperar a revisão %s do arquivo %s.\nNão é possível aplicar a correcção!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3386,7 +3431,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3394,7 +3439,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3402,11 +3447,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Não foi possível iniciar a tarefa de impressão." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3414,11 +3459,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Não foi possível iniciar o processo ligeiro!" @@ -3426,10 +3471,10 @@ msgstr "Não foi possível iniciar o processo ligeiro!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." -msgstr "" +msgstr "Contagem: %u correspondências." #. Resource IDs: (1683) msgid "Create &Library" @@ -3439,15 +3484,15 @@ msgstr "Criar &Biblioteca" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Criar Ramo..." @@ -3459,29 +3504,29 @@ msgstr "Criar Lista de Alterações" msgid "Create New Branch" msgstr "Criar novo Ramo" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Criar etiqueta..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3490,49 +3535,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Criar ficheiro correcção" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Criar &repositório aqui..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Cria um arquivo de correcção a partir das diferenças entre os dois arquivos\nCriar arquivo de correcção" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Cria uma base de dados de repositório no local corrente" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Cria um ficheiro de comparação unificado com todas as alterações que fez" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3544,7 +3589,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Recor&tar" @@ -3552,7 +3597,7 @@ msgstr "Recor&tar" msgid "Current" msgstr "Corrente" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Ramo Actual" @@ -3560,7 +3605,7 @@ msgstr "Ramo Actual" msgid "Current Branch:" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3572,7 +3617,7 @@ msgstr "" msgid "Current version is:" msgstr "A versão corrente é:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "A versão corrente é: %s" @@ -3585,7 +3630,7 @@ msgstr "&Personalizar..." msgid "Custom" msgstr "Personalizado" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personalizar" @@ -3593,19 +3638,19 @@ msgstr "Personalizar" msgid "Customize Keyboard" msgstr "Personalizar Teclado" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Personalizar Barra de Ferramentas de Acesso Rápido" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Personalizar Barra de Ferramentas de Acesso Rápido..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3619,88 +3664,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Data" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Por omissão" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Menu Por Omissão" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Menu da aplicação por omissão. Surge quando não há documentos abertos." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Por omissão usa-se codificação UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Remover" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Apagar e &ignorar %d itens por nome" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Apagar e ignorar %d itens por &extensão " -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3708,34 +3757,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "" +msgstr "emover\nO ficheiro será removido." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Removido" @@ -3743,36 +3792,36 @@ msgstr "Removido" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Adiciona os ficheiros(s) seleccionado(s) ou a máscara à lista de ignorados" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Remove o arquivo de registo de acções" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Removendo" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "A apagar dados em cache" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "A apagar o ficheiro" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3782,7 +3831,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Nível" #. Resource IDs: (65535) msgid "Describe" @@ -3792,7 +3841,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Descrição" @@ -3800,7 +3849,7 @@ msgstr "Descrição" msgid "Description:" msgstr "Descrição:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Desmarcar lista de alterações" @@ -3808,33 +3857,33 @@ msgstr "Desmarcar lista de alterações" msgid "Destination" msgstr "Destino" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "O disco de destino está cheio." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detectar e marcar os blocos movidos" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3848,11 +3897,15 @@ msgstr "Dimensões e posições das caixas de diálogo" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Opções de Dif" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3884,9 +3937,9 @@ msgstr "Arquivo de comparação:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" -msgstr "" +msgstr "Diff mais tarde" #. Resource IDs: (65535) msgid "Diff position" @@ -3896,12 +3949,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3914,19 +3967,19 @@ msgstr "Diferença entre" msgid "Diffing" msgstr "Comparando" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3938,26 +3991,26 @@ msgstr "Pasta:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disco cheio ao aceder a %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Lançar a excepção: %1" @@ -3966,44 +4019,52 @@ msgstr "Lançar a excepção: %1" msgid "Display &buttons in this order" msgstr "Mostrar os &botões por esta ordem" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Mostra a ajuda para os botões, menus e janelas clicadas\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Mostrar a ajuda para a tarefa ou comando correntes\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Mostra as instruções de utilização da ajuda\nAjuda" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Mostra informações sobre o programa, número de versão e direitos de autor\nSobre" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4016,54 +4077,71 @@ msgstr "Não mostrar o menu de atalho para os seguintes caminhos:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Deseja realmente remover a barra de ferramentas '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Deseja realmente mover esse arquivo ou pasta?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4071,7 +4149,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4079,43 +4157,43 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" -msgstr "" +msgstr "Desejas carregar os ficheiros alterados?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" "%s\n" "as resolved?" -msgstr "Queres marcar o ficheiro ⏎ %s⏎ como resolvido?" +msgstr "Queres marcar o ficheiro\n%s\ncomo resolvido?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Queres recuperar estes documentos automáticament salvos?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Queres recarregar os documentos para que reflictam as alterações das preferências?\nNota: perdes todas as alterações feitas!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4123,42 +4201,42 @@ msgstr "" msgid "Document :" msgstr "Documento :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Não recuperar os documentos salvos automáticamente\nUtilizar as últimas versões explicitamente salvas dos documentos" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" -msgstr "" +msgstr "Não guardar\nFechar vistas sem guardar alterações" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "" +msgstr "Não guardar\nRecarregar as vistas sem guardar as modificações" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Não mostrar esta mensagem de novo" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "" @@ -4170,7 +4248,7 @@ msgstr "Baixo" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Arrastar para fazer este menu flutuar" @@ -4198,6 +4276,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "E&xcluir caminhos:" @@ -4206,7 +4288,7 @@ msgstr "E&xcluir caminhos:" msgid "E&xit" msgstr "Sai&r" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportar..." @@ -4226,11 +4308,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Editar" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4246,23 +4328,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Editar Imagem do Botão" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Editar autor" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Editar programa de comparação para extensões específicas" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Editar programa de integração para extensões específicas" @@ -4274,11 +4356,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Editar mensagem de registo" @@ -4298,25 +4380,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Nome ou endereço IP do servidor proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Ferramentas Elipse\nElipse" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4324,9 +4406,9 @@ msgstr "" msgid "Empty" msgstr "Vazio" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" -msgstr "" +msgstr "Activar edição" #. Resource IDs: (1510) msgid "Enable EditorConfig" @@ -4338,9 +4420,9 @@ msgstr "" #. Resource IDs: (1788) msgid "Enable drag context menu" -msgstr "" +msgstr "Ativar o arrastar menu de contexto" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4349,10 +4431,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Manipuladores de Sobreposição Activados" @@ -4361,35 +4447,35 @@ msgstr "Manipuladores de Sobreposição Activados" msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" -msgstr "" +msgstr "Encoding" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Ocorreu um erro E/S de hardware durante o acesso a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Ocorreu uma violação de bloqueio ao aceder a %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Ocorreu uma violação de partilha ao aceder a %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Ocorreu um argumento impróprio." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Ocorreu um erro inesperado ao ler %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Ocorreu um erro inesperado ao escrever em %1." @@ -4402,11 +4488,11 @@ msgstr "" msgid "End" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" -msgstr "" +msgstr "Estilo de fim de linha" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Aumentar a janela para o ecrã completo" @@ -4414,23 +4500,23 @@ msgstr "Aumentar a janela para o ecrã completo" msgid "Enter Log Message" msgstr "Introduza uma Mensagem de Registo" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Introduza uma URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Introduza um GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Introduza uma moeda." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Introduza uma data e/ou hora." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Introduza uma data." @@ -4438,90 +4524,90 @@ msgstr "Introduza uma data." msgid "Enter a name for the changelist:" msgstr "Introduza um nome para a lista de alterações:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Introduza um número entre %1 e %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Introduza um número." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Introduza um inteiro positivo." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Introduza uma hora." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Introduza um inteiro entre %1 e %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Introduza um inteiro entre 0 and 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Introduza um valor inteiro." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Especifique o conteúdo do ficheiro a testar:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Introduza uma &mensagem de registo:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Não insira mais do que %1 caracteres." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Especifique a expressão regular alfabética:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Apagar tudo\nApagar Tudo" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Apagar a selecção\nApagar" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Erro" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Erro ao reconstruir a Cache de Ícones do Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Erro durante leitura/escrita de uma chave de registro %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4531,28 +4617,28 @@ msgstr "Executável (*.exe)|*.exe|Comando (*.com)|*.com|Informação (*.pdf)|*.p msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existentes" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Sair" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Expandir (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Expandir janela ancorada" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Explorar para" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportar" @@ -4560,36 +4646,36 @@ msgstr "Exportar" msgid "Export Zip File" msgstr "Exportar Ficheiro Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportar directório:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportar também arquivos sem controle de versão" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "A exportar %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "A exportar..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extensão" @@ -4605,7 +4691,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Externo" @@ -4613,101 +4699,101 @@ msgstr "Externo" msgid "External Program:" msgstr "Programa Externo:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Desvanecer" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Reversão falhou" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Falha ao ligar.\nA ligação pode estar quebrada." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Falha ao converter objecto ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Falha ao criar documento vazio." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Falha ao criar objecto. Assegure-se de que a aplicação existe no registo do sistema." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Falha ao invocar a ajuda." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Falha ao lançar aplicação servidora." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Falha ao abrir documento." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Falha ao executar operação no servidor." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Falha ao guardar documento." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Falha ao atribuir/remover a lista de alterações '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Falha ao iniciar o fornecedor COM do controlador de problemas '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Falha!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4715,62 +4801,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Obter" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "A recolher o ficheiro..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "A recolher a revisão %s do ficheiro:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Ficheiro" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" -msgstr "" +msgstr "Codificação do ficheiro" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Ficheiro modificado cada %s" @@ -4779,27 +4865,27 @@ msgstr "Ficheiro modificado cada %s" msgid "File changes each week:" msgstr "Ficheiro modificado semanalmente:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Diferenças entre ficheiros" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" -msgstr "" +msgstr "O ficheiro não tem conflitos" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." -msgstr "" +msgstr "O ficheiro está vazio." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "A lista de ficheiros está vazia" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Correcções de ficheiros" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4811,7 +4897,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do ficheiro:\t\t%s (%s)\nLargura:\t\t\t%ld píxeis\nAltura:\t\t\t%ld píxeis\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4831,7 +4917,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do ficheiro:\t\t%s (%s)\nLargura:\t\t\t%ld píxeis\nAltura:\t\t\t%ld píxeis\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nTamanho do ficheiro:\t\t%s (%s)\nLargura:\t\t\t%ld píxes\nAltura:\t\t\t%ld píxeis\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4843,7 +4929,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do ficheiro:\t\t\t%s (%s)\nLargura:\t\t\t%ld píxeis\nAltura:\t\t\t%ld píxeis\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4863,7 +4949,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Tamanho do ficheiro:\t\t\t%s (%s)\nLargura:\t\t\t%ld píxeis\nAltura:\t\t\t%ld píxeis\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nTamanho do ficheiro:\t\t\t%s (%s)\nLargura:\t\t\t%ld píxeis\nAltura:\t\t\t%ld píxeis\nResolução Horizontal:\t%.1f dpi\nResolução Vertical:\t\t%.1f dpi\nProfundidade:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nome do ficheiro" @@ -4871,33 +4957,33 @@ msgstr "Nome do ficheiro" msgid "Files" msgstr "Ficheiros" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Ferramenta de Preenchimento\nPreencher" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrar por" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtro de caminhos" #. Resource IDs: (1479) msgid "Filter:" -msgstr "" +msgstr "Filtrar:" #. Resource IDs: (20090) msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Localizar" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4907,41 +4993,41 @@ msgstr "Localiza o texto especificado\nLocalizar" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." -msgstr "" +msgstr "Pesquisa: Encontrada primeira ocorrência a partir do fundo. Atingido início do documento." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." -msgstr "" +msgstr "Pesquisa: Encontrada primeira ocorrência a partir do topo. Atingido fim do documento." #. Resource IDs: (65535) msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Concluído!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Primeiro Parente" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Apenas Primeiro Parente" @@ -4950,18 +5036,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Disquetes (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Directório" @@ -4973,38 +5059,34 @@ msgstr "" msgid "Font" msgstr "Tipo de letra" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Para obter ajuda, pressione F1. Desloque horizontalmente com Ctrl-roda do rato" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Para um histórico completo desmarque 'Parar aquando de cópias/mudanças de nome'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forçar" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5016,26 +5098,26 @@ msgstr "" #. Resource IDs: (65535) msgid "Foreground" -msgstr "" +msgstr "Primeiro plano" #. Resource IDs: (312) msgid "Format Patch" msgstr "Formatar correcção" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Avançar" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5043,7 +5125,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Palavras auto encontradas:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5065,11 +5147,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5077,7 +5159,7 @@ msgstr "" msgid "From:" msgstr "De:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Ecrã Inteiro" @@ -5085,7 +5167,7 @@ msgstr "Ecrã Inteiro" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Totalmente recursivo" @@ -5093,7 +5175,7 @@ msgstr "Totalmente recursivo" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5101,24 +5183,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ não pôde ser iniciado!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "O GDI+ não pôde criar um mapa de bits. Provavelmente não há memória suficiente." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Juntando informações. Por favor, espere..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5148,43 +5230,43 @@ msgstr "Geral::Menu de Atalho" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Geral::Diálogos 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Geral::Diálogos 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Geral::Diálogos 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Obter registos de integração" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Obtendo o arquivo %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Obtendo o arquivo %s, revisão %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Obtendo informações..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Obtendo informação necessária..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Obtendo comparação unificada" @@ -5196,23 +5278,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Cópia Git e adiciona ficheiros à CT" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Cópia Git e renomeia aqui o item versionado" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Copia itens versionados aqui" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5220,35 +5302,35 @@ msgstr "" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5260,31 +5342,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5305,7 +5387,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5317,47 +5399,47 @@ msgstr "Ir para linha" msgid "Go to line" msgstr "Ir para linha" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Ir para o próximo conflito\nPróximo conflito" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Ir para a próxima diferença\nPróxima diferença" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Ir para a próxima diferença em linha\nPróxima diferença em linha" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Ir para o conflito anterior\nConflito anterior" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Ir para a diferença anterior\nDiferença anterior" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Ir para a diferença em linha prévia\nDiferença em linha prévia" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Ir para linha" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Gráfico" @@ -5373,11 +5455,11 @@ msgstr "Cinza" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Agrupar listas de alterações" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5393,7 +5475,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5405,7 +5487,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Ajuda" @@ -5429,11 +5511,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Esconder menus para caminhos não versionados" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Ocultar janela ancorada" @@ -5441,25 +5523,25 @@ msgstr "Ocultar janela ancorada" msgid "Hide the script while running" msgstr "Ocultar o script durante a sua execução" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Ocultar/Mostrar a lista de ficheiros correcção" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Ocultar/Mostrar a lista de arquivos de correcção\nOculta ou mostra a lista de arquivos de correcção" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5469,7 +5551,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Sugestão: seleccione o menu de contexto, altere a página para 'Comandos' e arraste os botões da barra de ferramentas para a janela do menu." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Casa" @@ -5485,7 +5567,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Scripts de Gancho::Integração do Controlador de Problemas" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tipo de Gancho" @@ -5499,9 +5581,9 @@ msgstr "I&ncluir caminhos:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5509,55 +5591,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5565,15 +5648,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5597,7 +5680,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5605,7 +5688,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5613,7 +5696,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5621,16 +5704,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5641,17 +5724,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5663,7 +5746,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5727,7 +5810,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Sobreposição de Ícones" @@ -5739,7 +5822,7 @@ msgstr "Sobreposição de Ícones::Conjunto de Ícones" msgid "Icon Overlays::Overlay Handlers" msgstr "Sobreposição de Ícones::Manipuladores de Sobreposição" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5749,52 +5832,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ícones/Design/Código:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Se activado, impede as sobreposições e o menu de atalho de surgirem nas caixas de diálogo 'salvar como...' ou 'abrir'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Se seleccionado, um duplo clique sobre uma revisão na lista de registo compara-a com a revisão anterior" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Se seleccionado, a caixa de diálogo de submissão será reiniciada automaticamente após um erro,\npreservando a sua última selecção e a sua mensagem de registo." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Se atribuído, arquivos dentro de pastas sem controlo de versões poderão ser mostradas no controlo do estado.\r\nO controlo do estado é usado, por exemplo, na caixa de diálogo de submissão." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5807,18 +5890,18 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorar" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorar %d itens por &extensão" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" -msgstr "" +msgstr "Ignorar Comentários" #. Resource IDs: (1692) msgid "Ignore File" @@ -5828,15 +5911,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorar todas as modificações aos espaços em branco" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5844,11 +5927,11 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Ignorar alterações de &capitalização" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "" +msgstr "Ignorar alterções\nIgnorar alterações externas." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5862,11 +5945,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Ignorar fins-d&e-linha (recomendado)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5874,29 +5957,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorar alterações em espaços em branco" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorado" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignorar todas as modificações aos espaços em branco ao comparar\nIgnorar todas modificações aos espaços em branco" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5914,24 +5997,24 @@ msgstr "Im&agem e texto" msgid "Images" msgstr "Imagens" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Filhos directos, incluindo pastas" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importar" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importar %s para %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5940,16 +6023,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importando arquivo %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5973,24 +6056,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Incluir apenas o seguinte intervalo de revisões:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nome de arquivo incorrecto." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Importação inicial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Dif em-linha" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Comparação em linha palavra-por-palavra" @@ -6002,25 +6085,25 @@ msgstr "Diferenças dentro da linha" msgid "Input" msgstr "Entrada" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Inserir conteúdo da Área de Transferência\nColar" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Memória insuficiente para realizar a operação." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Erro interno da aplicação." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Moeda Inválida." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6028,7 +6111,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6051,7 +6134,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6059,15 +6142,15 @@ msgstr "" msgid "Keep changelists" msgstr "Manter listas de alterações" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "" +msgstr "Continuar a resolver\nSaltar para o primeiro conflito aberto" #. Resource IDs: (16136) msgid "Keyboard" @@ -6077,7 +6160,7 @@ msgstr "Teclado" msgid "Keyboard shortcuts:" msgstr "Atalhos de teclado:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Teclas" @@ -6119,21 +6202,41 @@ msgstr "LINHA8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Língua:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "" @@ -6141,7 +6244,11 @@ msgstr "" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6149,17 +6256,17 @@ msgstr "" msgid "Least active author:" msgstr "Autor menos activo:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" -msgstr "" +msgstr "Deixar em conflito\nÉ mantido o estado de conflito do ficheiro" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Vista Esquerda:" @@ -6167,11 +6274,11 @@ msgstr "Vista Esquerda:" msgid "Left image" msgstr "Imagem esquerda" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Gráfico de Linhas" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6185,12 +6292,12 @@ msgstr "Barra de diferenças em linhas" msgid "Line differences" msgstr "Diferenças de linhas" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Linha deslocada da linha %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Linha deslocada para linha %ld" @@ -6203,26 +6310,26 @@ msgstr "" msgid "Line:" msgstr "Linha:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Linha: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Lista tópicos de Ajuda\nTópicos de Ajuda" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6240,23 +6347,23 @@ msgstr "Carregar Imagens" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "" +msgstr "Carregar alterações\nAs vistas serão actualizadas com novo conteúdo." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6264,13 +6371,13 @@ msgstr "" msgid "Local Branch" msgstr "Ramo Local" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Estado local" @@ -6278,7 +6385,7 @@ msgstr "Estado local" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6288,7 +6395,7 @@ msgstr "" msgid "Locator Bar" msgstr "Barra de Localização" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Registo" @@ -6328,12 +6435,12 @@ msgstr "Mensagens de registo (Mostrar caixa de diálogo de registo)" msgid "Login:" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Revisão mais baixa mostrada: %ld - Revisão mais alta mostrada: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6344,26 +6451,22 @@ msgstr "Revisão mais baixamostrada: %ld - Revisão mais alta mostrada: %ld - Re msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "A DLL do sistema de correio electrónico é inválida." -#. Resource IDs: (156) -msgid "Main" -msgstr "Principal" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6376,47 +6479,47 @@ msgstr "" msgid "Manage" msgstr "" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Marcar como resolvido" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" -msgstr "" +msgstr "Marcar como resolvido\nO estado do ficheiro é alterado para modificado" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Marcar para comparação" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" -msgstr "" +msgstr "Blocos Marcados" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Corresponder &capitalização" @@ -6440,7 +6543,7 @@ msgstr "Os me&nus mostram em primeiro lugar os comandos usados mais recentemente msgid "Menu" msgstr "Menu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Barra do Menu" @@ -6448,7 +6551,7 @@ msgstr "Barra do Menu" msgid "Menu s&hadows" msgstr "S&ombras do menu" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Integrar" @@ -6456,34 +6559,34 @@ msgstr "Integrar" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reintegrar Integração" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Integradas" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6491,22 +6594,22 @@ msgstr "" msgid "Merging" msgstr "Integrando" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Integrando de %s, revisão %s, a %s, revisão %s, em %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Integrar requer diferentes revisões ou diferentes URL em 'De:' e em 'Em:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Integrando as revisões %s de %s em %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Mensagem" @@ -6516,9 +6619,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "Mensagem parte &expressão:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Mensagens" @@ -6526,23 +6629,27 @@ msgstr "Mensagens" msgid "Min" msgstr "Mín" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Meu" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimizar o Friso" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Número mínimo de caractéres das mensagens de submissão:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Miscelânea" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Misto" @@ -6550,35 +6657,35 @@ msgstr "Misto" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Data de alteração" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Alterado" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Mais" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Mais Botões" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Mais Comandos..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Mais cores..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Mais..." @@ -6598,41 +6705,41 @@ msgstr "&Baixar" msgid "Move &Up" msgstr "&Subir" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Baixar Item" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Subir Item" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Mover e alterar o nome" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Mover para a lista de alterações" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Mover/Alterar o nome" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Mover: Novo nome para %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Move os arquivos modificados para a reciclagem antes de reverter" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Movendo %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Movendo..." @@ -6640,23 +6747,23 @@ msgstr "Movendo..." msgid "My file:" msgstr "O meu arquivo:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nome" #. Resource IDs: (65535) msgid "Name:" -msgstr "" +msgstr "Nome:" #. Resource IDs: (156) msgid "Navigate" msgstr "Navegar" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6666,11 +6773,11 @@ msgstr "Navegar na vista para uma linha específica\nIr para Linha" msgid "Navigation Pane Options" msgstr "Opções do Painel de Navegação" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opções do Painel de Navegação..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Aninhado" @@ -6682,7 +6789,7 @@ msgstr "Rede" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Novo" @@ -6691,77 +6798,73 @@ msgid "New &name:" msgstr "Novo &nome:" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Novo Menu" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Novo nome para %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" -msgstr "" +msgstr "Novo nome não pode estar vazio ou ser igual ao original!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Novo nome:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" -msgstr "" +msgstr "Linhas-novas" #. Resource IDs: (20308) msgid "Next" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Próxima Página\nPróxima Página" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Próximo conflito" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Próxima diferença" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Próxima diferença em linha" -#. Resource IDs: (73) -msgid "No" -msgstr "Não" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6773,102 +6876,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nenhum valor de comando especificado!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Não foram encontradas diferenças!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Não há messagem de erro disponível." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nenhum erro ocorreu." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Não há arquivos a mostrar com a preferência corrente.\nSelecciona uma ou mais das preferências abaixo para veres os arquivos sem controlo de versão, ignorados e/ou ficheiros não alterados.\nPara veres as alterações remotas, clica em 'Verificar Repositório'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." +"the last commit." msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Nenhum gráfico disponível" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Nenhum codificador de imagens encontrado para %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Sem correcções de ortografia" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Sem cache de estado. Apenas as pastas com controle de versão receberão um sobreposição, o que não acontecerá com os arquivos" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Sem sugestões de sinónimos" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6876,11 +6984,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Nenhum" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6892,30 +7000,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nem todas as entradas no registo de sistema (ou no arquivo INI) foram removidas." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Memória insuficiente para completar a operação." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Memória insuficiente!\nTente contrair ou reduzir o factor de amplificação\npara reduzir o tamanho do gráfico de revisão." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6923,7 +7031,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6942,26 +7050,26 @@ msgstr "Nota: a pasta contém itens sem controlo de versões" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Notificação" @@ -6969,7 +7077,7 @@ msgstr "Notificação" msgid "Number Commits" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Número de %s" @@ -6982,7 +7090,7 @@ msgstr "Número de autores:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7054,41 +7162,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Cores do Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7096,15 +7204,15 @@ msgstr "" msgid "Older lines" msgstr "Linhas mais antigas" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Foram encontrados um ou mais documentos salvos autmáticamente." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Um ou mais arquivos estão em estado de conflito." @@ -7116,29 +7224,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Apenas arquivos filhos" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Apenas são permitidos números (opcionalmente\nseparados por vírgulas)!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Apenas este item" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Abrir" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7148,51 +7256,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Abrir ficheiros para dif. ou para aplicar uma correcção\nAbrir ficheiros" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Abrir a partir da área de transferência" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Abrir arquivo de imagem..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Abrir pasta pai" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Abrir com..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Abre a Ajuda\nTópicos de Ajuda" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opção" @@ -7201,30 +7310,30 @@ msgid "Options" msgstr "Opções" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Tamanho ori&ginal" +msgid "Ori&ginal size\tS" +msgstr "Tamanho ori&ginal\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Outros Painéis de Tarefas" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Outros" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Memória esgotada." @@ -7232,7 +7341,7 @@ msgstr "Memória esgotada." msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Saída.prn" @@ -7240,20 +7349,24 @@ msgstr "Saída.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Página %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7264,15 +7377,15 @@ msgstr "Página %u\nPáginas %u-%u\n" msgid "Page :" msgstr "Página :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parâmetros" @@ -7280,25 +7393,25 @@ msgstr "Parâmetros" msgid "Parameters:" msgstr "Parâmetros:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7308,41 +7421,41 @@ msgstr "" #. Resource IDs: (4585) msgid "Password" -msgstr "" +msgstr "Palavra-passe:" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Palavra-passe:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Colar" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Ferramenta para Colar\nColar" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Colar lista de nomes de arquivos" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Cola o caminho svn a partir da área de transferência, resultando numa operação de movimentação (corte) ou cópia" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7358,54 +7471,54 @@ msgstr "Corrigir os itens &seleccionados" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Corrigir todos os ficheiros" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Corrigir os ficherios selecionados" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Correcção" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Caminho" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." -msgstr "" +msgstr "Encontrado caminho que coincide melhor com a correcção." #. Resource IDs: (1580, 65535) msgid "Path:" -msgstr "" +msgstr "Caminho:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Caminhos" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Ferramenta de Lápis\nLápis" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Percentagem de autoria" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Percentagem" @@ -7413,24 +7526,24 @@ msgstr "Percentagem" msgid "Personalized Menus and Toolbars" msgstr "Menus e Barras de Ferramentas Personalizados" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7440,56 +7553,56 @@ msgstr "Imagem (Metafile)\numa imagem" msgid "Picture:" msgstr "Imagem:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Gráfico em Queijo" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Por favor especifique o script de gancho a executar." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Por favor especifique o caminho onde o script de gancho deve ser aplicado." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Por favor seleccione um tipo de gancho" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Por favor aguarde: a cancelar..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Por favor aguarde enquanto as diferenças são obtidas..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Por favor aguarde..." @@ -7505,11 +7618,11 @@ msgstr "Porto :" msgid "Port:" msgstr "Porto :" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Gancho Pós-Submissão" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7517,25 +7630,25 @@ msgstr "" msgid "Pre&v Page" msgstr "Página &Anterior" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Gancho Pré-Submissão" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" -msgstr "" +msgstr "Acrescentar no início o bloco direito" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" -msgstr "" +msgstr "Acrescentar no início este bloco à esquerda" #. Resource IDs: (65535) msgid "Press &New Shortcut Key:" @@ -7545,11 +7658,11 @@ msgstr "Pressione uma &Nova Tecla de Atalho:" msgid "Press &new shortcut key:" msgstr "Pressione uma &nova tecla de atalho:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Prever" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Prever arquivo corrigido" @@ -7561,51 +7674,51 @@ msgstr "Prever:" msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Página Anterior\nPágina Anterior" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflito anterior" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Diferença anterior" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Diferença em linha anterior" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Imprimir" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Imprimir Documento\nIm&primir" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Imprimir para Arquivo" @@ -7613,7 +7726,7 @@ msgstr "Imprimir para Arquivo" msgid "Printer :" msgstr "Impressora :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Arquivos de Impressora (*.prn)|*.prn|Todos os Arquivos (*.*)|*.*||" @@ -7621,11 +7734,11 @@ msgstr "Arquivos de Impressora (*.prn)|*.prn|Todos os Arquivos (*.*)|*.*||" msgid "Printing" msgstr "Imprimindo" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Programa" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programas (*.exe)|*.exe|Todos os Arquivos (*.*)|*.*||" @@ -7633,11 +7746,11 @@ msgstr "Programas (*.exe)|*.exe|Todos os Arquivos (*.*)|*.*||" msgid "Progress" msgstr "Progresso" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" -msgstr "" +msgstr "Projecto" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Propriedade" @@ -7645,17 +7758,17 @@ msgstr "Propriedade" msgid "Property Page" msgstr "Página de Propriedades" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Fornecedor" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Fornecedor de parâ&metros:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Fornecedor uuid win&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7677,15 +7790,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7693,19 +7806,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "" @@ -7721,11 +7834,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7733,22 +7846,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Encerra a aplicação; pede para guardar documentos\nSair" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7766,11 +7879,15 @@ msgstr "Unidades R&AM" msgid "R&eset" msgstr "Reini&ciar" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "R&everter para esta revisão" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7778,7 +7895,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7800,7 +7917,7 @@ msgstr "" msgid "Re&movable drives" msgstr "&Unidades amovíveis" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Alterar &nome..." @@ -7816,15 +7933,15 @@ msgstr "Reiniciar &Tudo" msgid "Re&store defaults" msgstr "Re&staurar valores por omissão" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Re&verter..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Leia o 'Guia de Uso Diário' antes de empancar..." @@ -7832,21 +7949,21 @@ msgstr "Leia o 'Guia de Uso Diário' antes de empancar..." msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Recente" @@ -7858,21 +7975,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Linhas recentemente modificadas" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Gravar Apenas" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Recuperar os documentos salvos automáticamente\nAbrir as versões salvas automáticamente em vez das explícitamente salvas" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7886,17 +8003,21 @@ msgstr "" msgid "Recursive" msgstr "Recursivo" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Refazer a acção anteriormente desfeita\nRefazer" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Reduzir a janela a um ícone" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7904,43 +8025,43 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Refrescar" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" -msgstr "" +msgstr "Filtro Regex" #. Resource IDs: (164) msgid "Regex Filters" -msgstr "" +msgstr "Filtros Regex" #. Resource IDs: (65535) msgid "Regex:" -msgstr "" +msgstr "Regex:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7959,7 +8080,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtro de Expressões Regulares:\r\n. : qualquer caractere\r\nc+ : corresponde ao caractere 'c' uma ou mais vezes\r\nc* : corresponde ao caractere 'c' zero ou mais vezes\r\n^ : início da linha\r\n$ : fim da linha\r\n(ola){n} : corresponde à cadeia 'ola' repetida n vezes\r\n(abcd) : sub expressão\r\n[aei0-9] : corresponde a 'a', 'e', 'i' e '0' a '9'\r\n[^aei0-9] : qualquer coisa excepto 'a', 'e', 'i' e '0' a '9'\r\n\r\n\\w : corresponde a 'a' a 'z', 'A' a 'Z', '0' a '9' ou '_'\r\n\\W : qualquer caractere não-alfanumérico\r\n\\d : dígitos de '0' a '9'\r\n\\s : espaço em branco" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Nacos de correcção rejeitados para o '%s'" @@ -7972,7 +8093,7 @@ msgstr "" msgid "Reload" msgstr "Recarregar" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8006,19 +8127,19 @@ msgstr "" msgid "Remote Branch" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Estado remoto" @@ -8030,12 +8151,12 @@ msgstr "" msgid "Remove" msgstr "Remover" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Remover %ld itens" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Remover %s" @@ -8044,7 +8165,7 @@ msgstr "Remover %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8052,21 +8173,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" -msgstr "" +msgstr "Remover todos os comentários antes de efetuar o diff, para que as alterações dentro dos comentários não apareçam como diferenças" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Remover da lista de &ignorados" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Remover da Barra de Acesso Rápido" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Remover da lista de alterações" @@ -8078,7 +8199,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8086,11 +8207,11 @@ msgstr "" msgid "Removed" msgstr "Removido" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Removido da lista de alterações" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8098,7 +8219,7 @@ msgid "" "from the ignore list." msgstr "Removido o padrão de nome de ficheiro\n%s\nda lista de ignorados." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Remove o arquivo ou a máscara de arquivos da lista de itens ignorados" @@ -8106,11 +8227,11 @@ msgstr "Remove o arquivo ou a máscara de arquivos da lista de itens ignorados" msgid "Rena&me..." msgstr "Alterar o no&me..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Alterar o nome" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Alterar o nome de %s" @@ -8119,20 +8240,20 @@ msgstr "Alterar o nome de %s" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Renomear/mover" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8140,9 +8261,9 @@ msgstr "Repete a última acção\nRepetir" #. Resource IDs: (1512) msgid "Replace &All" -msgstr "" +msgstr "Substituir &Todos" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8150,18 +8271,18 @@ msgstr "Substitui determinado texto por um texto diferente\nSubstituir" #. Resource IDs: (65535) msgid "Replace with:" -msgstr "" +msgstr "Substituir com:" #. Resource IDs: (65535) msgid "Replace:" -msgstr "" +msgstr "Substituir:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Substituindo" @@ -8185,11 +8306,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Solicita um nome de utilizador e uma palavra-passe" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." -msgstr "" +msgstr "Res&olve..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "" @@ -8201,25 +8322,25 @@ msgstr "Reiniciar &Tudo" msgid "Reset Type" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Reiniciar colunas" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Resolver" @@ -8227,126 +8348,122 @@ msgstr "Resolver" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Resolver conflito usando 'meu'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Resolver conflito usando 'deles'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Resolvido" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Resolvido:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Resolve os arquivos com conflito" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Restaurar" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Restaurar Valores por Omissão" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Restaurar após submeter" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Restaurar a janela para o seu tamanho normal" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Restaurado" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Tentar novamente" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Reverter" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Revertido" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Reverte todas as alterações que fez desde a última actualização" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Reverte uma adição ao controlo de versões" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revisão" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revisão %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revisão %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Gráfico de revisões" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8362,31 +8479,31 @@ msgstr "Filtro do Gráfico de Revisões" msgid "Revision graph" msgstr "Gráfico de revisões" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntexto com formatação de tipo de letra e parágrafo" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Vista Direita:" @@ -8394,21 +8511,21 @@ msgstr "Vista Direita:" msgid "Right image" msgstr "Imagem direita" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Linha %d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Linha %d-%d de %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Linha Seguinte" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Linha Anterior" @@ -8416,11 +8533,11 @@ msgstr "Linha Anterior" msgid "S&elect..." msgstr "S&eleccionar..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Mostrar Botões Numa Lin&ha" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Mostrar Botões em Duas Lin&has" @@ -8428,25 +8545,33 @@ msgstr "Mostrar Botões em Duas Lin&has" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Mostrar Barra de Ferramentas de Acesso Rápido sob o Friso" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "Es&tatísticas" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8456,7 +8581,7 @@ msgstr "" msgid "SMTP Server:" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8464,31 +8589,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8500,15 +8625,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8524,37 +8649,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Texto de amostra:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Guardar" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Guardar &como..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Guardar &como...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Guardar Como" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" -msgstr "" +msgstr "Guardar ficheiro abaixo como\nSerás questionado onde guardar o ficheiro abaixo" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" -msgstr "" +msgstr "Guardar Ficheiro" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" -msgstr "" +msgstr "Guardar Ficheiro\nSerás questionado para onde guardar o ficheiro da esquerda" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8562,13 +8691,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" -msgstr "" +msgstr "Guardar Ficheiro da Direita como\nSerás questionado onde guardar o ficheiro da direita" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8576,74 +8705,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" -msgstr "" +msgstr "Guardar tudo\nAmbos os ficheiros serão guardados" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Guardar e ignorar os blocos\nSó são guardadas as edições do seu manual, os blocos marcados são deixados como estão" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Guardar como" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Guardar como..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "" +msgstr "Guarda como\nSerás questionado onde guarda o ficheiro" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Guardar alterações em %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." -msgstr "" +msgstr "Guarda as modificações" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Guardar revisão &em..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8665,13 +8794,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "" +msgstr "Guardar\nGuarda o ficheiro com os marcadores de conflito." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8683,28 +8812,28 @@ msgstr "" msgid "Saved Data" msgstr "Dados Guardados" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Examinar" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Deslocar à Esquerda" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Deslocar à Direita" @@ -8712,32 +8841,32 @@ msgstr "Deslocar à Direita" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Procurar mensagens de ®isto..." #. Resource IDs: (1074) msgid "Search &up" -msgstr "" +msgstr "Pesquisar &cima" #. Resource IDs: (65535) msgid "Search for:" msgstr "Procurar:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Á procura de um caminho melhor para aplicar a correcção..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Busca falhou em %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Selecionar" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Seleccionar &Tudo" @@ -8753,59 +8882,59 @@ msgstr "Seleccionar menu de &atalho:" msgid "Select &window:" msgstr "Seleccionar &janela" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Selecciona Ferramenta de Cor\nSeleccionar Cor" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Seleccionar Arquivo..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Seleccionar cliente SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Seleccione um botão." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Seleccionar um objecto acerca do qual obter Ajuda" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Seleccionar lista de alterações" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Seleccionar aplicação de comparação" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Seleccionar a pasta a associar ao controlador de problemas" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Seleccionar pasta para a qual exportar.\nPode precisar de criar uma nova pasta antes de exportar." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Seleccionar pasta para execução do script" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Seleccionar pasta onde os arquivos seleccionados serão guardados" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Seleccionar arquivo do script de gancho" @@ -8813,20 +8942,20 @@ msgstr "Seleccionar arquivo do script de gancho" msgid "Select items automatically" msgstr "Seleccionar itens automaticamente" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Seleccionar aplicação de integração" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Seleccionar alvo da integração" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8836,27 +8965,31 @@ msgstr "Selecciona o documento inteiro\nSeleccionar Tudo" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Selecionar a língua utilizada por este projecto. Esta properiedade afecta overificador ortográfico utilizado para submeter mensagens." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Seleccionar o visualizador dos arquivos de comparação" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" -msgstr "" +msgstr "Seleccionar que ficheiro queres guardar como" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" -msgstr "" +msgstr "Seleccionar qual o ficheiro que desejas guardar como\nNota: Existem conflitos abertos!" #. Resource IDs: (1067) msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8864,7 +8997,7 @@ msgstr "" msgid "Send" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "" @@ -8872,11 +9005,11 @@ msgstr "" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "O Send Mail falhou o envio da mensagem." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "" @@ -8884,19 +9017,19 @@ msgstr "" msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "A enviar conteúdo" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "" @@ -8916,28 +9049,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Atribuição de propriedades..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Preferências" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8945,7 +9078,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "A Cache de Ícones de Shell foi reconstruída!" @@ -8957,7 +9090,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Formato conciso de &data/hora nas mensagens de registo" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Lista de propriedades encurtada" @@ -8969,7 +9102,7 @@ msgstr "Mostrar" msgid "Show &Accelerator for:" msgstr "Mostrar &Acelerador para:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8977,15 +9110,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Mostrar &alterações..." -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Mostrar ®isto" @@ -8993,15 +9126,19 @@ msgstr "Mostrar ®isto" msgid "Show &log..." msgstr "Mostrar ®isto..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Mostrar s&obreposições e menu de atalho apenas no explorador" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Mostrar Acima do Friso" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Mostrar Abaixo do Faixa" @@ -9009,35 +9146,35 @@ msgstr "Mostrar Abaixo do Faixa" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Mostrar Menos Botões" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Mostrar nós da revisão HEAD (mais recente)" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Mostrar Comparação em Linhas, palavra por palavra\nComparação em linhas, palavra por palavra" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Mostrar dif-em-linha\nEm-linha dif" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Mostrar Mais Botões" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Mostrar Barra de Ferramentas de Acesso Rápido Acima do Friso" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Mostrar Barra de Ferramentas de Acesso Rápido Abaixo do Friso" @@ -9045,11 +9182,11 @@ msgstr "Mostrar Barra de Ferramentas de Acesso Rápido Abaixo do Friso" msgid "Show Screen&Tips on toolbars" msgstr "Mostrar Dicas de &Ecrã nas barras de ferramentas" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Mostrar espaços em branco" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Mostrar uma panorâmica do gráfico completo" @@ -9057,7 +9194,7 @@ msgstr "Mostrar uma panorâmica do gráfico completo" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9065,11 +9202,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Mostrar alterações como uma comparação &unificada" @@ -9089,15 +9226,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9109,11 +9246,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "Mostrar pastas excluídas como normais" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Mostrar menus &completos após um curto atraso" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9129,7 +9270,7 @@ msgstr "Mostrar arquivos i&gnorados" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9137,90 +9278,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Mostrar número&s de linhas" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Mostrar o nó mais antigo no topo" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Mostrar ou ocultar a barra de comparações em linhas\nAlternar Barra de Comparações em Linha" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Mostrar ou ocultar a barra de localização\nAlternar Barra de Localização" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Mostrar ou ocultar a barra de estado\nAlternar Barra de Estado" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Mostrar ou ocultar a barra de ferramentas\nAlternar Barra de Ferramentas" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Mostrar propriedades da revisão" @@ -9228,7 +9369,7 @@ msgstr "Mostrar propriedades da revisão" msgid "Show shortcut &keys in ScreenTips" msgstr "Mostrar &teclas de atalho nas Dicas de Ecrã" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9238,7 +9379,7 @@ msgstr "Mostrar caracteres especiais para espaços em branco ou de novas linhas\ msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9250,45 +9391,43 @@ msgstr "Mostrar arquivos não &alterados" msgid "Show un&versioned files" msgstr "Mostrar arquivos sem co&ntrolo de versões" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Mostrar/Ocultar" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Mostra uma representação gráfica das cópias/etiquetas/ramos" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Mostra todos os arquivos alterados deste a última actualização, tanto localmente como no repositório" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Mostra o arquivo de registo de acções no editor de texto por omissão" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9300,7 +9439,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Estilo Silver" @@ -9308,20 +9447,20 @@ msgstr "Estilo Silver" msgid "Since" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Tamanho" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Saltar" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9329,23 +9468,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Omitido" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Arquivo em falta omitido" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Slide" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9353,13 +9492,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9373,7 +9512,7 @@ msgstr "Ordenar pelo número de submissões" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9383,57 +9522,61 @@ msgstr "Especifica quantos itens quer manter na caixa de diálogo das mensagens msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Dividir linhas" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Divide a janela activa em painéis\nDividir" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Gráfico de Barras Empilhadas" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Gráfico de Linhas Empilhadas" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Padrão" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Gancho de Início de Submissão" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Iniciar editor do registo" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9445,39 +9588,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Estático" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Estatísticas" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Estado" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configuração da Barra de Estado" @@ -9489,32 +9640,32 @@ msgstr "Estado e cores das acções" msgid "Status cache" msgstr "Cache de estado" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Cache de estado apenas para uma pasta, sem sobreposições recursivas" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." -msgstr "" +msgstr "Armazena o caminho do arquivo a ser usado por um diff em um posterior clique com o botão direito. Mantenha pressionada a tecla CTRL para remover o último caminho salvo." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9522,15 +9673,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Estilo" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "" @@ -9538,7 +9689,7 @@ msgstr "" msgid "Submodule" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9546,7 +9697,7 @@ msgstr "" msgid "Submodule Add" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9554,15 +9705,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9570,7 +9721,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9585,15 +9736,15 @@ msgstr "" msgid "Submodules" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" -msgstr "" +msgstr "Sucesso" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Trocar" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Trocar %s para %s, Revisão %s" @@ -9602,43 +9753,43 @@ msgstr "Trocar %s para %s, Revisão %s" msgid "Switch To" msgstr "" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Voltar ao painel de janela anterior\nPainel Anterior" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Comutar entre vista simples e com duplo painel" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Troca entre vista de painel simples e dupla\nTrocar entre vista de painel simples e dupla" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Trocar vista direita e esquerda" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Troca o conteúdo das vistas esquerda e direita\nTrocar vistas esquerda e direita" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Trocar para a próxima janela de documento" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Ir para o próximo painel\nPróximo Painel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Voltar à janela de documento anterior" @@ -9646,21 +9797,21 @@ msgstr "Voltar à janela de documento anterior" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Troca a comparação esquerda<->direita" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9670,23 +9821,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9696,13 +9847,13 @@ msgstr "As entradas no registo de sistema foram removidas e o arquivo INI (se ex msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9716,7 +9867,7 @@ msgstr "Marcador de Posição de Separador" msgid "Tab size:" msgstr "Tamanho do Tabulador:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "" @@ -9724,16 +9875,16 @@ msgstr "" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "" @@ -9741,11 +9892,11 @@ msgstr "" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Tarefas" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Painel de Tarefas" @@ -9757,11 +9908,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Testar Apenas" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9769,13 +9920,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9783,64 +9940,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "O tamanho do troço não corresponde ao número de linhas adicionadas/removidas!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "O mecanismo de comparação abortou devido a um erro:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "O arquivo %s não existe!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "O arquivo %s não foi encontrado no arquivo de correcção!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9849,15 +10020,15 @@ msgid "" "Do you want to remove the file?" msgstr "O arquivo \n%s\nestá vazio.\nDeseja removê-lo?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "O arquivo é demasiado grande" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "O arquivo demasiado grande para ser aberto." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9865,7 +10036,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "O arquivo\n%s\njá existe! Deseja escrever sobre ele?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9873,14 +10044,14 @@ msgid "" "is not a valid text file!" msgstr "O ficheiro\n%s\nnão é um ficheiro de texto válido!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "A pasta %s\ncontém arquivo(s) sem controlo de versões e/ou alterado(s). Quer removê-la de qualquer forma?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9889,78 +10060,78 @@ msgid "" "Would you like to create it first?" msgstr "A pasta\n%s\nnão existe.\nDeseja criá-la antes?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "O script de gancho devolveu um erro:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "A imagem não pode ser mostrada." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "O fornecedor do controlador de problemas não pôde ser criado. Por favor verifique se está instalado correctamente." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "O fornecedor do controlador de problemas não conseguiu validar a cadeia de caracteres parâmetro" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "A linha indicando o novo arquivo era esperada na linha %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "O número de linha deverá estar entre %d and %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "O número máximo de linhas de registo de acção a preservar.\nLinhas adicionadas para além deste limite levarão à remoção das linhas mais antigas do arquivo." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "A operação falhou." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Os parâmetros '/path' e '/pathfile' são mutuamente exclusivos.\nDeve especificar apenas um deles." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9970,7 +10141,7 @@ msgid "" "do not match!" msgstr "A correcção parece estar desactualizada! A linha de arquivo\n%s\ne a linha de correcção\n%s\nnão correspondem!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9981,7 +10152,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "O caminho/URL que introduziu parece ser ilegal no Windows!\nPode tentá-lo de qualquer forma, mas poderá haver um erro mais tarde.\n\nUm caminho válido no windows não pode conter '<<>|\"?*:' nem consistir num dos seguintes nomes de dispositivo:\ncom1 a com9, lpt1 a lpt9, prn, aux, con, nul, clock$\n\nDeseja continuar de qualquer forma?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9992,36 +10163,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "O caminho\n%s\nnão parece corresponder aos caminhos no arquivo de correção.\nPorém, o TortoiseGitMerge determinou que o caminho\n%s\nlhe corresponde melhor. Deseja usar o caminho sugerido?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "A expressão regular é inválida!\nPor favor digite uma expressão regular válida." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "O repositório foi criado com sucesso." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "O arquivo seleccionado parece ainda conter uma ou mais marcas de conflito.\nTem a certeza de que quer marcar o arquivo como tendo o conflito resolvido?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10029,7 +10207,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10038,7 +10216,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10047,26 +10225,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" -msgstr "" +msgstr "O texto é idêntico, mas os ficheiros não condizem!\nForam encontradas as seguintes diferenças:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "O tempo em segundos depois do qual a análise dos arquivos seleccionados pára.\r\nUm valor menor disponibilizará a lista de completação automática mais cedo,\r\nembora possivelmente sem que percorra todos os arquivos." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Os dois URL seleccionados não foram criados a partir da mesma raiz.\nNão é possível mostrar as mensagens de registo entre eles!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10076,34 +10254,34 @@ msgstr "" msgid "Their file:" msgstr "Arquivo deles:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Deles" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Existem actualmente %d handlers de sobreposição instalados, para além dos que o Tortoise usa." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" -msgstr "" +msgstr "Existem mais vistas editadas\nQual queres guardar?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Não há controladores de problemas disponíveis." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10112,85 +10290,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Ainda existem conflitos não resolvidos na linha %d!\nDeve resolver esses conflitos antes de guardar. \nDeseja guardar o arquivo mesmo com os conflitos?\nSe carregar em SIM, terá de resolver os conflitos manualmente noutro editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Existem alterações por guardar!\nDeseja guardar as suas alterações?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Sinónimos" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Estes documentos são mais recentes que os que estão abertos e contém modificações que foram feitas antes da aplicação fechar." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Este não é um URL válido.\nPor favor introduza aqui um URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Este não é um caminho válido!\nUm caminho válido não pode conter '<<>|\"?*:' ou um dos seguintes nomes de dispositivo:\ncom1 a com9, lpt1 a lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Este programa está ligado à exportação %s em falta no arquivo %s. Esta máquina pode ter uma versão incompatível do %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Este programa requer o arquivo %s, que não foi encontrado neste sistema." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Esta propriedade é permitida apenas em pastas, não em arquivos." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Irá ser removido o registo dos comandos que usou nesta aplicação e restaurará o conjunto padrão de comandos visíveis no menus e barras de ferramentas. Não desfará nenhuma personalização explícita. Tem a certeza de que o quer fazer?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10206,14 +10384,14 @@ msgstr "Telhar Hori&zontalmente" msgid "To" msgstr "" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10225,13 +10403,13 @@ msgstr "" msgid "To:" msgstr "Para:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Alterna entre visualizações de Uma/Duas Páginas\nAlternar entre visualizações de Uma/Duas Páginas" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10243,11 +10421,11 @@ msgstr "Barra de Ferramentas" msgid "Toolbar Name" msgstr "Nome da Barra de Ferramentas" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opções da Barra de Ferramentas" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Erro interno da barra de ferramentas. Por favor contacte o fornecedor da aplicação." @@ -10263,16 +10441,16 @@ msgstr "Ferramentas" msgid "Tools:" msgstr "Ferramentas:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10282,40 +10460,40 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" -msgstr "" +msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10331,7 +10509,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10339,7 +10517,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10353,36 +10531,36 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10421,11 +10599,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Transferindo a %s" @@ -10434,39 +10612,35 @@ msgstr "Transferindo a %s" msgid "Transparent &color..." msgstr "&Cor transparente..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" -msgstr "" +msgstr "aparar à direita" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Tente uma 'Limpeza'. Se não funcionar, precisará de fazer uma nova exportação." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Tentar novamente" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tipo" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10490,24 +10664,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Impossível carregar o suporte do sistema de correio electrónico." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Incapaz de processar comando, servidor ocupado." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Impossível ler de %1, está aberto por outra pessoa." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Impossível ler propriedade permitindo apenas a escrita." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10515,91 +10689,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Impossível escrever propriedade permitindo apenas a leitura." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Impossível escrever para %1: ou só permite a leitura, ou está aberto por outra pessoa." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Desmarcar" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "desfazer" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Desfazer %d Acções" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Desfazer 1 Acção" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." -msgstr "" +msgstr "Desfazer Adição..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Desfaz a última acção\nDesfazer" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Desfazer últimas modificações" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Formato de arquivo inesperado." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Desdobrar" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Texto sem Formatação\ntexto sem qualquer formatação" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Comparação unifica&da das revisões HEAD (mais recentes)" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Nível desconhecida" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" +msgstr "Conflitos não resolvidos!" + +#. Resource IDs: (1558) +msgid "Unset tracked branch" msgstr "" -#. Resource IDs: (3841) +#. Resource IDs: (61443) msgid "Untitled" msgstr "Sem Título" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Sem contolo de versão" @@ -10607,7 +10785,7 @@ msgstr "Sem contolo de versão" msgid "Unversioned files mark parent folder as modified" msgstr "Retirar o controlo de versão a arquivos leva a que as respectivas pastas pai sejam marcadas como modificadas" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Retirando o controle de versões de %s" @@ -10618,25 +10796,25 @@ msgstr "" #. Resource IDs: (1710) msgid "Update" -msgstr "" +msgstr "Actualizar" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Actualizado" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Actualizando os objectos ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10648,37 +10826,33 @@ msgstr "Usar Imagem Por &Omissão:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Usar por &omissão vista de um só painel para a comparação de dois arquivos" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Usar &outro bloco de texto" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Usar o 'meu' bloco de texto" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Usar o 'meu' bloco de texto e depois o 'deles'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Usar o bloco de texto 'deles'" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Usar o bloco de texto 'deles' e depois o 'meu'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Usar blocos" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" #. Resource IDs: (1066) msgid "Use Ribbons" -msgstr "" +msgstr "Usar Fitas" #. Resource IDs: (1500) msgid "Use Task Dialog" @@ -10692,15 +10866,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Usar a Comparação Unificada a partir da área de &transferência" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10710,7 +10884,7 @@ msgstr "Usa todo o conteúdo da vista esquerda\nUsar arquivo da esquerda" msgid "Use block from left before right" msgstr "Usar o bloco de texto da esquerda antes do da direita" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10720,25 +10894,25 @@ msgstr "Usa o bloco da vista esquerda antes do bloco da vista direita\nUsar bloc msgid "Use block from right before left" msgstr "Usar bloco de texto da direita antes do da esquerda" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Usa o bloco da vista direita antes do bloco da vista esquerda\nUsar bloco da direita antes do da esquerda" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Usar ambos os blocos de texto (mas este primeiro lugar)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Usar ambos os blocos de texto (mas este em último lugar)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Usar bloco esquerdo" @@ -10754,77 +10928,77 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Usar a reciclagem quando revertendo" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Usar expressão regular" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" -msgstr "" +msgstr "Usar bloco direito" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" -msgstr "" +msgstr "Usar espaços" #. Resource IDs: (1426) msgid "Use system locale for date/time" msgstr "Usar a configuração de região do sistema para a data/hora" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Usar bloco de texto de '&meu'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Usar bloco de texto de '&deles'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Usar bloco de texto de 'me&u' antes de 'deles'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Usa bloco de texto de 'meu' antes de 'deles'\nUsar bloco de texto 'meu' e depois 'deles'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Usa bloco de texto de 'meu'\nUsar bloco de texto de 'meu'" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Usar bloquear texto de 'd&eles' antes de 'meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Usa bloco de texto de 'deles' antes de 'meu'\nUsar bloco de texto de 'deles' antes de 'meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Usa bloco de texto de 'deles'\nUsar bloco de texto de 'deles'" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Usa bloco de texto da vista esquerda\nUsar bloco de texto da esquerda" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Usar &este bloco de texto" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10832,7 +11006,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10844,19 +11018,19 @@ msgstr "" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Usar &este arquivo como um todo" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" -msgstr "" +msgstr "Usar este bloco na esquerda" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Usar o &outro arquivo como um todo" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10872,11 +11046,11 @@ msgstr "" msgid "User Name:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Cancelado pelo utilizador" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10886,11 +11060,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nome de utilizador:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10907,9 +11081,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "Opções válidas de linha de comando são:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway\n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valor" @@ -10917,24 +11091,24 @@ msgstr "Valor" msgid "Version" msgstr "Versão" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10942,11 +11116,11 @@ msgstr "" msgid "Version Information" msgstr "Informação de Versão" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versão:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Com controlo de versão" @@ -10958,23 +11132,27 @@ msgstr "" msgid "View" msgstr "Vista" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Ver revisão do caminho no &webviewer" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "" @@ -10986,11 +11164,11 @@ msgstr "" msgid "Visit our website" msgstr "Visite o nosso sítio Web" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11001,7 +11179,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "AVISO:\r\nModifica estas preferências só se tiveres a certeza absoluta de que sabes o que estás a fazer!\r\nPara reverteres para os valores originais, apaga o texto do valor." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Espere" @@ -11009,7 +11187,7 @@ msgstr "Espere" msgid "Wait for the script to finish" msgstr "Espere que o script termine" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11017,15 +11195,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Aviso" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Aviso!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11033,7 +11211,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "" @@ -11041,56 +11219,56 @@ msgstr "" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Quando activado, os itens com controlo de versão listados na caixa de diálogo de submissão serão automaticamente seleccionados " -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11100,15 +11278,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" -msgstr "" +msgstr "Alterações de espeços em branco (tabs, espaços)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Espaços em branco" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Posição da Janela" @@ -11116,15 +11294,15 @@ msgstr "Posição da Janela" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11168,11 +11346,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11180,29 +11358,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Moldar linhas longas" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Ajustar linhas longas na ponta direita da vista\nAjustar linhas longas" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Sim" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Sim para todos" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Já possui a versão mais actual instalada." @@ -11212,119 +11386,119 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Podes desactivar manipuladores de Sobreposição específicos aqui.\nOs manipuladores desactivados não consomem um recurso de sobreposição e permitem a outras extensões de shell mostrar as suas sobreposições." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Pode colar mapas de bits apenas com o tamanho (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Não pode criar mais de %d barras de ferramenta definidas pelo utilizador!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Essa propriedade não pode ser aplicada a pastas, apenas a arquivos!\nSe deseja aplicá-la aos arquivos que pertencem a essa pasta, \ndeve activar a caixa de selecção 'recursivo'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" -msgstr "" +msgstr "Você marcou blocos modificados. Como eles devem ser salvos?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Modificou propriedades sem que as tenha guardado antes.\nDeseja guardá-las agora?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" "For every of these items a new instance of the diff viewer will be started.\n" "Do you really want to show the diff for so many items at once?" -msgstr "" +msgstr "Seleccionaste %d itens para mostrar diferenças.\nPara cada um desses itens é arrancada uma instância do visualizador de dif.\n Queres mesmo mostrar o dif. para tantos itens de uma só vez?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Não introduziu um número de problema!\nTem certeza de que quer submeter sem um número de problema?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Pode definir até %d ferramentas." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Deves introduzir uma mensagem de registo da submissão" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "O sistema tem de ser reiniciado para que as alterações tenham efeito." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Seleccionou um arquivo sem controlo de versão.\nO arquivo será adicionado ao controlo de versão aquando da submissão." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Deve introduzir algum texto!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Deve seleccionar uma imagem!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Alterou o conjunto de ícones de %s para %s.\nEssa alteração não terá efeito senão depois de reiniciar o seu computador ou depois de sair e voltar a entrar em sessão!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11334,7 +11508,7 @@ msgstr "As suas mensagens de registo anteriores foram guardadas.\nCarregue aqui msgid "Your version is:" msgstr "A sua versão é:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "A sua versão é: %d.%d.%d.%d" @@ -11344,10 +11518,10 @@ msgid "Zip File" msgstr "Ficheiro Zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Menos zoo&m" +msgid "Zoo&m out\t-" +msgstr "Menos zoo&m\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zoom" @@ -11359,80 +11533,80 @@ msgstr "Ma&is Zoom" msgid "Zoom &Out" msgstr "Men&os Zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zoom a 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Mais Zoom\nMais Zoom" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Menos Zoom\nMenos Zoom" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "M&ais zoom" +msgid "Zoom i&n\t+" +msgstr "M&ais zoom\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Mais zoom" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Menos zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zoom até ajustar" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zoom para ajustar a altura" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zoom até ajustar a largura" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Por omissão]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Não atribuído]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11446,7 +11620,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "adicionado" @@ -11454,7 +11628,7 @@ msgstr "adicionado" msgid "added files" msgstr "arquivos adicionados" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "um arquivo sem nome" @@ -11462,14 +11636,19 @@ msgstr "um arquivo sem nome" msgid "and support the developers" msgstr "e apoie os desenvolvedores" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11502,30 +11681,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "submissões" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "em conflito" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "copiado de\n%s - revisão %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dia" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "removido" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11537,7 +11716,7 @@ msgstr "boneco" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11546,16 +11725,16 @@ msgid "" "%s" msgstr "%s\nexportado para\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "externo" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorado" @@ -11563,23 +11742,23 @@ msgstr "ignorado" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incompleto" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "item mantido localmente" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "mantém as listas de ficheiros em Inglês" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11588,7 +11767,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11603,11 +11782,11 @@ msgstr "" msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "integrado" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "em falta" @@ -11615,7 +11794,7 @@ msgstr "em falta" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "alterado" @@ -11623,7 +11802,7 @@ msgstr "alterado" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mês" @@ -11631,40 +11810,44 @@ msgstr "mês" msgid "new branch" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "não" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "não existe descrição deste comando" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "sem controlo de versões" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "obstruído" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "em %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "píxeis" @@ -11672,11 +11855,11 @@ msgstr "píxeis" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestre" @@ -11684,35 +11867,35 @@ msgstr "trimestre" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "substituído" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "a explorar o caminho:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "trocado para\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "para %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "para %s" @@ -11721,35 +11904,35 @@ msgstr "para %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "semana" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "ano" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "sim" diff --git a/Languages/Tortoise_ro.po b/Languages/Tortoise_ro.po index c4bce4531..1e64340b7 100644 --- a/Languages/Tortoise_ro.po +++ b/Languages/Tortoise_ro.po @@ -4,23 +4,28 @@ # This file is distributed under the same license as TortoiseGit # # Translators: +# Catalin P. , 2014 # eugen.cocalea , 2013 # eugen.cocalea , 2013 +# eugen.cocalea , 2013 +# Ioan-Paul Pirau , 2013 # Lübbe TortoiseSVN , 2011 # Lübbe TortoiseSVN , 2011 # spencea , 2014 # radu.murzea , 2013 # radu.murzea , 2013 +# radu.murzea , 2013 # SoboLAN , 2014-2015 -# Sven Strickroth , 2013 +# spencea , 2014 +# Sven Strickroth , 2013,2015 # zveriu , 2011 # zveriu , 2011 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/tortoisegit/language/ro/)\n" "MIME-Version: 1.0\n" @@ -29,7 +34,7 @@ msgstr "" "Language: ro\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -51,138 +56,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autori afişaţi individual:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f Mebiocteti transferati" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 conţine un obiect neaşteptat." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 conţine o cale incorectă." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 conţine o schemă incorectă." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 are un format incorect." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 nu a fost găsit." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "cu %1!d! zi în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "cu %1!d! zile în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "cu %1!d! oră în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "cu %1!d! ore în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "cu %1!d! minut în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "cu %1!d! lună în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "cu %1!d! luni în urmă" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "cu %1!d! secundă în urmă" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "cu %1!d! secunde în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "cu %1!d! săptămână în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "cu %1!d! săptămâni în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "cu %1!d! an în urmă" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "cu %1!d! ani în urmă" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! articole selectate" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "cu %1!d! minute în urmă" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" -msgstr "%1!s!↩\nDimensiune %2!s!" +msgstr "%1!s!\r\nDimensiune %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nSă se continue rularea scriptului?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -190,137 +195,137 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nAcest fişier nu poate fi găsit.\nVerificaţi dacă numele fişierului şi calea sunt corect specificate." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig sau %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d octeţi transferaţi" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d Kebiocteti transferati" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d transmiteri inaintea \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d fişiere schimbate" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d fişiere şterse." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d fişiere inversate la %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d fişiere selectate, %d fişiere în total" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d autorii cei mai activi cu cel puţin %d transmiteri fiecare (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" "click to toggle alpha\n" "double click to automatically toggle alpha" -msgstr "%i%% alfa⏎ clic pentru a comuta alfa⏎ dublu clic pentru a comuta alfa automat" +msgstr "%i%% alfa\nclic pentru a comuta alfa\ndublu clic pentru a comuta alfa automat" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minut(e) şi %ld secundă(e)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld din %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - la revizia: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Recuperat]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s în %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s necesita Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, la %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Structură de lucru" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) al %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Export al %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." -msgstr "%s⏎ Nu s-a putut petici curat" +msgstr "%s\nNu s-a putut petici curat" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nChiar doriţi să-l eliminaţi?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" "is a directory, not a file!\n" "TortoiseGitMerge can't diff directories." -msgstr "%s⏎ este un dosar şi nu un fişier!⏎ TortoiseGitMerge nu poate compara directoare." +msgstr "%s\neste un dosar şi nu un fişier!\nTortoiseGitMerge nu poate compara directoare." #. Resource IDs: (16923) msgid "&..." @@ -330,6 +335,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "îmbinare în &3" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Despre TortoiseGitBlame..." @@ -358,15 +367,15 @@ msgstr "&Adauga filtru" msgid "&Add New/Save" msgstr "&Adauga nou/salvează" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Adaugă-l" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Adaugă sau elimină butoane" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Adaugă..." @@ -406,7 +415,7 @@ msgstr "Repartizează" msgid "&Associate double-click event with:" msgstr "&Asociază evenimentul dublu-clic cu:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Ascunde automat" @@ -422,15 +431,15 @@ msgstr "Incarcă &automat cheie Putty" msgid "&Backup original file" msgstr "Creează co&pie de siguranţă pentru fişierul original" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "În&vinovăţeşte" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "În&vinovăţeşte schimbările" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "În&vinovăţeşte reviziile" @@ -454,7 +463,7 @@ msgstr "&Ramură:" msgid "&Browse Dir" msgstr "&Răsfoieşte dosarul" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Răsfoieşte depozitul" @@ -490,7 +499,7 @@ msgstr "&Categorie:" msgid "&Choose commands from:" msgstr "Alege &comenzi din:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Curăţă..." @@ -514,7 +523,7 @@ msgstr "În&chide fereastră (ferestrele)" msgid "&Command:" msgstr "&Comandă:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Transmite" @@ -522,23 +531,27 @@ msgstr "&Transmite" msgid "&Commit submodule..." msgstr "Transmite submodul..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "Transmite fără" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Transmite..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Compară reviziile" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Grafic Comprimat" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Copiază" @@ -558,11 +571,11 @@ msgstr "&Personalizat" msgid "&Default" msgstr "&Implicit" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "Ş&terge" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "Ş&terge (păstrează local)" @@ -570,7 +583,7 @@ msgstr "Ş&terge (păstrează local)" msgid "&Delete Filter" msgstr "&Stergere Filtru" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "Şterge destinaţie && local" @@ -582,11 +595,11 @@ msgstr "&Identificare linii mutate sau copiate" msgid "&Detect moved or copied lines:" msgstr "&Identificare linii mutate sau copiate" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Diferenţiază" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Diferenţiază cu versiunea precedentă" @@ -598,7 +611,7 @@ msgstr "&Dosar:" msgid "&Disabled" msgstr "&Dezactivat" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "Renunţă" @@ -606,7 +619,7 @@ msgstr "Renunţă" msgid "&Do the same for the rest" msgstr "Fă același lucru pentru restul" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Ataşare" @@ -614,11 +627,15 @@ msgstr "&Ataşare" msgid "&Don't ask me again" msgstr "&Nu mă întreba din nou" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Jos" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Descarcă" @@ -626,11 +643,11 @@ msgstr "&Descarcă" msgid "&Edit" msgstr "&Editează" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Editează .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Editează TOT" @@ -638,7 +655,7 @@ msgstr "&Editează TOT" msgid "&Edit Filter" msgstr "&Editare Filtru" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Editează conflictele" @@ -663,10 +680,10 @@ msgid "&Enable edit" msgstr "Activează editarea" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "E&xportă selecţia în..." @@ -678,27 +695,27 @@ msgstr "&Extern" msgid "&File" msgstr "&Fişier" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Caută" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "Caută»Ctrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "Potriveşte imagini în &fereastră" +msgid "&Fit images in window\tF" +msgstr "Potriveşte imagini în &fereastră\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "Discuri &fixe" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flotant" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "Urmăreşte redenumirile" @@ -710,7 +727,7 @@ msgstr "&Font pentru mesajele din jurnal:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Forţează" @@ -730,7 +747,7 @@ msgstr "Transmitere în stil &Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "Mergi la»Ctrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "&Gri cai schimbate irelevante" @@ -742,7 +759,7 @@ msgstr "&Verde" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Ajutor" @@ -750,7 +767,7 @@ msgstr "&Ajutor" msgid "&Help Topics" msgstr "Subiecte &ajutor" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Ascunde" @@ -758,11 +775,11 @@ msgstr "&Ascunde" msgid "&Icon Set:" msgstr "Set de &iconiţe:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignoră" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignoră %d elemente după nume" @@ -776,14 +793,14 @@ msgid "&Image" msgstr "&Imagine" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Informaţii &imagine" +msgid "&Image info\tI" +msgstr "Informaţii &imagine\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "Numai &imagine" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importă..." @@ -795,7 +812,7 @@ msgstr "Dosar &iniţial:" msgid "&Initialize submodules (--init)" msgstr "Iniţializează submodule (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Instalează" @@ -807,11 +824,11 @@ msgstr "&Sari la prima diferenţă la încărcare" msgid "&Keep CR" msgstr "&Pastrează CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "Păstrează starea curentă" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Etichete" @@ -839,7 +856,7 @@ msgstr "&Limitare:" msgid "&Line number" msgstr "Numărul liniei" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Numărul liniei (%d - %d)" @@ -856,7 +873,7 @@ msgstr "Vedere cu &listă" msgid "&Local Branch:" msgstr "Ramură &locală:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Ramuri locale" @@ -880,11 +897,11 @@ msgstr "Animaţii de &meniu:" msgid "&Menu contents:" msgstr "Conţinutul &meniului:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "Î&mbină" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "Î&mbină..." @@ -934,12 +951,16 @@ msgstr "&Nou..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "Î&nainte >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "Pagina &următoare" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Nici un eveniment de dublu-clic" @@ -956,11 +977,11 @@ msgstr "&Nimic" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&O pagină" @@ -968,19 +989,15 @@ msgstr "&O pagină" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Deschide" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Deschide pagina web Git pentru Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "Deschide...»Ctrl+O" @@ -993,18 +1010,18 @@ msgid "&Overlay Icon:" msgstr "&Iconita de suprapunere" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Imagini de suprapunere" +msgid "&Overlay images\tO" +msgstr "Imagini de suprapunere\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Parola:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Inserează" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "Alege TOT" @@ -1012,7 +1029,7 @@ msgstr "Alege TOT" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Previzualizare de tipărire" @@ -1020,11 +1037,15 @@ msgstr "&Previzualizare de tipărire" msgid "&Print..." msgstr "&Tipăreşte..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Tipăreşte...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "Continuă" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "Trage" @@ -1032,10 +1053,14 @@ msgstr "Trage" msgid "&Push all branches" msgstr "Îm&pinge toate ramurile" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&ReTransmite" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "Mesaje &recente" @@ -1048,7 +1073,7 @@ msgstr "Recursiv" msgid "&Red:" msgstr "&Roşu:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Refă" @@ -1064,7 +1089,7 @@ msgstr "&Reîmprospătează" msgid "&Regular Expression" msgstr "&Expresie regulata" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1072,7 +1097,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "&Ramură destinaţie:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1080,7 +1105,7 @@ msgstr "" msgid "&Remote:" msgstr "&Destinaţie:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Elimină" @@ -1092,7 +1117,7 @@ msgstr "Șterge acest fișier din index" msgid "&Replace" msgstr "&Inlocuire" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Navigator de &depozit" @@ -1100,7 +1125,7 @@ msgstr "Navigator de &depozit" msgid "&Reset" msgstr "&Restabileşte" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Restabileşte bara de unelte" @@ -1116,23 +1141,27 @@ msgstr "&Restabileşte datele mele de utilizare" msgid "&Reset to Default" msgstr "&Restabileşte implicitul" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Rezolvat" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Restaurează" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Restaurează stare veche" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Revenire asupra schimbării făcute de această transmitere" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Revenire asupra schimbărilor făcute de aceste transmiteri" @@ -1144,7 +1173,7 @@ msgstr "Client &SSH:" msgid "&Saturation:" msgstr "&Saturație:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Salvează" @@ -1152,15 +1181,19 @@ msgstr "&Salvează" msgid "&Save authentication" msgstr "&Salvează autentificare" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Salvează graficul ca..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Salvează lista de fişiere selectate în..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Salvează\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Stabilire cale catre Git" @@ -1168,7 +1201,7 @@ msgstr "&Stabilire cale catre Git" msgid "&Set upstream/track remote branch" msgstr "Configurează sursă/urmăreşte ramură destinaţie" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Preferinţe" @@ -1188,7 +1221,7 @@ msgstr "&Afişează etichete text" msgid "&Signing key ID:" msgstr "ID cheie de &semnătură:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "Omite" @@ -1196,7 +1229,7 @@ msgstr "Omite" msgid "&Squash" msgstr "&Buluceşte" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Buluceşte TOT" @@ -1208,7 +1241,7 @@ msgstr "&Porneşte" msgid "&Start Group" msgstr "Grup de &pornire" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "Tăinuieşte" @@ -1228,7 +1261,7 @@ msgstr "Vedere cu &simboluri" msgid "&Tab size:" msgstr "Dimensiune &Tab:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "Document cu &taburi" @@ -1236,7 +1269,7 @@ msgstr "Document cu &taburi" msgid "&Tag" msgstr "E&tichetă" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Etichete" @@ -1272,7 +1305,7 @@ msgstr "Bare de unelte şi ferestre ataşate" msgid "&Toolbars:" msgstr "&Bare de unelte:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1284,7 +1317,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Două Pagini" @@ -1292,15 +1329,15 @@ msgstr "&Două Pagini" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "An&ulează" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Diferenţiere &unificată" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "Diferenţiere &unificată cu" @@ -1312,7 +1349,7 @@ msgstr "Discuri nec&unoscute" msgid "&Up" msgstr "S&us" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "Act&ualizează element la revizie" @@ -1324,11 +1361,11 @@ msgstr "&" msgid "&Use auto-completion of file paths and keywords" msgstr "&Utilizează completarea automată a căilor de fişiere şi a cuvintelor cheie" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Nume utilizator:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Vedere" @@ -1336,7 +1373,7 @@ msgstr "&Vedere" msgid "&View:" msgstr "&Vedere:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "Avertizează când lipseşte \"Semnat-de\" la transmitere" @@ -1352,6 +1389,10 @@ msgstr "&Cuvânt întreg" msgid "&Within file" msgstr "&Interiorul fisierului" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&ignoră schimbarile de spaţiu" @@ -1360,46 +1401,46 @@ msgstr "&ignoră schimbarile de spaţiu" msgid "&known changes" msgstr "&modificari cunoscute" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(prestabilit TortoiseGit)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(din %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(nici o listă de schimbări)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(fără număr de linie)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(nicio valoare)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nu a fost găsit)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(necunoscut)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "-toate-" @@ -1407,13 +1448,14 @@ msgstr "-toate-" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1421,7 +1463,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config in radacina depozitului" @@ -1437,7 +1479,7 @@ msgstr "fişier .gitignore în dosarele care conţin elementele" msgid ".gitignore in the repository root" msgstr "fişier .gitignore în rădăcina depozitului" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig in radacina depozitului" @@ -1453,99 +1495,99 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" "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 "TortoiseGit este o extensie a shell-ului.⏎ Acest lucru înseamnă că este integrat in Windows Explorer.⏎ Pentru a folosi TortoiseGit deschideţi explorer-ul şi executaţi clic-dreapta pe directorul dorit ⏎ pentru a accesa meniul contextual unde veţi găsi toate comenzile TortoiseGit.⏎ Şi citiţi manualul de utilizare!" +msgstr "TortoiseGit este o extensie a shell-ului.\nAcest lucru înseamnă că este integrat in Windows Explorer.\nPentru a folosi TortoiseGit deschideţi explorer-ul şi executaţi clic-dreapta pe directorul dorit\npentru a accesa meniul contextual unde veţi găsi toate comenzile TortoiseGit.\nŞi citiţi manualul de utilizare!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Avertisment: Nu s-a verificat dacă aceste ramuri au fost îmbinate în HEAD." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Avertisment: Această acţiune va şterge ramurile de la destinaţie." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Avertisment: Această ramură nu a fost îmbinată complet cu HEAD." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Chiar vreţi să ştergeţi TOATĂ tainiţa?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Nu s-a reuşit aplicarea tainei!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Nu s-a reuşit scoaterea tainei!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Nu s-a reuşit tăinuirea!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" -msgstr "dosarul reamplasare-aplică de la reamplasarea anterioară încă există dar s-a furnizat mbox⏎ ⏎ Doriţi să" +msgstr "dosarul reamplasare-aplică de la reamplasarea anterioară încă există dar s-a furnizat mbox\n\nDoriţi să" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Nu s-a reuşit aplicarea tainei, există conflicte" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Nu s-a reuşit scoaterea tainei, există conflicte" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Taina s-a aplicat cu succes" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Scoaterea tainei s-a realizat cu succes" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Tăinuire reuşită" @@ -1553,7 +1595,7 @@ msgstr "Tăinuire reuşită" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1565,71 +1607,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." -msgstr "Există deja o ramură cu acelaşi nume cu al etichetei introduse (aşa că referinţa prescurtată este ambiguă).⏎ Acest lucru poate cauza probleme aşa că ar trebui să îl evitaţi." +msgstr "Există deja o ramură cu acelaşi nume cu al etichetei introduse (aşa că referinţa prescurtată este ambiguă).\nAcest lucru poate cauza probleme aşa că ar trebui să îl evitaţi." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Există deja o ramură cu acest nume." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Este disponibilă o versiune mai nouă. Descărcaţi vă rog versiunea curentă!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "O listă de căi, separate de un caracter care semnifică linie nouă, pentru care sunt afişate suprapuneri de iconiţe.\nDacă adăugaţi un '*' la sfârşitul unei căi, toate fişierele şi sub-dosarele din acea cale sunt incluse de asemenea." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "O listă de căi, separate de un caracter care semnifică linie nouă, pentru care este afişat meniul contextual.\nDacă adăugaţi un '*' la sfârşitul unei căi, toate fişierele şi sub-dosarele din acea cale sunt excluse de asemenea.\nO listă goală va permite meniul contextual pentru toate căile." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "O listă de căi, separate de un caracter care semnifică linie nouă, pentru care nu sunt afişate suprapuneri de iconiţe.\nDacă adăugaţi un '*' la sfârşitul unei căi, toate fişierele şi sub-dosarele din acea cale sunt excluse de asemenea. O listă goală va permite suprapuneri de iconiţe pentru toate căile." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "O resursă necesară nu a fost disponibilă." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." -msgstr "Există deja o etichetă cu acelaşi nume cu cel al ramurii introduse (aşa că referinţa prescurtată este ambiguă).⏎ Acest lucru poate cauza probleme aşa că ar trebui să îl evitaţi." +msgstr "Există deja o etichetă cu acelaşi nume cu cel al ramurii introduse (aşa că referinţa prescurtată este ambiguă).\nAcest lucru poate cauza probleme aşa că ar trebui să îl evitaţi." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Există deja o etichetă cu acest nume." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Un program de vizualizare pentru fişiere de diferenţiere GNU (fişiere petice).\r\nDacă nu aveţi un astfel de program, puteţi folosi NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "Întrerupe" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&Despre" @@ -1645,11 +1687,11 @@ msgstr "Redenumiri prescurtate" msgid "Abbreviated size" msgstr "Dimensiune prescurtata" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Întrerupe" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Intrerupe & fuzionare" @@ -1657,11 +1699,11 @@ msgstr "Intrerupe & fuzionare" msgid "Abort Merge" msgstr "Renunta la fuzionare" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Renunta la o activa fuzionare" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Despre" @@ -1681,12 +1723,12 @@ msgstr "Despre TortoiseGitMerge" msgid "Accept certificate" msgstr "Accepta certificat" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Accesul la %1 a fost refuzat." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Acţiune" @@ -1694,26 +1736,26 @@ msgstr "Acţiune" msgid "Action log" msgstr "Jurnal de acţiuni" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Acţiuni" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Activează lista de sarcini" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Fişiere active" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Obiectele ActiveX nu pot fi salvate în timp ce Windows se închide!\nVreţi să anulaţi toate schimbările din %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Adaugă" @@ -1721,7 +1763,7 @@ msgstr "Adaugă" msgid "Add &Signed-off-by" msgstr "Adaugă &Semnat-de" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Adaugă '%s' în dicţionar" @@ -1734,15 +1776,15 @@ msgstr "Adaugă destinaţie" msgid "Add \"&Signed-off-by\"" msgstr "Adaugă \"&Semnat-de\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Adaugă program de diferenţiere specific unei extensii" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Adaugă program de îmbinare specific unei extensii" @@ -1750,15 +1792,15 @@ msgstr "Adaugă program de îmbinare specific unei extensii" msgid "Add new files automatically to Git" msgstr "Adaugă automat fişierele noi la Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Adaugă la lista de &ignorări" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Adaugă la bara de unelte pentru acces rapid" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Adaugă..." @@ -1766,11 +1808,11 @@ msgstr "Adaugă..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Adaugă/Editează program de diferenţiere/îmbinare specific unei extensii" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Adăugat" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1778,25 +1820,25 @@ msgid "" "to the ignore list." msgstr "Modelul (sau modelele) de fişier\n%s\na(u) fost adăugat(e) la lista de ignorări." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Se adaugă" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Adaugă fişier(e) sub control git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Adaugă fişierul/fişierele sau mască de fişier la lista de ignorări" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ajustează preferinţele\nPreferinţe" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avansat" @@ -1804,43 +1846,43 @@ msgstr "Avansat" msgid "Advanced Diff/Merge Settings" msgstr "Preferinţe avansate de diferenţiere/îmbinare" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Preferinţe avansate de diferenţiere" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Preferinţe avansate de îmbinare" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Toate" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Toate comenzile" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Toate fişierele (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Toate fişierele (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Toti părinţii" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Toate ramurile locale" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Toate referintece" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Toate etichetele" @@ -1848,47 +1890,47 @@ msgstr "Toate etichetele" msgid "All tags only" msgstr "Doar toate etichetele" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Toate schimbările vor fi pierdute! Sigur doriţi să restabiliţi toate barele de unelte şi meniurile?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Toate schimbările vor fi pierdute! Sigur doriţi să restabiliţi desemnările de tastatură?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Toate schimbările vor fi pierdute! Sigur doriţi să restabiliţi meniul '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Toate schimbările vor fi pierdute! Sigur doriţi să restabiliţi bara de unelte '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Permite editarea pentru această vizualizare\nPermite editarea" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Permite folosirea URL Gravatar personalizat" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Deja la zi." @@ -1904,11 +1946,11 @@ msgstr "Împinge intotdeauna spre ramura destinaţie selectată pentru această msgid "Always show long format" msgstr "Afiseaza intotdeauna formatul lung" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Foloseşte întotdeauna configurarea de localizare a sistemului pentru afişarea orelor şi datelor" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Îmbunătăţeşte" @@ -1916,12 +1958,12 @@ msgstr "Îmbunătăţeşte" msgid "Amend &Last Commit" msgstr "Îmbunătăţeşte ultima transmitere" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Un editor alternativ. Care ar fi de preferat să suporte terminaţii de linie în stil *nix" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1930,9 +1972,9 @@ msgid "" "You can specify the following parameters to the path:\r\n" "%base: the base file\r\n" "%mine: the modified file" -msgstr "Un program extern folosit»⏎ la compararea diferitelor revizii ale fişierelor»⏎ »⏎ Puteţi specifica următorii parametri:»⏎ %base: fişierul de bază»⏎ %mine: fişierul modificat" +msgstr "Un program extern folosit\r\nla compararea diferitelor revizii ale fişierelor\r\nPuteţi specifica următorii parametri:\r\n%base: fişierul de bază\r\n%mine: fişierul modificat" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1943,36 +1985,36 @@ msgid "" "%theirs: the file as it is in the repository\r\n" "%mine: your own file, with your changes\r\n" "%base: the original file without your changes" -msgstr "Un program de îmbinare extern folosit»⏎ la rezolvarea conflictelor între fişiere»⏎ »⏎ Puteţi specifica următorii parametri:»⏎ %merged: fişierul conflictual, unde va fi salvat»⏎ %theirs: fişierul aşa cum este în depozit»⏎ %mine: fişierul dumneavoastră, având schimbarile dumneavoastră»⏎ %base: fişierul original fără schimbările dumneavoastră" +msgstr "Un program de îmbinare extern folosit\r\nla rezolvarea conflictelor între fişiere»\r\n\r\nPuteţi specifica următorii parametri:\r\n%merged: fişierul conflictual, unde va fi salvat\r\n%theirs: fişierul aşa cum este în depozit\r\n%mine: fişierul dumneavoastră, având schimbarile dumneavoastră\r\n%base: fişierul original fără schimbările dumneavoastră" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Un identificator invalid de fişier a fost asociat cu %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "A avut loc o eroare necunoscută." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "A avut loc o eroare necunoscută în timpul accesării %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Un tip de linie necunoscut s-a găsit în linia %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Etichete adnotate" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Adaugă blocul din dreapta la sfârșit" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Adaugă acest bloc la stânga" @@ -1984,11 +2026,11 @@ msgstr "Meniuri de rama de aplicaţie:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Aplică serie de petice..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Aplică petic..." @@ -1996,7 +2038,7 @@ msgstr "Aplică petic..." msgid "Apply Patches" msgstr "Aplică petice" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Aplică o serie de petice dintr-o cutie poştală" @@ -2004,7 +2046,7 @@ msgstr "Aplică o serie de petice dintr-o cutie poştală" msgid "Apply unified diff" msgstr "Aplică diferenţiere unificată" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Stil Aqua" @@ -2012,39 +2054,39 @@ msgstr "Stil Aqua" msgid "Arabic" msgstr "Arabic" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL arbitrar:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Sunteti sigur ca doriti resetarea coloanelor?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Sunteţi sigur că doriţi întreruperea procesului de reamplasare?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Sigur vreţi să marcaţi fişierul (fişierele) conflictuale ca fiind rezolvate?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Sunteţi sigur că doriţi să inversaţi %d element(e)? Veţi pierde toate modificările făcute după ultima actualizare!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Sunteti sigur ca doriti sa salvati in \"%s\" ?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Aranjează &vertical" +msgid "Arrange &vertical\tV" +msgstr "Aranjează &vertical\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Delegat la lista de schimbări '%s'" @@ -2053,11 +2095,11 @@ msgstr "Delegat la lista de schimbări '%s'" msgid "Assigned to:" msgstr "Delegat la:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Presupus ca nemodificat" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Presupus ca valid/nemodificat" @@ -2069,34 +2111,34 @@ msgstr "Presupune valid/neschimbat (\"Necesită blocare\" în TortoiseSVN)" msgid "At file &creation" msgstr "La &crearea fisierului" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "La crearea fisierului" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "La revizia: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "Momentan puteţi redenumi doar ramurile." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "S-a încercat o operaţie neaşteptată." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "S-a încercat accesarea %1 dincolo de limitele sale." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "S-a încercat citirea de la scrierea %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "S-a încercat scrierea de la citirea %1." @@ -2113,11 +2155,11 @@ msgstr "Autentificare" msgid "Authentication data" msgstr "Date de autentificare" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Email autor" @@ -2125,7 +2167,7 @@ msgstr "Email autor" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autori" @@ -2137,7 +2179,7 @@ msgstr "Autori cu majuscule semnificative" msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" -msgstr "Authori:»Frank Li (lznuaa@gmail.com),⏎ »»Sven Strickroth (email@cs-ware.de)" +msgstr "Authori:\tFrank Li (lznuaa@gmail.com),\n\t\tSven Strickroth (email@cs-ware.de)" #. Resource IDs: (65535) msgid "Auto CrLf convert" @@ -2145,37 +2187,37 @@ msgstr "Conversie CrLf automată" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "Crlf automat:" +msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Ascunde automat" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Ascunde totul automat" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "&Crlf automat" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Închide automat dacă nu există conflicte" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Închide automat dacă nu există eroare" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Inchidere automata daca nu mai exista alte optiuni disponibile" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Închide automat dacă nu există îmbinări, adăugări, sau ştergeri" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2189,7 +2231,7 @@ msgstr "Incarcă &automat cheie Putty" msgid "Autoload Putty &Key" msgstr "Incarcă &automat cheie Putty" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automat" @@ -2209,7 +2251,7 @@ msgstr "Medie" msgid "B&rowse..." msgstr "&Răsfoieşte..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Înapoi" @@ -2221,7 +2263,7 @@ msgstr "Fundal" msgid "Baltic" msgstr "Baltic" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Grafic cu bare" @@ -2241,7 +2283,7 @@ msgstr "Fişier de bază:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Bazat pe TortoiseIDiff din TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Informaţii de bază" @@ -2253,45 +2295,45 @@ msgstr "Intre fisierele:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditional)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Înjumătăţeşte incorect" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Înjumătăţeşte corect" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Restabileşte înjumătăţirea" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Porneşte înjumătăţirea" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\nun bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Stil Negru" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Învinovăţire" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Eroare de învinovăţire" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "În&vinovăţeşte revizia precedentă" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Învinovăţeşte câte un autor la fiecare linie a fişierului" @@ -2299,26 +2341,30 @@ msgstr "Învinovăţeşte câte un autor la fiecare linie a fişierului" msgid "Blend alpha" msgstr "Amestecă alfa" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Stil Albastru" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Conţinut" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Atât /logmsg cât şi /logmsgfile au fost specificate!\nNumai una dintre acestea poate fi specificată." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Calea spre fişierul petic şi calea ţintă trebuie să fie ambele căi absolute!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Vedere de jos" @@ -2330,30 +2376,30 @@ msgstr "Răsf&oieşte..." msgid "Branc&h:" msgstr "Ramură:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ramură" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" -msgstr "Ramura %s este în urma %s»⏎ %s va avansa la %s" +msgstr "Ramura %s este în urma %s\r\n%s va avansa la %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Ramura (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Numele de ramura" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Numele de ramură/etichetă este invalid" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Numele de ramură/etichetă nu poate fi nul sau este invalid." @@ -2365,11 +2411,11 @@ msgstr "Ramură:" msgid "Bro&wse" msgstr "Răs&foieşte" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Rasfoieste referintele" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Răsfoieşte pentru un program extern de diferenţiere" @@ -2381,7 +2427,7 @@ msgstr "Răsfoieşte referinţele" msgid "Browse..." msgstr "Răsfoieşte..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug ID" @@ -2393,7 +2439,7 @@ msgstr "Bug ID e&xpresie:" msgid "Bug-ID/Issue-Nr:" msgstr "ID defect/Nr problema:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug ID-uri" @@ -2409,7 +2455,7 @@ msgstr "Bugtraq Regex Tester - TortoiseGit" msgid "Button Appearance" msgstr "Aspect de buton" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2425,7 +2471,7 @@ msgstr "&Verifică acum" msgid "C&ommands:" msgstr "&Comenzi:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "C&rează ramură/etichetă din revizie" @@ -2433,11 +2479,11 @@ msgstr "C&rează ramură/etichetă din revizie" msgid "C&urrent Keys:" msgstr "Taste act&uale:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Tăie" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2453,93 +2499,93 @@ msgstr "Calculează" msgid "Can double-click in log list to compare with previous revision" msgstr "Se poate face dublu-clic în lista de jurnale pentru a compara cu revizii precedente" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Nu se poate activa un obiect static ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" "%s\n" "to\n" "%s" -msgstr "Nu se poate copia ⏎ %s ⏎ în ⏎ %s" +msgstr "Nu se poate copia\n%s\nîn\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Nu se poate copia imaginea bitmap în clipboard!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Imaginea nouă nu a putut fi creată!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Meniuri nu pot fi personalizate!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Nu se poate copia imaginea bitmap din clipboard!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Renunţă" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Renunta\nNu parasi TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Renunta\nNu comuta intre vederi" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Renunta\nPastreaza fisierul gol." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Renunta\nRezolva intai conflictul" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Renunta\nRamai cu fisierele curente" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Renunta\nRamai cu setarile curente" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." -msgstr "Momentan nu se pot combina transmiterile.»⏎ Asiguraţi-vă că afişaţi jurnalul ramurii curente şi nu există filtre aplicate." +msgstr "Momentan nu se pot combina transmiterile.\r\nAsiguraţi-vă că afişaţi jurnalul ramurii curente şi nu există filtre aplicate." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Nu se poate forta actualizarea ramurii curente. Folositi comanda de restabilire daca doriti asta" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Nu se poate afişa învinovăţirea. \"%s\" nu este sub controlul versiunii de către git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Nu se poate afişa diferenţierea deoarece caracterele de linie nouă sunt neconsecvente." @@ -2551,7 +2597,7 @@ msgstr "Aranjează în casca&dă" msgid "Cascaded context menu" msgstr "Meniu contextual în cascadă" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Majuscule semnificative" @@ -2575,33 +2621,33 @@ msgstr "Verificarea certificatului a esuat" msgid "Change log" msgstr "Modifică jurnalul" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" -msgstr "Schimbă imprimanta şi opţiunile de imprimare⏎ Setări de imprimare" +msgstr "Schimbă imprimanta şi opţiunile de imprimare\nSetări de imprimare" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" -msgstr "Schimbă opţiunile de imprimare⏎ Setare pagină" +msgstr "Schimbă opţiunile de imprimare\nSetare pagină" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" -msgstr "Schimbă stilul aplicaţiei⏎ Schimbă stil" +msgstr "Schimbă stilul aplicaţiei\nSchimbă stil" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Schimbă poziţia ferestrei" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Schimbă dimensiunea ferestrei" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Modifica tipul" @@ -2609,38 +2655,38 @@ msgstr "Modifica tipul" msgid "Changed Files" msgstr "Fişiere modificate" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Fisiere modificate intre %s si %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Fişiere modificate între %s, %s şi %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Fişiere modificate: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Linii schimbate incluzând fişiere adăugate/şterse" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Linii schimbate incluzând fişiere adăugate/şterse pe date" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Linii schimbate neincluzând fişiere adăugate/şterse" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Linii schimbate neincluzând fişiere adăugate/şterse pe date" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Lista de schimbări %s s-a mutat" @@ -2649,7 +2695,7 @@ msgstr "Lista de schimbări %s s-a mutat" msgid "Changes made (double-click on file for diff):" msgstr "Schimbări efectuate (daţi dublu-clic pe fişier pentru a vedea diferenţele):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Schimbă stilul aplicației" @@ -2657,7 +2703,7 @@ msgstr "Schimbă stilul aplicației" msgid "Char position where to show a border line in commit text boxes:" msgstr "Pozitia caracterului unde sa fie aratata o linie de delimitare in campurile text pentru transmitere" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Verifică" @@ -2669,31 +2715,31 @@ msgstr "Caută actualizări - TortoiseGit" msgid "Check For Updates..." msgstr "Caută actualizările..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Caută &modificările" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Verificaţi calea şi/sau URL-ul introdus." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Selectati opţiunile care doriţi să apară în meniul contextual principal în loc de submeniul TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Selectati opţiunile care doriţi să apară doar în meniul contextual extins (SHIFT + clic stânga)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Bifaţi pentru a folosi timpi relativi în mesajele de jurnal" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Bifaţi pentru a folosi un format mai puţin detaliat pentru data şi ora mesajelor din jurnal" @@ -2701,31 +2747,31 @@ msgstr "Bifaţi pentru a folosi un format mai puţin detaliat pentru data şi or msgid "Check:" msgstr "Bifează:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Adu" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Selectează" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Selectare eşuată" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Selectează din transmiteri..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Selectează această transmitere..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Selectare esuata! Se sare peste aceasta transmitere?" @@ -2733,11 +2779,11 @@ msgstr "Selectare esuata! Se sare peste aceasta transmitere?" msgid "Chinese" msgstr "Chineză" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Selectează depozit" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Invers cronologic (prestabilit git)" @@ -2749,78 +2795,78 @@ msgstr "Curat" msgid "Clean Type" msgstr "Tip curăţare" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Curatare permanenta" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Curatare la cosul de gunoi" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Curatare ramuri distante vechi" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Se curăţă" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Se curăţă." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Curăţarea nu a putut procesa următoarele căi:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Curăţarea a procesat următoarele căi:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Goleşte" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Unealta golire\nGoleşte" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Curăţă %ld URL-uri salvate pentru %ld structuri de lucru" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Curăţă %ld mesaje jurnal salvate pentru %ld structuri de lucru" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Şterge %ld perechi utilizator/parolă, %ld certificate ssl şi %ld nume de utilizatori" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Elimină jurnale salvate în cache din %ld depozite" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Şterge autentificarea salvată.\r\nVa trebui să vă înregistraţi numele utilizator şi parola din nou pentru toate depozitele." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Şterge dimensiunile şi poziţiile salvate pentru %ld dialoguri" @@ -2829,7 +2875,7 @@ msgstr "Şterge dimensiunile şi poziţiile salvate pentru %ld dialoguri" msgid "Click here to go to the website" msgstr "Clic aici pentru a naviga la website" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Clic aici pentru a selecta un mesaj recent" @@ -2845,17 +2891,17 @@ msgid "" "extension" msgstr "Clic pe \"Avansat\" pentru a specifica programe alternative de îmbinare în funcţie de extensie" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" -msgstr "Apăsaţi pentru a vedea comenzi pentru mutarea blocurilor de text⏎ Foloseşte blocuri de text " +msgstr "Apăsaţi pentru a vedea comenzi pentru mutarea blocurilor de text\nFoloseşte blocuri de text " -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Clipboard" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Clonează..." @@ -2863,7 +2909,7 @@ msgstr "Clonează..." msgid "Clone Existing Repository" msgstr "Clonează repository existent" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Clonează un depozit" @@ -2871,49 +2917,49 @@ msgstr "Clonează un depozit" msgid "Clone into Bare Repo" msgstr "Clonează într-un depozit simplu" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Clonează..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Închide" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Închide ecranul întreg" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Închide preafişarea de tipărire\nÎ&nchide" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Închide manual" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" -msgstr "Închide modul de previzualizare a imprimării⏎ Anulează previzualizarea" +msgstr "Închide modul de previzualizare a imprimării\nAnulează previzualizarea" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" -msgstr "Închide documentul activ⏎ Închide" +msgstr "Închide documentul activ\nÎnchide" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Închide fereastră actuală şi solicită salvarea documentelor" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Colaps" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2939,7 +2985,7 @@ msgstr "Culori:" msgid "Combine One Mail" msgstr "Combină un singur email" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Combină într-o singură transmitere" @@ -2947,11 +2993,11 @@ msgstr "Combină într-o singură transmitere" msgid "Comman&ds:" msgstr "&Comenzi:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Comandă" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Linia de comandă" @@ -2959,7 +3005,7 @@ msgstr "Linia de comandă" msgid "Command Line To Execute:" msgstr "Linia de comandă pentru executare:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Comanda a eşuat." @@ -2967,41 +3013,41 @@ msgstr "Comanda a eşuat." msgid "Commands" msgstr "Comenzi" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Transmite" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "Transmiterea %s NU este vizibila acum." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Transmiterea %s nu a fost gasita in %s. Actualizare submodul acum? " -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Data transmiterii" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Email transmitere" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Sfârşit transmitere" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Informaţii transmitere" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Mesaj de transmitere" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Nume transmitere" @@ -3009,7 +3055,7 @@ msgstr "Nume transmitere" msgid "Commit Ordering:" msgstr "Ordonare transmitere:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Transmitere super proiect" @@ -3017,19 +3063,19 @@ msgstr "Transmitere super proiect" msgid "Commit to:" msgstr "Transmite la:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Transmite..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Transmiteri grupate pe autori" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Transmiteri grupate pe date" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Transmiteri pe %s" @@ -3038,15 +3084,15 @@ msgstr "Transmiteri pe %s" msgid "Commits each week:" msgstr "Transmiteri pe săptămână:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Transmite schimbările tale la depozit" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Email transmiţător" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3058,52 +3104,52 @@ msgstr "Transmiterea unui dosar fără versiune nu va adăuga recursiv elementel msgid "Common Name:" msgstr "Nume obisnuit" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Compară reviziile &HEAD" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Compară referinţele selectate" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Compară două fişiere" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Compară spaţii goale" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Compară cu structura de lucru" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Compară cu &baza" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Compară cu revizia precedentă" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Compară toate secvenţele de spatii când se face diferenţa\nCompară secvenţele de spaţii" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Compară fişierul cu ultima revizie transmisă ca să vedeţi schimbările pe care le-aţi făcut" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Se compară %s cu %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Completat" @@ -3119,7 +3165,7 @@ msgstr "Sursa configurare" msgid "Config type:" msgstr "Tip configurare:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Configurare filtre expresii regulate" @@ -3153,11 +3199,11 @@ msgstr "Configurează program de vizualizare pentru fişiere de diferenţiere GN msgid "Confirm to kill running git process" msgstr "Confirmare de distrugere proces git curent" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Conflict" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Fişiere de conflict" @@ -3165,15 +3211,15 @@ msgstr "Fişiere de conflict" msgid "Conflict resolved" msgstr "Conflict rezolvat" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Cu conflicte" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Conflicte" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Conflicte: %d" @@ -3186,241 +3232,241 @@ msgstr "Meniuri contextuale:" msgid "Context lines for patches" msgstr "Linii contextuale pentru peticire" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Continuă" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Micşorează fereastra ataşată" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Transformă spaţiile în tab-uri" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Transformă tab-urile în spaţii" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Copiază" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Copiat" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Copiază" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Copiază %s la %s, Revizia %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Copiază SHA-1 în clipboard" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Unealta copiere\nCopiază" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Copiază toate informaţiile în clipboard" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Copiază şi redenumeşte" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Copiază mesajele jurnal în clipboard" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Copiază jurnalul în clipboard" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Copiază căile în clipboard" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Copiaza numele referintelor" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Copiază selecţia în &clipboard" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Copiază selecţia şi o pune în clipboard\nCopiază" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Copiază în clipboard" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Copiere: Nume nou pentru %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Se copiază %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Se copiază..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Corecturi" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "%s nu a putut fi adăugat la listă de ignorări!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Nu s-a putut căuta o versiune mai nouă!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" "\n" "%s" -msgstr "Nu s-au putut copia fişierele!⏎ ⏎ %s" +msgstr "Nu s-au putut copia fişierele!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 nu a putut fi creat deoarece dosarul este plin." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Nu s-a putut determina ultima revizie transmisă!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Nu s-a putut găsi Super-proiectul" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Nu s-a putut obţine starea!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 nu a putut fi deschis deoarece sunt prea multe fişiere deschise." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Nu s-a putut deschide fişierul\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 nu a putut fi şters deoarece este dosarul actual." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Nu s-a putut elimina %s din lista de ignorări" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Nu s-a putut restabili la prima transmitere (primul pas). Se întrerupe..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Nu s-a putut restabili la ultima transmitere (al doilea pas). Se întrerupe..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Nu s-a putut restabili la HEAD-ul original" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Nu s-a putut obţine URL-ul fişierului!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" -msgstr "Nu s-a putut obţine revizia %s a fişierului %s.⏎Peticirea nu este posibilă!" +msgstr "Nu s-a putut obţine revizia %s a fişierului %s.\nPeticirea nu este posibilă!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Nu s-a putut porni TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" "\n" "%s" -msgstr "Nu s-a putut porni vizualizatorul de diferenţiere!⏎ ⏎ %s" +msgstr "Nu s-a putut porni vizualizatorul de diferenţiere!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" "\n" "%s" -msgstr "Nu s-a putut porni programul extern de diferenţiere!⏎ ⏎ %s" +msgstr "Nu s-a putut porni programul extern de diferenţiere!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" "\n" "%s" -msgstr "Nu s-a putut porni programul extern de îmbinare!⏎ ⏎ %s" +msgstr "Nu s-a putut porni programul extern de îmbinare!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Nu s-a putut porni sarcina de tipărire." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" "\n" "%s" -msgstr "Nu s-a putut porni vizualizatorul de text!⏎ ⏎ %s" +msgstr "Nu s-a putut porni vizualizatorul de text!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Nu s-a putut porni Putty Agent (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Nu s-a putut porni thread-ul!" @@ -3428,7 +3474,7 @@ msgstr "Nu s-a putut porni thread-ul!" msgid "Coun&t" msgstr "Numa&r" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Numaratoare: %u potriviri." @@ -3441,15 +3487,15 @@ msgstr "Creează bib&liotecă" msgid "Create .gitignore file" msgstr "Creează fişier .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Creează ramură" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Creează ramură la această versiune..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Creează ramură..." @@ -3461,29 +3507,29 @@ msgstr "Creează listă de schimbări" msgid "Create New Branch" msgstr "Creează ramură nouă" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Creează serie de petice" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Creează etochetă" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Creează etichetă la această versiune..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Creează eticheta..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" -msgstr "Creează un document nou⏎ Nou" +msgstr "Creează un document nou\nNou" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3492,49 +3538,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Creează o clonă superficială cu un istoric trunchiat la numărul specificat de revizii. Un depozit superficial are un număr de limitări (nu puteţi clona sau prelua din el, nu puteţi împinge nici din el nici în el), dar este adecvat daca sunteţi interesat doar în istoria recentă a unui proiect cu o istorie lungă şi doriţi să trimiteţi schimbările ca petice." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Creează fişier petic" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Creează cerere de tragere" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Creează depo&zit aici..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Creat" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Creează o ramură sau etichetă" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Creează un dosar de biblioteci cu setări speciale pentru structuri de lucru Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Creează un fişier petic folosind diferenţele între cele două fişiere\nCreează fişier petic" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Creează o bază de date pentru depozit în locaţia actuală" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Creează un fişier de diferenţiere folosind toate schimbările pe care le-aţi făcut" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Se creează cerere de tragere..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Asistentul de credenţiale nu trebuie sa fie nul." @@ -3546,7 +3592,7 @@ msgstr "Asistent de credenţiale:" msgid "Credentials" msgstr "Credenţiale" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Taie" @@ -3554,7 +3600,7 @@ msgstr "&Taie" msgid "Current" msgstr "Actual" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Ramură actuală" @@ -3562,19 +3608,19 @@ msgstr "Ramură actuală" msgid "Current Branch:" msgstr "Ramură actuală:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" "\r\n" " If you want to force the rebase even if the current branch is a descendant of the commit you are rebasing onto, please check below \"Force Rebase\" checkbox." -msgstr "Ramura curentă %s este la zi⏎ ⏎ Dacă doriţi să forţaţi reamplasarea chiar daca ramura curenta este un descendent al transmiterii în care reamplasaţi, bifaţi mai jos \"Forţează reamplasarea\"." +msgstr "Ramura curentă %s este la zi\r\nDacă doriţi să forţaţi reamplasarea chiar daca ramura curenta este un descendent al transmiterii în care reamplasaţi, bifaţi mai jos \"Forţează reamplasarea\"." #. Resource IDs: (1113) msgid "Current version is:" msgstr "Versiunea actuală este:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Versiunea actuală este: %s" @@ -3587,7 +3633,7 @@ msgstr "&Personalizează..." msgid "Custom" msgstr "Personalizat" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Personalizează" @@ -3595,19 +3641,19 @@ msgstr "Personalizează" msgid "Customize Keyboard" msgstr "Personalizează tastatură" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Personalizează bara de unelte pentru acces rapid" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Personalizează bara de unelte pentru acces rapid..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Personalizează..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3621,88 +3667,92 @@ msgstr "Chirilic" msgid "DCommit Type" msgstr "Tip DCommit" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Demon" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Data" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Datează ultima transmitere" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Implicit" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Meniu implicit" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Meniu implicit de aplicaţie. Apare când nu sunt documente deschise." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Codează cu UTF-8 implicit" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Şterge" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Şterge %d ramuri" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Şterge %d ramuri destinaţie" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Ştergere %d etichete" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Şterge &local" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Şterge referinţă..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Şterge toate etichetele" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Şterge şi &ignoră %d elemente după nume" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Şterge şi adaugă la lista de &ignorări" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Şterge şi ignoră %d elemente după &extensie" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Şterge ramură" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Şterge ramură/etichetă" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Şterge ramură destinaţie" @@ -3710,34 +3760,34 @@ msgstr "Şterge ramură destinaţie" msgid "Delete remote tag - TortoiseGit" msgstr "Şterge etichetă destinaţie - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Stergere etichetele destinatie de pe \"%s\" ..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Şterge etichete destinaţie..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Şterge submodul" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Şterge etichetă" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Ştergeţi ramura existentă sau folosiţi un alt nume." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Stergere\nFisierul este sters." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Şters" @@ -3745,36 +3795,36 @@ msgstr "Şters" msgid "Deleted merge conflict" msgstr "Şterge conflictul de îmbinare" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Şterge şi adaugă fişierul/fişierele sau mască de fişier la lista de ignorări" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Şterge fişiere/foldere din controlul versiunii" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Şterge fişiere/dosare din controlul versiunii dar păstrează fişierul" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Şterge junalul de acţiuni" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Se şterge" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Se șterg datele salvate în cache" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Se şterge fișierul" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Ştergere referinţe destinaţie..." @@ -3794,7 +3844,7 @@ msgstr "Descriere" msgid "Describe Strategy" msgstr "Descrierea Strategiei" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Descriere" @@ -3802,7 +3852,7 @@ msgstr "Descriere" msgid "Description:" msgstr "Descriere:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Deselectează lista de schimbări" @@ -3810,33 +3860,33 @@ msgstr "Deselectează lista de schimbări" msgid "Destination" msgstr "Destinaţie" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Discul destinatar este plin." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detectează şi evidenţiază blocurile mutate" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Detectarea liniilor mutate si copiate din fisierele existente la orice transmitere" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Detectarea liniilor mutate si copiate din fisierele existente la tranmiterea unde fisierul destinatie a fost creat" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Detectarea liniilor mutate si copiate din fisiere modificate in cadrul aceleiasi transmiteri" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Detectarea liniilor mutate sau copiate dintr-un fisier" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3850,11 +3900,15 @@ msgstr "Dimensiunile şi poziţiile dialogurilor" msgid "Dialogs" msgstr "Dialoguri" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Optiuni pentru diferentiere" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Diferenţiază două transmiteri" @@ -3886,7 +3940,7 @@ msgstr "Fişier de diferenţiere:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3898,12 +3952,12 @@ msgstr "Pozitie diferentiere" msgid "Diff removed lines" msgstr "Diferentiere linii sterse" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Diferentiere cu \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Diferenţiază cu părintele %d" @@ -3916,19 +3970,19 @@ msgstr "Diferenţa dintre" msgid "Diffing" msgstr "Se diferenţiază" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Se diferenţiază transmiterile" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Diferenţiază structura de lucru de cea de dinainte de ultima transmitere" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Diferenţiază orice două transmiteri" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Dir..." @@ -3940,26 +3994,26 @@ msgstr "Dosar:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." -msgstr "Dezactivaţi această opţiune daca aveţi structuri de lucru cu adevărat mari şi experimentaţi»⏎ prea multă activitate pe disc atunci când răsfoiţi structura de lucru." +msgstr "Dezactivaţi această opţiune daca aveţi structuri de lucru cu adevărat mari şi experimentaţi\r\nprea multă activitate pe disc atunci când răsfoiţi structura de lucru." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Dezactivează actualizările" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Dezactivat" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disc plin în timpul accesării %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Excepţie de expediere: %1" @@ -3968,44 +4022,52 @@ msgstr "Excepţie de expediere: %1" msgid "Display &buttons in this order" msgstr "Afişează &butoanele în aceasta ordine" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" -msgstr "Afişează paginile întregi⏎ Previzualizare imprimare" +msgstr "Afişează paginile întregi\nPrevizualizare imprimare" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Afişează ajutor pentru butoane apăsate, meniuri şi ferestre\nAjutor" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Afişează ajutor pentru sarcina sau comanda actuală\nAjutor" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Afişează instrucţiuni despre folosirea ajutorului\nAjutor" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Afişează informaţii despre program, versiune şi drepturi de autor\nDespre" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "Nu-mi arăta din nou acest avertisment (dacă este selectat Continuă)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "Nu-mi arăta din nou acest avertisment (dacă Ignoră este selectat)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Nu selecta submodule automat" @@ -4018,106 +4080,123 @@ msgstr "Nu afişa meniul contextual pentru următoarele căi:" msgid "Do not use recycle bin" msgstr "Nu folosi coşul de gunoi" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Chiar doriţi să ştergeţi %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Chiar doriţi să ştergeţi bara de unelte '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Sigur vreţi să marcaţi fişierul (sau fişierele) selectate ca fiind presupus-valide?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Sigur vreţi să marcaţi fişierul (sau fişierele) selectate ca fiind skip-worktree?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Chiar doriţi să mutaţi acest fişier sau dosar?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Chiar doriţi să ştergeţi definitiv cele %d referinţe selectate? NU vor putea fi recuperate!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Chiar doriţi să ştergeţi \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Doriţi intr-adevăr să restauraţi copia? Veţi pierde toate schimbările pe care le-aţi făcut dupa ce aţi creat copia." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" "%s\n" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." -msgstr "Chiar doriţi să inversaţi toate schimbările din⏎ %s⏎ şi să reveniţi la această revizie? Aceste schimbări vor fi inversate prin combinarea inversată a reviziilor în structura de lucru." +msgstr "Chiar doriţi să inversaţi toate schimbările din\n%s\nşi să reveniţi la această revizie? Aceste schimbări vor fi inversate prin combinarea inversată a reviziilor în structura de lucru." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" "%s\n" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." -msgstr "Chiar doriţi să inversaţi toate schimbările din⏎ %s⏎ care au fost facute în această revizie? Aceste schimbări vor fi inversate prin combinarea inversată a reviziilor în structura de lucru." +msgstr "Chiar doriţi să inversaţi toate schimbările din\n%s\ncare au fost facute în această revizie? Aceste schimbări vor fi inversate prin combinarea inversată a reviziilor în structura de lucru." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Doriţi să preluaţi ramurile destinaţie din noua destinaţie adăugată?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Doriti sa incarcati fisierele modificate?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" "%s\n" "as resolved?" -msgstr "Doriţi să marcaţi fişierul⏎ %s⏎ ca fiind rezolvat?" +msgstr "Doriţi să marcaţi fişierul\n%s\nca fiind rezolvat?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Doriţi să recuperați aceste documente auto-salvate?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Doriţi să reîncărcaţi documentele pentru a reflecta modificările preferinţelor?\nNotiţă: veţi pierde toate modificările pe care le-aţi făcut!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Doriţi să vedeţi modificările?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Doriţi să scoateţi din tainiţă acum?" @@ -4125,28 +4204,28 @@ msgstr "Doriţi să scoateţi din tainiţă acum?" msgid "Document :" msgstr "Document :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Nu ştim ce se va împinge deoarece ramura \"%s\" este necunoscută" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Nu ştim ce se va împinge deoarece aţi introdus un URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Nu recuperează documentele auto-salvate\nFolosește ultimele versiuni explicit salvate ale documentelor" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Nu salva\nInchide vederile fara a salva modificarile" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4156,11 +4235,11 @@ msgstr "Nu salva\nReincarca vederile fara a salva modificarile" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Nu mai afişa mesajul acesta" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Realizat" @@ -4172,7 +4251,7 @@ msgstr "Jos" msgid "Download" msgstr "Descarcă" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Trageţi pentru ca acest meniu să plutească" @@ -4200,6 +4279,10 @@ msgstr "Formular cu butoane temporare" msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "E&xclude căile:" @@ -4208,7 +4291,7 @@ msgstr "E&xclude căile:" msgid "E&xit" msgstr "&Ieşire" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportă..." @@ -4228,11 +4311,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Europa de Est" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Editează" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Editează .gitconfig &global" @@ -4248,23 +4331,23 @@ msgstr "Modifică .tgitconfig" msgid "Edit Button Image" msgstr "Editează imaginea butonului" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Editează notiţe" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Editează autor" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Editează descrierea" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Editează program de diferenţiere specific unei extensii" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Editează program de îmbinare specific unei extensii" @@ -4276,11 +4359,11 @@ msgstr "Editează .gitconfig gl&obal" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Editează git config local" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Editează mesajul din jurnal" @@ -4300,25 +4383,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Sau numele sau IP-ul serverului proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Unelte elipsă\nElipsă" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Adresele de email To şi CC nu pot fi ambele nule în acelaşi timp." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Email-uri" @@ -4326,7 +4409,7 @@ msgstr "Email-uri" msgid "Empty" msgstr "Gol" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Activează editarea" @@ -4342,7 +4425,7 @@ msgstr "Activează Gravatar" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Activează încărcarea/salvarea jurnalului de fişiere (tortoisegit.data, tortoisegit.index)" @@ -4351,10 +4434,14 @@ msgstr "Activează încărcarea/salvarea jurnalului de fişiere (tortoisegit.dat msgid "Enable log cache" msgstr "Activează jurnalul de cache" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Suprapuneri active de iconițe" @@ -4363,35 +4450,35 @@ msgstr "Suprapuneri active de iconițe" msgid "Encode" msgstr "Codează" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" -msgstr "" +msgstr "Codificare" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "S-a produs o eroare de I/E în timpul accesării %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "A avut loc o violare de blocare în timpul accesării %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "A avut loc o violare de împărţire în timpul accesării %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "S-a găsit un argument nepotrivit." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "S-a produs o eroare neaşteptată în timpul citirii %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "S-a produs o eroare neaşteptată în timpul scrierii %1." @@ -4404,11 +4491,11 @@ msgstr "" msgid "End" msgstr "Sfârşit" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" -msgstr "" +msgstr "Stil Sfărșit de Linie" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Măreşte fereastra la dimensiunea maximă" @@ -4416,23 +4503,23 @@ msgstr "Măreşte fereastra la dimensiunea maximă" msgid "Enter Log Message" msgstr "Introduceţi mesaj în jurnal" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Introduceţi URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Introduceţi un GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Introduceţi o valută." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Introduceţi o dată şi/sau oră." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Introduceţi o dată." @@ -4440,45 +4527,45 @@ msgstr "Introduceţi o dată." msgid "Enter a name for the changelist:" msgstr "Introduceţi un nume pentru lista de schimbări:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Introduceţi un număr între %1 şi %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Introduceţi un număr." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Introduceţi un număr întreg pozitiv." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Introduceţi o oră." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Introduceţi un număr întreg între %1 şi %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Introduceţi un număr întreg între 0 şi 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Introduceţi un număr întreg." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Introdu mai jos conţinutul fişierului care sa fie testat:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Introduceţi &mesaj în jurnal" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Nu introduceţi mai mult de %1 caractere." @@ -4487,43 +4574,43 @@ msgstr "Nu introduceţi mai mult de %1 caractere." msgid "Enter the regex string below:" msgstr "Introdu mai jos expresia regulară:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Şterge tot\nŞterge tot" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Şterge selecţia\nŞterge" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Eroare" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Eroare la recompilarea cache-ului de iconiţe shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" -msgstr "Eroare la citirea/scrierea cheii de registru %s ⏎ %s" +msgstr "Eroare la citirea/scrierea cheii de registru %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "S-a actualizat tot." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4533,28 +4620,28 @@ msgstr "Fişiere executabile (*.exe)|*.exe|Comandă (*.com)|*.com|Informaţie (* msgid "Executable (+x)" msgstr "Executabil (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Există" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Ieşire" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Extinde (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Extinde fereastră ataşată" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Navighează la" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportă" @@ -4562,36 +4649,36 @@ msgstr "Exportă" msgid "Export Zip File" msgstr "Exportă fişier Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportă dosarul:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exportă selecţia în..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exportă această versiune..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportă şi fişierele fără versiune" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Se exportă %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Se exportă..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exportă o revizie într-un fişier zip" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Extensie" @@ -4607,7 +4694,7 @@ msgstr "Extensie:" msgid "Extern DLL Path:" msgstr "Cale DLL extern:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Extern" @@ -4615,101 +4702,101 @@ msgstr "Extern" msgid "External Program:" msgstr "Program extern:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Estompare" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Eşuare" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Inversare eşuată" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Nu s-a reuşit checkout-ul fişierului \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Nu s-a reuşit checkout-ul fişierului \"%s\" cu revizia %s în \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Nu s-a putut conecta.\nLegătura poate fi intreruptă." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Nu s-a putut converti obiectul ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Nu s-a putut crea un document gol." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Nu s/a putut crea obiectul. Asiguraţi că aplicaţia este înregistrat în registrul sistemului." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Nu s-a putut crea cererea de tragere." -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Nu s-a putut obţine fişierul bază." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Nu s-a putut obţine fişierul de îmbinare." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Nu s-a putut lansa ajutorul." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Nu s-a putut lansa aplicaţia din server." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Documentul nu a putut fi deschis." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Nu s-a putut performa operaţia din server." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Documentul nu a putut fi salvat." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Nu s-a putut stabili/elimina lista de schimbări '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" -msgstr "Nu s-a putut porni furnizorul COM '%s' pentru monitorul de probleme. ⏎ %s " +msgstr "Nu s-a putut porni furnizorul COM '%s' pentru monitorul de probleme.\n%s " -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Nu s-a putut aştepta pageant să termine de încarcat cheia." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Eşuat!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Avansează" @@ -4717,62 +4804,62 @@ msgstr "Avansează" msgid "Fast Forward o&nly" msgstr "Doar avansează" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Avansează la %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "Preia" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Preia" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Preia && Reamplasează" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Preia din depozit SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Preia din \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Preia&&Reamplasează" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Preia..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Se preia starea..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Se preiau fişierele modificate..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Se preia fişierul..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Se preia revizia %s a fişierului:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Fişier" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Encodarea Fișierului" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Modificate de fişieri in fiecare %s" @@ -4781,27 +4868,27 @@ msgstr "Modificate de fişieri in fiecare %s" msgid "File changes each week:" msgstr "Schimbări de fişieri pe săptămână:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Diferenţieri de fişier" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Fișierul nu conține conflicte" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Fișierul e gol." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Lista de fişiere este goală" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Petice pentru fişier" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4813,7 +4900,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensiune fişier:\t\t%s (%s)\nLăţime:\t\t\t%ld pixel\nÎnălţime:\t\t\t%ld pixel\nRezoluţie Orizontală:\t%.1f dpi\nRezoluţie Verticală:\t\t%.1f dpi\nAdâncime:\t\t\t%d bit\nMărire:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4833,7 +4920,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensiune fişier:\t\t%s (%s)\nLăţime:\t\t\t%ld pixel\nÎnălţime:\t\t\t%ld pixel\nRezoluţie orizontală:\t%.1f dpi\nRezoluţie verticală:\t%.1f dpi\nAdâncime:\t\t\t%d bit\nMărire:\t\t\t%d%%\n\nDimensiune fişier:\t\t%s (%s)\nLăţime:\t\t\t%ld pixel\nÎnălţime:\t\t\t%ld pixel\nRezoluţie orizontală:\t%.1f dpi\nRezoluţie verticală:\t%.1f dpi\nAdâncime:\t\t\t%d bit\nMărire:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4845,7 +4932,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensiune fişier:\t\t\t%s (%s)\nLăţime:\t\t\t%ld pixel\nÎnălţime:\t\t\t%ld pixel\nRezoluţie Orizontală:\t%.1f dpi\nRezoluţie Verticală:\t\t%.1f dpi\nAdâncime:\t\t\t%d bit\nMărire:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4865,7 +4952,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dimensiune fişier:\t\t\t%s (%s)\nLăţime:\t\t\t%ld pixel\nÎnălţime:\t\t\t%ld pixel\nRezoluţie orizontală:\t%.1f dpi\nRezoluţie verticală:\t\t%.1f dpi\nAdâncime:\t\t\t%d bit\nMărire:\t\t\t%d%%\n\nDimensiune fişier:\t\t\t%s (%s)\nLăţime:\t\t\t%ld pixel\nÎnălţime:\t\t\t%ld pixel\nRezoluţie orizontală:\t%.1f dpi\nRezoluţie verticală:\t\t%.1f dpi\nAdâncime:\t\t\t%d bit\nMărire:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Nume de fişier" @@ -4873,17 +4960,17 @@ msgstr "Nume de fişier" msgid "Files" msgstr "Fişiere" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Unealta umplere\nUmple" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrează după" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Căi de filtre" @@ -4895,11 +4982,11 @@ msgstr "Filtru:" msgid "Filter: " msgstr "Filtru:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Caută" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4909,17 +4996,17 @@ msgstr "Caută textul specificat\nCaută" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Căutare: Textul \"%s\" nu poate fi găsit" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4927,23 +5014,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Sfârşit" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Reamplasare terminată" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Terminat!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Primul părinte" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Doar primul părinte" @@ -4952,18 +5039,18 @@ msgid "First known &bad:" msgstr "Primul lucru incorect ştiut:" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Unităţi de dischete (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Dosar" @@ -4975,42 +5062,38 @@ msgstr "Urmăreşte redenumirile" msgid "Font" msgstr "Font" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Pentru ajutor, apăsaţi F1. Derulaţi orizontal cu Ctrl + rotiţa de derulare" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Pentru istoria completă, deselectaţi 'Opreşte când se copiază/redenumeşte'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forţează" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Forţează crearea ramurii/etichetei - chiar dacă mai există una cu acelaşi nume." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." -msgstr "Forţează reamplasarea chiar dacă ramura curenta este un descendent al transmiterii în care reamplasaţi. ⏎ În mod normal într-o asemenea situaţie comanda va ieşi cu mesajul \"Ramura curentă este la zi\"." +msgstr "Forţează reamplasarea chiar dacă ramura curenta este un descendent al transmiterii în care reamplasaţi.\r\nÎn mod normal într-o asemenea situaţie comanda va ieşi cu mesajul \"Ramura curentă este la zi\"." #. Resource IDs: (1796) msgid "Force: May discard" @@ -5024,20 +5107,20 @@ msgstr "Prim-plan" msgid "Format Patch" msgstr "Formatează peticul" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Formatează peticul..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Înainte" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5045,7 +5128,7 @@ msgstr "S-a găsit un mesaj de transmitere nul. Trebuie să introduceţi un mesa #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Cuvinte implicite găsite:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5067,11 +5150,11 @@ msgstr "De la fișiere modificate" msgid "From SVN Repository" msgstr "Din depozit SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "De la fișiere existente" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "De la fișiere modificate" @@ -5079,7 +5162,7 @@ msgstr "De la fișiere modificate" msgid "From:" msgstr "De la:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Ecran întreg" @@ -5087,7 +5170,7 @@ msgstr "Ecran întreg" msgid "Full text search" msgstr "Cautare în tot textul" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Complet recursiv" @@ -5095,32 +5178,32 @@ msgstr "Complet recursiv" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Mai multe opțiuni pentru fereastra de commit sunt pe pagina Dialogs 3." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" -msgstr "" +msgstr "G&ravatar" #. Resource IDs: (5061) msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplified)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ nu a putut fi iniţializat!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ nu a putut crea un obiect bitmap. Probabil nu există destulă memorie." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Se culeg informaţiile. Aşteptaţi..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Se adună statistici" @@ -5150,43 +5233,43 @@ msgstr "General::Meniu contextual" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "General::Dialoguri 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "General::Dialoguri 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "General::Dialoguri 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "General::Setează element în meniul extins" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Obţine jurnalele de îmbinare" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Se obţine fişierul %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Se obţine fişierul %s, revizia %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Se obţine informaţia..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Se obţine informaţia necesară..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Se obţine diferenţierea unificată" @@ -5198,23 +5281,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Evoluţie comandă Git" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git copiază şi adaugă fişierele la acest WC" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git-copiază şi redenumeşte elementul cu versiune aici" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git-copiază elementul (elementele) cu versiune aici" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git-exportă toate elementele aici" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git-exportă elementele cu versiune aici" @@ -5222,35 +5305,35 @@ msgstr "Git-exportă elementele cu versiune aici" msgid "Git Init" msgstr "Iniţializare Git" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Calea de instalare a Git-ului" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Jurnal Git" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git-mută şi redenumeşte elementul cu versiune aici" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git-mută elementul (elementele) cu versiune aici" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Preferinţe Git destinaţie" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Listă revizii Git" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Reamplasare din SVN in Git" @@ -5262,31 +5345,31 @@ msgstr "Sincronizare Git" msgid "Git clone - TortoiseGit" msgstr "Clonă git - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Directorul Git nu a fost setat (vezi pagina cu setări \"General\")" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "Git pentru Windows" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git a raportat o eroare în timpul creării unui depozit!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Lista de revizii a Git-ului conține întreaga istorie a fișierului" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5307,7 +5390,7 @@ msgstr "Git::Credential" msgid "Git::Remote" msgstr "Git::Destinaţie" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5319,47 +5402,47 @@ msgstr "Salt la linia" msgid "Go to line" msgstr "Salt la linia" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Salt la conflictul următor\nconflictul următor" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Salt la diferenţa următoare\ndiferenţa următoare" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" -msgstr "Salt la următoarea diferenţă inline⏎ Următoarea diferenţă inline" +msgstr "Salt la următoarea diferenţă inline\nUrmătoarea diferenţă inline" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Salt la conflictul precedent\nconflictul precedent" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Salt la diferenţa precedentă\ndiferenţa precedentă" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" -msgstr "Salt la diferenţa inline anterioară⏎ Diferenţa inline anterioară" +msgstr "Salt la diferenţa inline anterioară\nDiferenţa inline anterioară" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Salt la linia" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Grafic" @@ -5375,11 +5458,11 @@ msgstr "Gri" msgid "Greek" msgstr "Greacă" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Grupează liste de schimbări" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "Ascunde că&ile schimbate irelevante" @@ -5395,7 +5478,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5407,7 +5490,7 @@ msgstr "Dur: Restabileşte structura de lucru şi indexul (renunţă la toate sc msgid "Hebrew" msgstr "Hebrew" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Ajutor" @@ -5431,11 +5514,11 @@ msgstr "Hexazecimal" msgid "Hide Menus for unversioned paths" msgstr "Ascunde meniuri pentru căi fără versiune" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Ascunde petic<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Ascunde fereastră ataşată" @@ -5443,25 +5526,25 @@ msgstr "Ascunde fereastră ataşată" msgid "Hide the script while running" msgstr "Ascunde scriptul în timpul rulării" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Ascunde/afişează lista de fişiere petic" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Ascunde/Afişează lista de fişiere petice\nAscunde sau afişează lista de fişiere petice" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Sugestie" @@ -5471,7 +5554,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Sugestie: selectaţi meniul contextual, schimbaţi pagina la 'Comenzi' şi trageţi butoanele barei de unelte în fereastră de meniu." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Acasă" @@ -5487,7 +5570,7 @@ msgstr "Scenarii interceptor::Configurare program urmărire probleme" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Scripturi hook::Integrare monitor de probleme" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tip hook" @@ -5501,9 +5584,9 @@ msgstr "&Include căile:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5511,55 +5594,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5567,15 +5651,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5599,7 +5683,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5607,7 +5691,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5615,7 +5699,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5623,16 +5707,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5643,17 +5727,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5665,7 +5749,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5729,7 +5813,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Suprapuneri de iconiţe" @@ -5741,7 +5825,7 @@ msgstr "Suprapuneri de iconiţe::Set de iconiţe" msgid "Icon Overlays::Overlay Handlers" msgstr "Suprapuneri de iconițe::Manageri de suprapunere" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5751,52 +5835,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Iconiţe/Design/Cod:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Identic" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Dacă este activat, previne suprapunerile şi meniul contextual de a fi afişate în dialogurile 'salvează ca' sau 'deschide'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Dacă este bifat parametrul --track este furnizat programului git, dacă nu este bifat --no-track este furnizat, în caz contrar nu este furnizat nici --track nici --no-track (vezi manualul)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Dacă este bifat, a face dublu-clic pe o revizie din lista de jurnale o va compara cu revizia precedentă" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." -msgstr "Dacă este bifat, dialogul de transmitere va fi pornit din nou în mod automat după o eroare, ⏎ păstrând ultima selecţie şi mesajul de jurnal." +msgstr "Dacă este bifat, dialogul de transmitere va fi pornit din nou în mod automat după o eroare,\r\npăstrând ultima selecţie şi mesajul de jurnal." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Dacă este activat, TortoiseGit verifică odată pe săptămână daca este disponibilă o versiune mai nouă" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" -msgstr "Dacă este activat, dosarele din structura de lucru care sunt excluse de la⏎ a afişa suprapuneri vor afişa totuşi suprapuneri pentru starea \"normal\"" +msgstr "Dacă este activat, dosarele din structura de lucru care sunt excluse de la\n a afişa suprapuneri vor afişa totuşi suprapuneri pentru starea \"normal\"" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Dacă este configurat, fişierele din dosare fără versiune pot fi afişate in controlul de stare.\nControlul de stare este utilizat, de exemplu, în fereastra de transmitere." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5809,16 +5893,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Dacă plănuiţi să lucraţi în acest folder, nu bifaţi această opţiune. În mod normal un depozit simplu poate avea schimbările doar \"împinse\" spre el. (Prin convenţie, un depozit simplu ar trebui să aibă un nume care se termină cu \".git\")" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignoră" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignoră %d elemente după &extensie" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignoră Comentariile" @@ -5830,15 +5914,15 @@ msgstr "Ignoră fişier" msgid "Ignore Type" msgstr "Ignoră tip" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignoră toate spațiile" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignoră schimbările în spaţii goale" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignoră liniile goale" @@ -5846,7 +5930,7 @@ msgstr "Ignoră liniile goale" msgid "Ignore case cha&nges" msgstr "Ignoră schimbările de &majuscule" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5864,11 +5948,11 @@ msgstr "Ignoră element(-e) recursiv" msgid "Ignore line &endings (recommended)" msgstr "Ignoră caracterele de &linie nouă (recomandat)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignoră spațiile la sfarșitul liniilor" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignoră schimbările de spaţiu" @@ -5876,29 +5960,29 @@ msgstr "Ignoră schimbările de spaţiu" msgid "Ignore whitespace" msgstr "Ignoră spațiile goale" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignoră schimbări în spaţii goale" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorat" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Fişiere ignorate" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignoră toate secvenţele de spaţii can se face diferenţa\nIgnoră toate modificările in secvenţele de spaţii" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5916,24 +6000,24 @@ msgstr "Imagine ş&i text" msgid "Images" msgstr "Imagini" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Copii imediaţi, inclusiv dosare" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importă" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importă %s în %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importă ignorări SVN" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importă ignorări SVN..." @@ -5942,16 +6026,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importă fişierul de ignorări svn în fişierul .git/info/exclude (fişierul va fi suprascris)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Se importă fişierul %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "În lista de schimbări" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "În transmiteri" @@ -5975,24 +6059,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Include numai următorul interval de revizii:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nume de fişier nevalid." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Importul iniţial" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "S-a iniţializat un depozit Git gol în %s." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Diferenţe inline" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Diferenţe inline pe cuvinte" @@ -6004,25 +6088,25 @@ msgstr "Diferenţe între linii" msgid "Input" msgstr "Intrare" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Inserează conţinuturile din clipboard\nInserează" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Nu este suficientă memorie pentru a performa operaţia." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Eroare internă." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Valuta nu este valabilă." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Numărul reviziei este invalid!" @@ -6030,12 +6114,12 @@ msgstr "Numărul reviziei este invalid!" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" "Please consult the documentation for a way to work around this limitation." -msgstr "Nu este posibil să redenumiţi un fişier doar prin modificarea majusculelor. ⏎ De exemplu, nu puteţi face ca MyFile.txt să devină MYFILE.txt. ⏎ Vă rugăm să consultaţi documentaţia pentru o modalitate de a depăşi această limitare." +msgstr "Nu este posibil să redenumiţi un fişier doar prin modificarea majusculelor.\nDe exemplu, nu puteţi face ca MyFile.txt să devină MYFILE.txt.\nVă rugăm să consultaţi documentaţia pentru o modalitate de a depăşi această limitare." #. Resource IDs: (1074) msgid "J&ump to first conflict when loading" @@ -6053,7 +6137,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Păstrează" @@ -6061,15 +6145,15 @@ msgstr "Păstrează" msgid "Keep changelists" msgstr "Păstrează listele de schimbări" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Păstraţi fişierul local?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "" +msgstr "Continua rezolvarea\nSari la primul conflict nerezolvat" #. Resource IDs: (16136) msgid "Keyboard" @@ -6079,7 +6163,7 @@ msgstr "Tastatură" msgid "Keyboard shortcuts:" msgstr "Taste rapide:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Taste" @@ -6123,19 +6207,39 @@ msgstr "LINIA8" msgid "Language:" msgstr "Limba:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Ultimul autor" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Ultima transmitere" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Ultima modificare" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Ultima modificare:" @@ -6143,7 +6247,11 @@ msgstr "Ultima modificare:" msgid "Last known &good:" msgstr "Ultima stare corectă ştiută:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Lansează programul extern de diferenţiere/îmbinare pentru a rezolva conflictele" @@ -6151,17 +6259,17 @@ msgstr "Lansează programul extern de diferenţiere/îmbinare pentru a rezolva c msgid "Least active author:" msgstr "Autorul cel mai puţin activ:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Lasă în modul conflict\nStatutul de conflict al fișierului este păstrat" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Vizualizarea de pe stângă" @@ -6169,11 +6277,11 @@ msgstr "Vizualizarea de pe stângă" msgid "Left image" msgstr "Imaginea de pe stângă" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Grafic cu linii" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6187,12 +6295,12 @@ msgstr "Bara de diferenţiere de linii" msgid "Line differences" msgstr "Diferenţe între linii" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Linie mutată de la linia %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Linie mutată la linia %ld" @@ -6205,26 +6313,26 @@ msgstr "Latimea liniei" msgid "Line:" msgstr "Linia:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Linia: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Linii adăugate" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Linii şterse" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Enumeră subiecte de ajutor\nSubiecte de ajutor" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6242,23 +6350,23 @@ msgstr "Încarcă imaginile" msgid "Load Putty &Key" msgstr "Incarcă &cheie Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Modificari locale\nVederile sunt actualizate cu noul continut." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Se încarcă..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Local" @@ -6266,13 +6374,13 @@ msgstr "Local" msgid "Local Branch" msgstr "Ramură locală" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Stare locală" @@ -6280,7 +6388,7 @@ msgstr "Stare locală" msgid "Local:" msgstr "Local:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6290,7 +6398,7 @@ msgstr "" msgid "Locator Bar" msgstr "Bara de localizator" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Jurnal" @@ -6330,12 +6438,12 @@ msgstr "Mesaje din jurnal (dialogul de afişare a jurnalului)" msgid "Login:" msgstr "Login:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Cea mai mică revizie afişată: %ld - Cea mai mare revizie afişată: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6346,7 +6454,7 @@ msgstr "Cea mai mică revizie afişată: %ld - Cea mai mare revizie afişată: % msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6358,14 +6466,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL-ul sistemului de mail este invalid." -#. Resource IDs: (156) -msgid "Main" -msgstr "Principal" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Transformă în simplu (fără dosare de lucru)" @@ -6378,47 +6482,47 @@ msgstr "Administrea&ză" msgid "Manage" msgstr "Administrează" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Administrează destinaţii" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Marchează ca rezolvat" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Marchează ca rezolvat\nFişierul a fost marcat ca fiind modificat" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Marcează pentru comparaţie" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Marcheaza acest bloc" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Blocuri marcate" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" -msgstr "Marchează un fişier ca rezolvat în Git⏎ Marchează ca rezolvat" +msgstr "Marchează un fişier ca rezolvat în Git\nMarchează ca rezolvat" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Marchează revizia ca fiind incorectă" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Marchează revizia ca fiind corectă" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Potriveşte majus&culele" @@ -6442,7 +6546,7 @@ msgstr "Me&niuri afişează comenzile recent folosite întâi" msgid "Menu" msgstr "Meniu" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Bara de meniu" @@ -6450,7 +6554,7 @@ msgstr "Bara de meniu" msgid "Menu s&hadows" msgstr "&Umbre meniu" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Îmbină" @@ -6458,34 +6562,34 @@ msgstr "Îmbină" msgid "Merge &Message" msgstr "&Mesaj de îmbinare" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Punct de îmbinare" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reintegrează îmbinarea" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Fuziune intre ramura originala, continutul arborelui de lucru, si ramura pe care se va face trecerea" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Îmbină în \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Îmbinat" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Fişiere îmbinate" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Îmbină altă ramură" @@ -6493,22 +6597,22 @@ msgstr "Îmbină altă ramură" msgid "Merging" msgstr "Se îmbină" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Se îmbină din %s, reviziile %s până la %s, revizia %s cu %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Îmbinarea necesită revizii diferite sau URL-uri diferite în valorile 'De la:' şi 'La:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Se îmbină %s din %s cu %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Mesaj" @@ -6520,7 +6624,7 @@ msgstr "Doar mesajul" msgid "Message part &expression:" msgstr "Partea mesajului &expresie:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Mesaje" @@ -6528,11 +6632,11 @@ msgstr "Mesaje" msgid "Min" msgstr "Minim" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Propriu" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimizează Ribbon-ul" @@ -6544,7 +6648,11 @@ msgstr "Numarul minim de caractere pentru un mesaj de transmitere:" msgid "Misc" msgstr "Diverse" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Mixt" @@ -6552,35 +6660,35 @@ msgstr "Mixt" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Combinat: nu modifica structura de lucru, restabileşte indexul" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Date de modificare" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Modificat" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Fişiere modificate" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Mai mult" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Mai multe butoane" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Mai multe comenzi..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Mai multe culori..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Mai mult..." @@ -6600,41 +6708,41 @@ msgstr "Mută în &jos" msgid "Move &Up" msgstr "Mută în &sus" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Mută elementul în jos" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Mută elementul în sus" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Mută şi redenumeşte" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Mută în lista de schimbări" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Mută/Redenumeşte" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Mutare: Nume nou pentru %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Mută fişierele modificate în coşul de gunoi înainte de a inversa" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Se mută %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Se mută" @@ -6642,11 +6750,11 @@ msgstr "Se mută" msgid "My file:" msgstr "Fişierul meu:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Nume" @@ -6658,21 +6766,21 @@ msgstr "Nume:" msgid "Navigate" msgstr "Navighează" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" -msgstr "Mergi la o anume linie în vedere⏎ Salt la linie" +msgstr "Mergi la o anume linie în vedere\nSalt la linie" #. Resource IDs: (17004) msgid "Navigation Pane Options" msgstr "Opţiuni pentru panoul de navigare" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opţiuni pentru panoul de navigare..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Imbricat" @@ -6684,7 +6792,7 @@ msgstr "Reţea" msgid "Network::Email" msgstr "Reţea::Email" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nou" @@ -6693,43 +6801,43 @@ msgid "New &name:" msgstr "&Nume nou:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Ramură\\Etichetă nouă" +msgid "New Branch/Tag" +msgstr "Ramură/Etichetă nouă" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Meniu nou" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Noul hash" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Mesaj nou" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nume nou pentru %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Numele nou nu trebuie sa fie gol sau acelasi cu numele original!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nume nou:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Submodul nou" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Transmitere mai recentă" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Randuri noi" @@ -6737,33 +6845,29 @@ msgstr "Randuri noi" msgid "Next" msgstr "Înainte" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Următoarea Pagină\nUrmătoarea Pagină" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Următorul conflict" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Următoarea diferenţă" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Următoarea diferenţă inline" -#. Resource IDs: (73) -msgid "No" -msgstr "Nu" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Fără avansare" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Fara &fuziuni" @@ -6775,102 +6879,107 @@ msgstr "Fără Checkout" msgid "No Co&mmit" msgstr "Fara Trans&miteri" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "Nu s-a găsit niciun HEAD" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" -msgstr "Nicio comandă specificată⏎⏎ TortoiseGitProc.exe este folosit de extensia Shell şi nu ar trebui apelat în mod direct!" +msgstr "Nicio comandă specificată\n\nTortoiseGitProc.exe este folosit de extensia Shell şi nu ar trebui apelat în mod direct!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nu s-a specificat nici o valoare de comandă!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Nu s-au găsit diferenţe!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Nu s-au găsit diferenţe! E posibil ca submodulul să nu fie actualizat. Actualizaţi submodulul acum?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Nici un mesaj de eroare nu este disponibil." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nu s-a produs nici o eroare." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Niciun fişier sau dosar nu a fost modificat. Nu există nimic ce TortoiseGit ar putea inversa!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Cu preferinţele actuale, nu se va afişa nici un fişier.\nBifaţi una sau mai multe preferinţe de mai jos pentru a vedea fişierele fără versiune, ignorate şi/sau nemodificate.\nPentru a vedea schimbări făcute de la distanţă, clic pe 'Verifică depozit'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Niciun fişier nu a fost schimbat sau adăugat de la ⏎ ultima transmitere. Nu este nimic ⏎ ce TortoiseGit ar putea face aici..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Niciun fişier nu a fost schimbat sau adăugat de la ⏎ ultima transmitere. Nu este nimic ⏎ ce TortoiseGit ar putea face aici... ⏎ Doriţi să vedeţi fişierele fără versiune?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Nici un grafic nu este disponibil" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Nu s-a găsit nici un codor de imagine pentru %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Nu s-au găsit alte revizii." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Nicio versiune anterioară." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Nu s-au găsit referinţe" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Nici o corectare ortografică" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Fără status prestocat. Doar dosarele cu versiune pot avea imagini suprapuse, fişierele nu posedă imagini suprapuse" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Nici o sugestie de sinonime" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Nu s-a găsit dosar de lucru." @@ -6878,11 +6987,11 @@ msgstr "Nu s-a găsit dosar de lucru." msgid "Node size" msgstr "Dimensiunea nodului" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Nimic" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6894,30 +7003,30 @@ msgstr "Transmitere &SVN normală" msgid "North European" msgstr "Europa de Nord" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Fişiere fără versiune" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Nu s-au putut descărca şi verifica toate fişierele." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nu au fost eliminate toate înregistrările din registru (sau fişierul INI)." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Nu există suficientă memorie pentru a termina operaţia." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Memorie insuficientă!\nÎncercaţi sa reduce-ţi marimea arborelui de versiuni prin\ncolapsarea nodurilor sau scăderea factorului de mărire." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Nu s-au generat petice." @@ -6925,7 +7034,7 @@ msgstr "Nu s-au generat petice." msgid "Note node" msgstr "Nota nodului" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6944,26 +7053,26 @@ msgstr "Notă: dosarul conţine elemente fără versiune" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Notă: acest lucru afectează toţi clienţii Tortoise, nu doar TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notiţe" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" -msgstr "Reamplasarea nu este necesară»⏎ %s este la fel cu %s" +msgstr "Reamplasarea nu este necesară\r\n%s este la fel cu %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Nimic de reamplasat" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Nimic de transmis" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Notiţă" @@ -6971,7 +7080,7 @@ msgstr "Notiţă" msgid "Number Commits" msgstr "Numerotează transmiterile" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Numărul de %s" @@ -6984,7 +7093,7 @@ msgstr "Numărul de autori:" msgid "Number of characters required for moved or copied line detection:" msgstr "Numarul de caractere necesare pentru detectarea unei linii mutate sau copiate:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Numarul de caractere care vor fi aratate in partea prescurtata a hash-ului" @@ -7056,41 +7165,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Iniţializare OLE eşuată. Asiguraţi-vă ca bibliotecile OLE au versiunea corectă" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "culori Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Vechiul hash" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Mesaj vechi" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Transmitere mai veche" @@ -7098,15 +7207,15 @@ msgstr "Transmitere mai veche" msgid "Older lines" msgstr "Linii mai vechi" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "La cerere" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "S-au găsit unul sau mai multe documente salvate automat." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Unu sau mai multe fişiere sunt în stare de conflict." @@ -7118,83 +7227,84 @@ msgstr "Doar ramura curentă" msgid "Only Local Branches" msgstr "Doar ramuri locale" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Doar fişiere îmbinate" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Numai fişiere copii" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Numai numere (separate opţional cu virgulă)\nsunt permise!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Numai acest element" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Deschide" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" -msgstr "Deschide un document existent⏎ Deschide" +msgstr "Deschide un document existent\nDeschide" #. Resource IDs: (1797) msgid "Open certificate" msgstr "Deschide certificat" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" -msgstr "Deschide fişiere pentru diferenţiere sau pentru a aplica un petic⏎ Deschide fişiere" +msgstr "Deschide fişiere pentru diferenţiere sau pentru a aplica un petic\nDeschide fişiere" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Deschide din clipboard" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Deschide fişier imagine..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Deschide dosarul părinte" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Deschide acest document" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Deschide cu..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Deschide ajutorul\nSubiecte ajutor" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Deschide dialogul Browser de Referinte" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Deschide navigatorul de depozite" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opţiune" @@ -7203,30 +7313,30 @@ msgid "Options" msgstr "Opţiuni" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Dimensiune ori&ginală" +msgid "Ori&ginal size\tS" +msgstr "Dimensiune ori&ginală\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Nume origine" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Alte panouri de sarcini" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Alţii" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Listă de schimbări de ieşire" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Transmiteri de ieşire" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Memorie insuficientă." @@ -7234,7 +7344,7 @@ msgstr "Memorie insuficientă." msgid "Output Directory" msgstr "Dosar destinaţie" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7242,20 +7352,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Suprascrie ramura dacă există" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Suprascrie" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Pagina %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7266,15 +7380,15 @@ msgstr "Pagina %u\nPaginile %u-%u\n" msgid "Page :" msgstr "Pagina :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Panou 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Panou 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametri" @@ -7282,25 +7396,25 @@ msgstr "Parametri" msgid "Parameters:" msgstr "Parametri:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Parinte %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Părintele %d nu există" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Părinte 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Părinte 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Părinte (Părinţi)" @@ -7312,39 +7426,39 @@ msgstr "O parte din cod provine din TortoiseSVNBlame" msgid "Password" msgstr "Parola" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Parola:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Inserează" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Inserează mesaj recent..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Unealtă inserare\nInserează" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Inserează lista numelor de fişiere" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Inserează ultimul mesaj de transmitere" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Inserează calea svn din clipboard, rezultând într-o operaţiune de mutare sau copiere." -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Petic" @@ -7360,32 +7474,32 @@ msgstr "Peticește elementul &selectat" msgid "Patch As Attachment" msgstr "Petic ca ataşament" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Peticește toate fișierele" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Peticește fișierele selectate" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Fişiere petic (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Se peticește" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Se peticeşte fişierul \"%s\"" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Cale" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Cale gasita care se potriveste mai bine cu peticul." @@ -7393,21 +7507,21 @@ msgstr "Cale gasita care se potriveste mai bine cu peticul." msgid "Path:" msgstr "Cale:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Căi" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Unealtă creion\ncreion" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Procent de paternitate" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Procente" @@ -7415,24 +7529,24 @@ msgstr "Procente" msgid "Personalized Menus and Toolbars" msgstr "Meniuri şi bare de unelte personalizate" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Alege" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Alege hash-ul commit-ului" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Alegeti mesajul de transmitere" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Ridică %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7442,56 +7556,56 @@ msgstr "Poza (metafişier)\no poză" msgid "Picture:" msgstr "Poză:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Imagini (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Grafice (*.gv)|*.gv|Toate (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Imagini (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|>Toate (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Diagramă circulară" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Înregistraţi un scipt hook pentru executare." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Înregistraţi o cale pentru care doriţi să aplicaţi sciptul hook." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Selectaţi tipul hook" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Selectati ramura" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Uitati-va putin la comentariile sarite." -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Aştepataţi în timp ce se anulează..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Aşteptaţi în timp ce se obţin diferenţele..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Aşteptaţi..." @@ -7507,11 +7621,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Interceptor post-transmitere" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Interceptor post-împingere" @@ -7519,23 +7633,23 @@ msgstr "Interceptor post-împingere" msgid "Pre&v Page" msgstr "Pagina &precedentă" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Interceptor pre-transmitere" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Interceptor pre-împingere" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Se pregăteşte transmiterea..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Adaugă blocul din dreapta la început" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Adaugă blocul la început în stânga" @@ -7547,11 +7661,11 @@ msgstr "Apăsaţi &noua tastă rapidă" msgid "Press &new shortcut key:" msgstr "Apăsaţi &noua tastă rapidă" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Previzualizare" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Previzualizează fişierul peticit" @@ -7563,51 +7677,51 @@ msgstr "Previzualizare:" msgid "Previous" msgstr "Anterior" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Pagina precedentă\nPagina precedentă" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Versiunea anterioară" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Conflictul anterior" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Diferenţa anterioară" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Diferenţa inline anterioară" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Tipăreşte" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Tipăreşte documentul\n&Tipăreşte" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" -msgstr "Tipăreşte documentul curent folosind opţiunile curente⏎ Imprimare rapidă" +msgstr "Tipăreşte documentul curent folosind opţiunile curente\nImprimare rapidă" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" -msgstr "Tipăreşte documentul activ⏎ Tipăreşte" +msgstr "Tipăreşte documentul activ\nTipăreşte" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Tipăreşte în fişier" @@ -7615,7 +7729,7 @@ msgstr "Tipăreşte în fişier" msgid "Printer :" msgstr "Imprimantă :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Fişiere de Imprimantă (*.exe)|*.exe|Toate Fişierele (*.*)|*.*||" @@ -7623,11 +7737,11 @@ msgstr "Fişiere de Imprimantă (*.exe)|*.exe|Toate Fişierele (*.*)|*.*||" msgid "Printing" msgstr "Tipărire" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programe (*.exe)|*.exe|Toate Fişierele (*.*)|*.*||" @@ -7635,11 +7749,11 @@ msgstr "Programe (*.exe)|*.exe|Toate Fişierele (*.*)|*.*||" msgid "Progress" msgstr "Progres" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Proiect" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Proprietate" @@ -7647,7 +7761,7 @@ msgstr "Proprietate" msgid "Property Page" msgstr "Pagina de proprietăţi" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Furnizor" @@ -7679,15 +7793,15 @@ msgstr "Taiere" msgid "Prune (All remotes)" msgstr "Taiere (toate departarile)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Trage" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Tragerea are nevoie ca ramura locală selectată să fie ramura curentă." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Trage..." @@ -7695,19 +7809,19 @@ msgstr "Trage..." msgid "Pull/Fetch" msgstr "Trage/Preia" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Diferenţiere trasă" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Jurnal tras" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "Împinge" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Împinge" @@ -7723,11 +7837,11 @@ msgstr "Impinge URL:" msgid "Push notes" msgstr "Notiţe de împingere" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Etichete pentru împingere" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Împinge..." @@ -7735,22 +7849,22 @@ msgstr "Împinge..." msgid "Putty Key:" msgstr "Cheie Putty:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Cheie privată Putty (*.ppk)|*.ppk|Toate (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Iese din aplicaţie; solicită salvarea documentelor\nIeşire" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7768,11 +7882,15 @@ msgstr "Discuri R&AM" msgid "R&eset" msgstr "R&estabileşte" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "In&versează la aceasta revizie" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "REAMPLASARE" @@ -7780,7 +7898,7 @@ msgstr "REAMPLASARE" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7802,7 +7920,7 @@ msgstr "Desti&naţie:" msgid "Re&movable drives" msgstr "Discuri de&montabile" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "&Redenumeşte" @@ -7818,15 +7936,15 @@ msgstr "Re&stabileşte tot" msgid "Re&store defaults" msgstr "Re&stabileşte implicitele" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "In&versează..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Accesibil" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Citiţi 'gidul de folosinţa zilnică' întainte sa vă încurcaţi..." @@ -7834,21 +7952,21 @@ msgstr "Citiţi 'gidul de folosinţa zilnică' întainte sa vă încurcaţi..." msgid "Rebase" msgstr "Reamplasare" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Reamplasează \"%s\" aici..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Reamplasează..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Reamplasare... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Recent" @@ -7860,21 +7978,21 @@ msgstr "Fişier recent" msgid "Recently modified lines" msgstr "Liniile recent modificate" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Numai înregistrare" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Recuperează documentele auto-salvate\nDeschide versiunile auto-salvate în loc de cele salvate explicit" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Revino la starea de dinainte de reamplasare" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7888,17 +8006,21 @@ msgstr "Parcurge submodulul recursiv" msgid "Recursive" msgstr "Recursiv" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" -msgstr "Refă acţiunea anterior anulată⏎ Refă" +msgstr "Refă acţiunea anterior anulată\nRefă" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Micşorează fereastră în iconiţă" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref" @@ -7906,31 +8028,31 @@ msgstr "Ref" msgid "Ref (Click it then go to)" msgstr "Ref (Apasă-l şi apoi salt)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Lista referinte" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Răsfoire referinţe" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "JurnalRef" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Nume referinţă" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Reîmprospătează" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Reîmprospătează..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Filtru expresii regulate" @@ -7942,7 +8064,7 @@ msgstr "Filtre expresii regulate" msgid "Regex:" msgstr "Expresie regulata:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7961,7 +8083,7 @@ msgid "" "\\s : whitespaces" msgstr "Filtru de expresii regulate:\n. : orice caracter\nc+ : potriveşte caracterul c o dată sau de mai multe ori\nc* : potriveşte caracterul c de zero sau de mai multe ori\n^ : început de linie\n$ : sfârşit de linie\n(string){n} : potriveşte string-ul de n ori\n(abcd) : subexpresie\n[aei0-9] : potriveşte a,e,i şi 0..9\n[^aei0-9] : orice în afară de a,e,i şi 0..9\n\n\\w : potriveşte a-z,A-Z,0-9 şi _\n\\W : orice caracter care nu este alfa-numeric\n\\d : cifrele 0-9\n\\s : spaţii goale" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Bucăți de petic respinse pentru '%s'" @@ -7974,7 +8096,7 @@ msgstr "Timpi relativi in jurnal" msgid "Reload" msgstr "Reîncarcă" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8008,19 +8130,19 @@ msgstr "Ramura de &urmarire la distanta" msgid "Remote Branch" msgstr "Ramură destinaţie" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "URL-ul destinaţie trebuie să nu fie nul." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Actualizare destinaţie" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Numele destinaţiei trebuie sa nu fie nul." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Stare de la distanţă" @@ -8032,12 +8154,12 @@ msgstr "Destinaţie:" msgid "Remove" msgstr "Elimină" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Elimină %ld elemente" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Elimină %s" @@ -8046,7 +8168,7 @@ msgstr "Elimină %s" msgid "Remove &all untracked files (-fx)" msgstr "Şterge toate fişierele neurmărite (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Şterge ramura" @@ -8054,21 +8176,21 @@ msgstr "Şterge ramura" msgid "Remove &non-ignored untracked files (-f)" msgstr "Şterge fişierele neurmărite care nu sunt ignorate (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Elimină de pe lista de &ignorări" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Elimină din bara de unelte pentru acces rapid" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Elimină de pe lista de schimbări" @@ -8080,7 +8202,7 @@ msgstr "Şterge fişierele ignorate (-fX)" msgid "Remove untracked directories (-d)" msgstr "Şterge dosarele neurmărite (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Şterge fişierele neurmărite din structura de lucru, ..." @@ -8088,11 +8210,11 @@ msgstr "Şterge fişierele neurmărite din structura de lucru, ..." msgid "Removed" msgstr "Eliminat" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "S-a eliminat de pe lista de schimbări" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8100,7 +8222,7 @@ msgid "" "from the ignore list." msgstr "Elimină modelul (sau modelele) de fişier\n%s\ndin lista de ignorări." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Elimină fişierul sau mască de fişier din lista de elemente ignorate" @@ -8108,11 +8230,11 @@ msgstr "Elimină fişierul sau mască de fişier din lista de elemente ignorate" msgid "Rena&me..." msgstr "&Redenumeşte..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Redenumeşte" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Redenumeşte %s" @@ -8121,20 +8243,20 @@ msgstr "Redenumeşte %s" msgid "Rename - TortoiseGit" msgstr "Redenumeşte - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Redenumire \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Redenumeşte/mută" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Redenumeşte fişiere/dosare în controlul versiunii" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8144,7 +8266,7 @@ msgstr "Repetă ultima acţiune\nRepetă" msgid "Replace &All" msgstr "Inlocuire &Toate" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8158,12 +8280,12 @@ msgstr "Inlocuire cu:" msgid "Replace:" msgstr "Inlocuire:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Inlocuit %d potriviri" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Se înlocuieşte" @@ -8187,11 +8309,11 @@ msgstr "Solicită tragere" msgid "Requests a username and a password" msgstr "Cere un nume utilizator şi o parolă" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Re&zolvă" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Restabileşte" @@ -8203,25 +8325,25 @@ msgstr "Restabileşte &tot" msgid "Reset Type" msgstr "Tip de restabilire" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Restabileşte \"%s\" aici..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Restabileşte ramura activă" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Restabileşte coloanele" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Restabileşte ramura curentă \"%s\" la" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Rezolvă" @@ -8229,126 +8351,122 @@ msgstr "Rezolvă" msgid "Resolve Submodule Conflict" msgstr "Rezolva Conflictul dintre Submodule" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Rezolvă conflictul folosind 'propriu'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Rezolvă conflictele folosind 'ale lor'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Rezolvat" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Rezolvat:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Resolvă linii cu conflicte" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Reporneşte reamplasarea" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Restaurează" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Restaurează implicitele" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Restaurează după transmitere" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Restaurează fereastră la mărime normală" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Restaurat" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Reîncearcă" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Se reîncearcă în 2 secunde..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Inversează" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Inversează transmiterea" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Inversează transmiterea %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Inversează la versiunea părintelui" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Inversează la revizia %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Inversat" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Inversează toate schimbările făcute de când s-a făcut ultima actualizare" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Inversează o adăugare la controlul de versiune" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Recenzează peticul cu TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Recenzează/aplică un fişier de diferenţiere unificată cu TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Recenzează/aplică un singur &petic..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revizie" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revizia %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revizia %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Graficul reviziei" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Fişiere revizie" @@ -8364,31 +8482,31 @@ msgstr "Filtrul graficelor reviziei" msgid "Revision graph" msgstr "Graficul reviziei" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Revizia(-ile) au fost inversate. Toate schimbările sunt acum integrate în structura dumneavoastră de lucru." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revizie:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Rebobinează" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntext cu formatare de fonturi şi paragrafe" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Vizualizarea de pe dreaptă" @@ -8396,21 +8514,21 @@ msgstr "Vizualizarea de pe dreaptă" msgid "Right image" msgstr "Imaginea de pe dreaptă" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Rândul %d din %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Rândurile %d-%d din %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Mută în jos" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Mută în sus" @@ -8418,11 +8536,11 @@ msgstr "Mută în sus" msgid "S&elect..." msgstr "S&electează..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Afişează butoanele într-un singur rând" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Afişează butoanele în două rânduri" @@ -8430,15 +8548,23 @@ msgstr "&Afişează butoanele în două rânduri" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Afişează bara de acces rapid sub Ribbon" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatistici" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "Comută/Checkout..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8458,7 +8584,7 @@ msgstr "Serverul SMTP necesită autentificare" msgid "SMTP Server:" msgstr "Server SMTP:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, direct la serverul destinatie" @@ -8466,11 +8592,11 @@ msgstr "SMTP, direct la serverul destinatie" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8478,19 +8604,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "Tip transmitere SVN" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "Preluare SVN" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8502,15 +8628,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Simultan" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Transmitere simultană" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8528,35 +8654,39 @@ msgstr "" msgid "Sample text:" msgstr "Mostra text:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Salvează" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Salvează &ca..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Salvează &ca...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Salvează Ca" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Salvare fisierul de jos ca\nSunteti intrebat unde sa salvati fisierul de jos" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Salvează ca" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Salveaza fisierul din stanga ca\nSunteti intrebat unde sa salvati fisierul din stanga" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8564,13 +8694,13 @@ msgid "" "%s" msgstr "Salveaza fisierul din stanga\nModificarile sunt salvate in\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Salveaza fisierul din dreapta ca\nSunteti intrebat unde sa salvati fisierul din dreapta" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8578,74 +8708,74 @@ msgid "" "%s" msgstr "Salveaza fisierul din dreapta\nModificarile sunt salvate in\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Salvati tot\nAmbele fisiere sunt salvate" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "Salveaza si exclude\nModificarile dvs sunt salvate si continutul original este folosit" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "Salveaza si ignora blocurile marcate\nNumai editarile manuale sunt salvate. blocurile marcate sunt lasate asa cum sunt" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "Salveaza si include\nModificarile dvs sunt salvate si blocurile marcate sunt incluse" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Salvează ca" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Salvează ca..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Salveaza ca\nSunteti intrebat unde sa fie salvat fisierul" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Salvaţi schimbările din %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Salvare modificari." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Salvează revizia î&n..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" -msgstr "Salvează documentul activ cu un nume nou⏎ Salvează ca" +msgstr "Salvează documentul activ cu un nume nou\nSalvează ca" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" -msgstr "Salvează documentul activ⏎ Salvează" +msgstr "Salvează documentul activ\nSalvează" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8667,13 +8797,13 @@ msgstr "Salvează diferenţierea unificată" msgid "Save unified diff since HEAD" msgstr "Salvează diferenţierea unificată de la HEAD" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Salvare\nSalvare fisier cu marcarea zonelor de conflict" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8685,12 +8815,12 @@ msgstr "Salvare\nModificarile sunt salvate in\n%s" msgid "Saved Data" msgstr "Date salvate" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Salvarea configurării a eşuat (cheie: \"%s\", valoare: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Salvarea notiţelor a eşuat." @@ -8702,11 +8832,11 @@ msgstr "Scanare" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Derulează la stângă" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Derulează la dreaptă" @@ -8714,7 +8844,7 @@ msgstr "Derulează la dreaptă" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Caută mesaje de &jurnal..." @@ -8726,20 +8856,20 @@ msgstr "Cautare &sus" msgid "Search for:" msgstr "Caută:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Se caută o locaţie mai bună pentru aplicarea peticului..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Căutarea a eşuat la %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Selectare" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "S&electează tot" @@ -8755,59 +8885,59 @@ msgstr "Selectează meniu &contextual:" msgid "Select &window:" msgstr "Selectează &fereastră:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Selectează unealta culoare\nSelectează culoarea" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Selectează fişier..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Selectaţi client SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Selectaţi un buton." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Selectaţi obiectul pentru care să primiţi ajutor" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Selectaţi lista de schimbări" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Selectaţi aplicaţia de diferenţiere" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Selectare fisier" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Selectaţi dosarul cu care se va asocia acest monitor de probleme" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Selectaţi dosarul în care se va exporta.\nEste posibil să fie nevoie să îl creaţi mai întâi." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Selectaţi dosarul pentru care se va rula scriptul" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Selectaţi dosarul în care se vor salva fişierele selectate" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Selectează fişierul de script hook" @@ -8815,20 +8945,20 @@ msgstr "Selectează fişierul de script hook" msgid "Select items automatically" msgstr "Selectează elemente automat" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Selectaţi aplicaţia de îmbinare" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Selectaţi destinaţia îmbinării" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8840,15 +8970,19 @@ msgid "" "checker used for commit messages." msgstr "Selectare limba pe care sa o foloseasca acest proiect. Aceasta setare afecteaza verificarea de scriere pentru mesajele de transmitere." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Selectează vizualizatorul pentru fişiere de diferenţiere" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Selecteaza ce fisier doresti salvat ca" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8858,7 +8992,7 @@ msgstr "Selecteaza ce fisier vrei sa salvezi\nNote: Exista conflicte nerezolvate msgid "Select/deselect &all" msgstr "Selectează/deselecte&ază tot" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "Istoria selectiilor" @@ -8866,7 +9000,7 @@ msgstr "Istoria selectiilor" msgid "Send" msgstr "Trimite" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Trimite email" @@ -8874,11 +9008,11 @@ msgstr "Trimite email" msgid "Send Mail after create" msgstr "Trimite mail dupa creare" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Mesajul nu a putut fi transmis." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Trimite mail..." @@ -8886,19 +9020,19 @@ msgstr "Trimite mail..." msgid "Send Patch" msgstr "Trimite petic" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Trimite petic prin email" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Trimite petic(-e) prin email" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Se transmite conţinutul" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Se trimite..." @@ -8918,28 +9052,28 @@ msgstr "Setează au&tor" msgid "Set author &date" msgstr "Setare autor si data" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Setează destinaţia ca \"destinaţie de împingere\" pentru ramura locala selectată." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Setează ramura destinaţie ca \"ramură de împingere\" pentru ramura locala selectată." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Se aplic preferinţele..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Preferinţe" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Setări - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8947,7 +9081,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "Shell extins" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "S-a recompilat cache-ul de iconiţe shell!" @@ -8959,7 +9093,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Foloseşte format prescurtat de &data/ora pentru mesaje din jurnal" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Scurtează lista de proprietăţi" @@ -8971,7 +9105,7 @@ msgstr "Afişează" msgid "Show &Accelerator for:" msgstr "Afişează &accelerator pentru:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Arată &Reflog" @@ -8979,15 +9113,15 @@ msgstr "Arată &Reflog" msgid "Show &Unversioned Files" msgstr "Afişează fişiere fără versi&une" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Arată tot proiectul" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Afişează s&chimbări" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Afişează &jurnalul" @@ -8995,15 +9129,19 @@ msgstr "Afişează &jurnalul" msgid "Show &log..." msgstr "Afişează &jurnalul..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Afişează &suprapuneri şi meniul contextual numai în explorer" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Afişează deasupra ribbon-ului" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Afişează sub Ribbon" @@ -9011,35 +9149,35 @@ msgstr "Afişează sub Ribbon" msgid "Show Environment Variables" msgstr "Afişează variabile de mediu" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Afişează mai puţine butoane" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Afişează nodurile reviziei HEAD" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Afişează diferenţiere între linii pe cuvinte\nDiferenţiere între linii pe cuvinte" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" -msgstr "Afişează diferenţe inline⏎ Diferenţe inline" +msgstr "Afişează diferenţe inline\nDiferenţe inline" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Afişează mai multe butoane" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Afişează bara de acces rapid deasupra de Ribbon" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Afişează bara de acces rapid sub Ribbon" @@ -9047,11 +9185,11 @@ msgstr "Afişează bara de acces rapid sub Ribbon" msgid "Show Screen&Tips on toolbars" msgstr "Afişează &mesaje de ajutor pentru barele de unelte" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Afișează spații goale" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Arată o prezentare generală a întregului grafic" @@ -9059,7 +9197,7 @@ msgstr "Arată o prezentare generală a întregului grafic" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9067,11 +9205,11 @@ msgstr "" msgid "Show author" msgstr "Afişează autorul" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Arată ramurile folosite de transmiterea aceasta" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Afişează schimbările ca o diferenţiere &unificată" @@ -9091,15 +9229,15 @@ msgstr "Arată data" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Afişează dosar destinaţie" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Arată diferenţele" @@ -9111,11 +9249,15 @@ msgstr "Afişează diferenţe faţă de ultima transmitere" msgid "Show excluded folders as normal" msgstr "Afişează dosare excluse ca fiind normale" -#. Resource IDs: (16656) +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + +#. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Afişează &meniul întreg după o mică întârziere" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Arata numele fisierului" @@ -9131,7 +9273,7 @@ msgstr "Afişează fişiere i&gnorate" msgid "Show ignore local changes flagged files" msgstr "Arata fisierele marcate pentru a ignore modificarile locale" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Arata doar transmiterile cu etichete" @@ -9139,90 +9281,90 @@ msgstr "Arata doar transmiterile cu etichete" msgid "Show linenumber&s" msgstr "Afişaţi &numărul liniilor" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Afişează jurnal" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Afişează jurnal înainte de redenumire/copiere" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Afişează jurnalul lui %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Afişează jurnalul submodulului" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Afişează jurnalul acestui dosar" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Afişează jurnal..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Arată fişierele modificate în structura de lucru" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" -msgstr "Afişează următoarea schimbare a transmiterii selectate⏎ Afişează următoarea" +msgstr "Afişează următoarea schimbare a transmiterii selectate\nAfişează următoarea" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Afişează nodul cel mai vechi pe vârf" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Afişează sau ascunde bara de diferenţiere între linii\nComută LineDiffBar" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Afişează sau ascunde bara de localizator\nComută bara de localizator" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" -msgstr "Afişează sau ascunde bara de stare⏎ Comută bara de stare" +msgstr "Afişează sau ascunde bara de stare\nComută bara de stare" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Afişează sau ascunde bara de stare\nComută bara de stare" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Afişează sau ascunde bara de unelte\nComută bara de unelte" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Arată numărul original de linii" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" -msgstr "Afişează schimbarea anterioară a transmiterii selectate⏎ Afişează anterior" +msgstr "Afişează schimbarea anterioară a transmiterii selectate\nAfişează anterior" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Afişează proprietăţile reviziei" @@ -9230,17 +9372,17 @@ msgstr "Afişează proprietăţile reviziei" msgid "Show shortcut &keys in ScreenTips" msgstr "Afişează &comenzile rapide în mesajele de ajutor." -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" -msgstr "Afişează caracterele speciale pentru spaţii coale şi linii noi⏎ Arată spaţii goale" +msgstr "Afişează caracterele speciale pentru spaţii coale şi linii noi\nArată spaţii goale" #. Resource IDs: (1314) msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Afişează simbolurile în etichetele referinţă pentru a substitui o parte din numele de referinţă" @@ -9252,45 +9394,43 @@ msgstr "Afişează fişiere ne&modificate" msgid "Show un&versioned files" msgstr "Afişează fişiere fără &versiune" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Afişează/Ascunde" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" -msgstr "Se afişează %ld revizie(-ii), de la revizia %s la revizia %s - %ld revizie(-ii) selectate, %ld fișier(e) selectate»⏎\n" +msgstr "Se afişează %ld revizie(-ii), de la revizia %s la revizia %s - %ld revizie(-ii) selectate, %ld fișier(e) selectate\r\n\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Afişează o reprezentare grafică a copiilor/etichetelor/ramurilor" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Afişează toate fişierele schimbate de când s-a făcut ultima actualizare, atât local cât şi în depozit" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Arată informaţii despre TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Afişează jurnal referinţe" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Afişează fişierul jurnalului de acţiune în editorul implicit de text" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Afişează jurnalul pentru fişierul/dosarul selectat" @@ -9302,7 +9442,7 @@ msgstr "Semnează" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Stil argint" @@ -9310,20 +9450,20 @@ msgstr "Stil argint" msgid "Since" msgstr "Din" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Dimensiune" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Omite" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Omite peticul: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Omite structura de lucru" @@ -9331,23 +9471,23 @@ msgstr "Omite structura de lucru" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Omite structura de lucru (\"Blocat\" în TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Omis" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "S-a omis destinaţia care lipseşte" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Glisor" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Fin" @@ -9355,17 +9495,17 @@ msgstr "Fin" msgid "Soft: Leave working tree and index untouched" msgstr "Fin: Lasă structura de lucru şi indexul neatinse" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" -msgstr "Unele dintre fişier(e) au fost modificate în afara programului TortoiseGitMerge.⏎ Doriţi să încărcaţi schimbările?" +msgstr "Unele dintre fişier(e) au fost modificate în afara programului TortoiseGitMerge.\nDoriţi să încărcaţi schimbările?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" -msgstr "Unele dintre fişier(e) au fost modificate în afara programului TortoiseGitMerge.⏎ Doriţi să reîncărcaţi şi să renunţaţi la schimbările dumneavoastră?" +msgstr "Unele dintre fişier(e) au fost modificate în afara programului TortoiseGitMerge.\nDoriţi să reîncărcaţi şi să renunţaţi la schimbările dumneavoastră?" #. Resource IDs: (1126) msgid "Sort by commit count" @@ -9375,7 +9515,7 @@ msgstr "Sortează după numărul de transmiteri" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9385,49 +9525,53 @@ msgstr "Specifică numărul de elemente pe care doriţi să le păstraţi în di msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Separă liniile" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Separă fereastra activă în două panouri\nSepară" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Buluceşte" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Grafic cu bare suprapuse" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Grafic cu linii suprapuse" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Porneşte (Avansare)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Porneşte selectarea" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Porneşte interceptorul de transmitere" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Porneşte reamplasarea" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Porneşte modul înjumătăţire..." @@ -9435,7 +9579,7 @@ msgstr "Porneşte modul înjumătăţire..." msgid "Start registry editor" msgstr "Porneste editorul de registri" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Pornește un server git folosind protocolul git" @@ -9447,39 +9591,47 @@ msgstr "Tăinuieşte" msgid "Stash &Message" msgstr "&Mesaj tăinuire" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Aplică tăinuire" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Listă tăinuiri" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Scoate din tainiţă" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Salvează tăinuire" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Tăinuire în curs..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Static" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistici" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Stare" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Configurarea barei de stare" @@ -9491,32 +9643,32 @@ msgstr "Culori de stare si de acţiune" msgid "Status cache" msgstr "Cache de stare" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Cache de stare pentru un singur dosar, cu stare completă şi suprapuneri recursive" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Cache de stare ţinut într-un proces extern care detectează schimbările de fişiere, poate afişa recursiv suprapunerile" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Cache de stare pentr-un singur dosar, fără suprapuneri recursive" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Opreşte modul înjumătăţire" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Strategie" @@ -9524,15 +9676,15 @@ msgstr "Strategie" msgid "Strip lines starting with \"#\" in commit message" msgstr "Nu afisa liniile care incep cu \"#\" in mesajul de transmitere" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Stil" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Subiect" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Subiect:" @@ -9540,7 +9692,7 @@ msgstr "Subiect:" msgid "Submodule" msgstr "Submodul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9548,7 +9700,7 @@ msgstr "" msgid "Submodule Add" msgstr "Adauga submodul" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Adauga submodul..." @@ -9556,15 +9708,15 @@ msgstr "Adauga submodul..." msgid "Submodule Diff" msgstr "Diferenţiere submodul" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Iniţializare submodul" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Sincronizare submodul" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Actualizare submodul" @@ -9572,7 +9724,7 @@ msgstr "Actualizare submodul" msgid "Submodule Update Options" msgstr "Opţiuni de actualizare submodul" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9587,15 +9739,15 @@ msgstr "" msgid "Submodules" msgstr "Submodule" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Succes" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Comută" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Comută %s cu %s, revizia %s" @@ -9604,43 +9756,43 @@ msgstr "Comută %s cu %s, revizia %s" msgid "Switch To" msgstr "Comută cu" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Du-te înapoi la panoul anterior\nPanoul anterior" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Comută între vederile cu unul sau două panouri" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Comută între vederile cu unu sau două panouri\nComută între vederile cu unu sau două panouri" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Comută vederea între stânga şi dreapta" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Comută conţinutul între afişarea din stângă şi cea din dreaptă\nComută afişarea stângă şi dreaptă" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Comută la următoarea fereastră" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Comută la următorul panou\nUrmătorul panou" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Comută la fereastră precedentă" @@ -9648,19 +9800,19 @@ msgstr "Comută la fereastră precedentă" msgid "Switch/Checkout" msgstr "Comută/Checkout" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Comută/Checkout în" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Comută/Checkout aici..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Comută/Checkout structură de lucru pe altă ramură/etichetă" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Comuta comparatia stanga<->dreapta" @@ -9672,23 +9824,23 @@ msgstr "Adaugă simboluri la numele de referinţă" msgid "Symlink" msgstr "Legatura simbolica" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Sincronizează depozitele destinaţie, incluzând tragere, împingere, petic email şi aşa mai departe" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Sincronizare..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Sistem" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Sistemul este in mod offline. Verificati Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9698,13 +9850,13 @@ msgstr "Înregistrări din registrul sistemului au fost eliminate şi fişierul msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9718,7 +9870,7 @@ msgstr "Substitut de tab" msgid "Tab size:" msgstr "Dimensiune tab:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Etichetă" @@ -9726,16 +9878,16 @@ msgstr "Etichetă" msgid "Tag (FF)" msgstr "Etichetă (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Informaţii etichetă" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Etichetat structura de lucru cu %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Etichete" @@ -9743,11 +9895,11 @@ msgstr "Etichete" msgid "Tags:" msgstr "Etichete:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Sarcini" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Panou de sarcini" @@ -9759,11 +9911,11 @@ msgstr "" msgid "Test" msgstr "Test" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Numai test" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Fisiere text(*.txt)|*.txt|Toate fisierele (*.*)|*.*||" @@ -9771,78 +9923,98 @@ msgstr "Fisiere text(*.txt)|*.txt|Toate fisierele (*.*)|*.*||" msgid "Thai" msgstr "Thai" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" -msgstr "Configurarea destinaţie a fost schimbată.⏎ Doriţi să salvaţi acum sau renunţaţi la modificări?" +msgstr "Configurarea destinaţie a fost schimbată.\nDoriţi să salvaţi acum sau renunţaţi la modificări?" + +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" "\n" "Do you really want to delete it?" -msgstr "Ramura \"%s\" este o ramură destinaţie.⏎ ⏎ Chiar doriţi să oştergeţi?" +msgstr "Ramura \"%s\" este o ramură destinaţie.\n\nChiar doriţi să oştergeţi?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Mărimea de chunk nu s-a potrivit cu numărul de linii adăugate/eliminate!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Mesajul de transmitere trebuie sa nu fie nul." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" -msgstr "URL-ul pentru asistentul de credentiale \"%s\" există deja.⏎ Doriţi să îl suprascrieţi?" +msgstr "URL-ul pentru asistentul de credentiale \"%s\" există deja.\nDoriţi să îl suprascrieţi?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" -msgstr "Asistentul de credenţiale a fost schimbat.⏎ Doriţi să salvaţi acum sau renunţaţi la modificări?" +msgstr "Asistentul de credenţiale a fost schimbat.\nDoriţi să salvaţi acum sau renunţaţi la modificări?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" -msgstr "Structura de lucru curentă nu este curată.⏎ Doriţi să tăinuiţi schimbările?" +msgstr "Structura de lucru curentă nu este curată.\nDoriţi să tăinuiţi schimbările?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Motorul de diferenţiere s-a oprit din cauza unei erori:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" -msgstr "Referinţa sursă introdusă este ambiguă.⏎ Trebuie să o faceţi unică (e.g. adăugând \"refs/heads/\" ca prefix pentru ramuri sau \"refs/tags/\" pentru etichete)!" +msgstr "Referinţa sursă introdusă este ambiguă.\nTrebuie să o faceţi unică (e.g. adăugând \"refs/heads/\" ca prefix pentru ramuri sau \"refs/tags/\" pentru etichete)!" + +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Fişierul %s nu există!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Fişierul %s nu s-a găsit în fişierul petic!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" -msgstr "Fişierul \"%s\" nu există în structura de lucru.⏎ Doriţi să selectaţi alt fişier pentru diferenţiere?" +msgstr "Fişierul \"%s\" nu există în structura de lucru.\nDoriţi să selectaţi alt fişier pentru diferenţiere?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9851,15 +10023,15 @@ msgid "" "Do you want to remove the file?" msgstr "Fişierul\n%s\neste gol!\nVreţi să îl eliminaţi?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Fişierul este prea mare" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Fişierul este prea mare pentru a fi deschis." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9867,22 +10039,22 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Fişierul\n%s\nexistă deja! Vreţi să îl suprascrieţi?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" "%s\n" "is not a valid text file!" -msgstr "Fişierul⏎ %s⏎ nu este un fişier text valid!" +msgstr "Fişierul\n%s\nnu este un fişier text valid!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Dosarul %s\nconţine fişier(e) fără versiune şi/sau modificate. Doriţi totuşi să-l ştergeţi?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9891,78 +10063,78 @@ msgid "" "Would you like to create it first?" msgstr "Dosarul \n%s\nnu există.\nVreţi să îl creaţi?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Scriptul hook a produs o eroare:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Imaginea nu poate fi afişată." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Nu s-a putut crea monitorul de probleme. Verificaţi că acesta este instalat corect." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Furnizorul monitorului de probleme nu a putut valida textul parametrului" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Linia care indică fişierul nou a fost aşteptată în linia %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Numărul liniei trebuie să fie între %d şi %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "Ramura locala \"%s\" nu avansează la ramura destinaţie \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" -msgstr "Numele ramurii locale şi numele ramurii destinaţie sunt goale.⏎ Continuaţi?" +msgstr "Numele ramurii locale şi numele ramurii destinaţie sunt goale.\nContinuaţi?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" -msgstr "Numele ramurii/etichetei locale este nul. Aceasta va cauza ştergerea destinaţiei.»⏎ Continuaţi?" +msgstr "Numele ramurii/etichetei locale este nul. Aceasta va cauza ştergerea destinaţiei.\r\nContinuaţi?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Numărul maxim de linii în jurnalul de acţiuni care vor fi păstrate.\nToate liniile adăugte peste aceasta limită vor elimina liniile cele mai vechi din fişier." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Operaţia a eşuat." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Parametrii '/path' and '/pathfile' nu pot fi specificate în acelaşi tmip.\nSpecificaţi numai unu dintre ei." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" -msgstr "Peticul nu s-a aplicat curat pe %s şi nu s-a furnizat nicio informaţie despre versiune⏎ Nu se poate petici!" +msgstr "Peticul nu s-a aplicat curat pe %s şi nu s-a furnizat nicio informaţie despre versiune\nNu se poate petici!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9970,9 +10142,9 @@ msgid "" "and the patchline\n" "%s\n" "do not match!" -msgstr "Peticul pare învechit! Linia⏎ %s⏎ din fişier nu se potriveşte cu linia⏎ %s⏎ din petic!" +msgstr "Peticul pare învechit! Linia\n%s\ndin fişier nu se potriveşte cu linia\n%s\ndin petic!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9981,9 +10153,9 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n" "\n" "Do you want to proceed anyway?" -msgstr "Se pare că URL-ul sau calea introdusă nu este validă în Windows!⏎Puteţi să continuaţi, dar s-ar putea să întâmpinaţi erori ulterior.⏎ ⏎O cale validă în Windows nu poate conţine '<<>|\"?*:' sau unul dintre următoarele nume de dispozitiv:⏎com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$⏎⏎Sigur doriţi să continuaţi?" +msgstr "Se pare că URL-ul sau calea introdusă nu este validă în Windows!\nPuteţi să continuaţi, dar s-ar putea să întâmpinaţi erori ulterior.\n\nO cale validă în Windows nu poate conţine '<<>|\"?*:' sau unul dintre următoarele nume de dispozitiv:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nSigur doriţi să continuaţi?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9992,46 +10164,53 @@ msgid "" "But TortoiseGitMerge found the path\n" "%s\n" "matches it better. Do you want to use the suggested path instead?" -msgstr "Nu se potriveşte calea⏎ %s⏎ cu căile din fişierul petic.⏎ Dar TortoiseMerge a găsit calea⏎ %s⏎ care se potriveşte mai bine. Doriţi să folosiţi calea sugerată?" +msgstr "Nu se potriveşte calea\n%s\ncu căile din fişierul petic.\nDar TortoiseMerge a găsit calea\n%s\ncare se potriveşte mai bine. Doriţi să folosiţi calea sugerată?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Procesul inca ruleaza\nSunteti sigur ca vreti sa renuntati?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "Expresia regulata este invalida!\nVa rugam introduceti o expresie regulata valida!" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" -msgstr "Destinaţia \"%s\" există deja.⏎ Doriţi să o suprascrieţi?" +msgstr "Destinaţia \"%s\" există deja.\nDoriţi să o suprascrieţi?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Depozitul a fost creat cu succes." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Se pare că fişierul selectat are unul sau mai multe marcaje de conflicte.\nSigur vreţi să marcaţi fişierul ca fiind rezolvat?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" "Merely committing the superproject cannot track or save such changes to the submodule.\n" "Commit the submodule now or ignore dirty changes?" -msgstr "Submodulul \"%s\" este murdar.⏎ Doar prin transmiterea superproiectului nu se pot urmări sau salva asemenea schimbări asupra submodulului.⏎ Transmit submodulul acum sau ignorăm schimbările murdare?" +msgstr "Submodulul \"%s\" este murdar.\nDoar prin transmiterea superproiectului nu se pot urmări sau salva asemenea schimbări asupra submodulului.\nTransmit submodulul acum sau ignorăm schimbările murdare?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10040,35 +10219,35 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" "%s\n" "is not empty!\n" "Are you sure you want to initialize a git repository inside that folder?" -msgstr "Dosarul ţintă ⏎ %s⏎ nu este gol!⏎ Sunteţi sigur că doriţi să iniţializaţi un depozit git în acel dosar?" +msgstr "Dosarul ţintă \n%sß\nnu este gol!\nSunteţi sigur că doriţi să iniţializaţi un depozit git în acel dosar?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "Textul este identic, dar fisierele nu se potrivesc!\nAu fost gasite urmatoarele diferente:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Timpul în secunde după care prelucrarea fişierelor selectate este oprită.\r\nO valuare mai mică face ca lista de sugestii sa fie disponibilă mai repede,\r\ndar s-ar putea să nu citească toate fişierele." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Cele două URL-uri nu a fost create din aceeaşi rădăcină.\nNu se poate afişa mesajele din jurnal între acestea!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10078,34 +10257,34 @@ msgstr "Arborele de lucru nu este curat si contine modificari ne-puse in scena. msgid "Their file:" msgstr "Fişierul lor:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "A lor" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" -msgstr "Există schimbări sau elemente fără versiune în unul sau mai multe submodule.⏎ Aceste fişiere nu sunt afişate pentru transmitere. Va trebui sa transmiteţi aceste fişiere ca parte a unui submodul" +msgstr "Există schimbări sau elemente fără versiune în unul sau mai multe submodule.\nAceste fişiere nu sunt afişate pentru transmitere. Va trebui sa transmiteţi aceste fişiere ca parte a unui submodul" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Există %d manageri de suprapuneri instalaţi pe lângă cei folosiţi de Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Sunt mai multe vederi modificabile.\nPe care din ele doriti sa o salvati?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Nu este disponilbil nici un furnizor de monitor de probleme" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10114,85 +10293,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Mai sunt conflicte nerezolvate în linia %d!\nAr trebui să rezolvaţi aceste conflicte înainte de a salva fişierul.\nDoriţi să salvaţi fişierul care încă mai conţine conflictele?\nDacă selectaţi DA, va trebui să rezolvaţi conflictele manual în alt editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Sunt modificări nesalvate!\nDoriţi să salvaţi modificările?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Nu este nimic de adăugat. Toate fişierele şi dosarele sunt fie sub controlul de versiune, sunt ignorate sau sub efectul configurării de ignorare globale." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Lexicon" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Acestea au fost salvate mai recent decât documentele actual deschise și conțin schimbări făcute întainte de a fi închis aplicația." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Câmpul este necesar şi trebuie să nu fie nul." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Acesta nu este un URL valid.\nIntroduceţi un URL aici." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -msgstr "Aceasta nu este o cale validă!⏎O cale validă nu poate conţine '<<>|\"?*:' sau unul din următoarele nume de dispozitiv:⏎com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" +msgstr "Aceasta nu este o cale validă!\nO cale validă nu poate conţine '<<>|\"?*:' sau unul din următoarele nume de dispozitiv:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Acest program este legat de exportul lipsă %s în fişierul %s. Acest computer poate avea o versiune incompatibilă de %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Acest program are nevoie de fişierul %s, care nu a fost găsit pe acest sistem." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Aceasta proprietate este permisă numai la dosare, nu la fişiere." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Această operaţie necesită o structură de lucru curată." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Aceasta va şterge lista de comenzipe care le-aţi utilizat in această aplicaţie şi va restabili lista implicită de comenzi vizibile in meniuri si bare de unelte. Nu va elimina nici o personalizare explicită. Sunte-ţi sigur(ă) că doriţi asta?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Diferenţiere în trei" @@ -10208,14 +10387,14 @@ msgstr "Aranjează ori&zontal" msgid "To" msgstr "La" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10227,13 +10406,13 @@ msgstr "Pentru a curata fisierele temporare, trebuie sa va asigurati ca nu rulea msgid "To:" msgstr "Până la:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Comută afişarea de una/două pagini\nComută afişarea de una/două pagini" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Comută între filtre" @@ -10245,11 +10424,11 @@ msgstr "Bara de unelte" msgid "Toolbar Name" msgstr "Numele barei de unelte" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opţiunile barei de unelte" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Eroare internă în bara de unelte. Contactaţi furnizorul aplicaţiei." @@ -10265,16 +10444,16 @@ msgstr "Unelte" msgid "Tools:" msgstr "Unelte:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10284,20 +10463,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit a detectat că fișierul \"%s\" nu există dar este marcat ca \"Adăugat.\nDialogul de transmisie nu poate rezolva asta.\n\nDoriți să-l scoateți de la index?" +"Do you want to restore or remove it from the index?" +msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" -msgstr "TortoiseGit a detectat nume de fişiere similare. Doriţi ca fişierele:%s⏎sa fie şi ele redenumite?" +msgstr "TortoiseGit a detectat nume de fişiere similare. Doriţi ca fişierele:%s\nsa fie şi ele redenumite?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit nu va afişa următarele suprapuneri: %s" @@ -10306,18 +10485,18 @@ msgstr "TortoiseGit nu va afişa următarele suprapuneri: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame a fost deja iniţializat pentru depozitul \"%s\". Nu se poate comuta din mers pe alt depozit (\"%s\")." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10333,7 +10512,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10341,7 +10520,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Un program de diferenţiere imagini, parte a programului TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10353,38 +10532,38 @@ msgid "" "/overlay\t\tto enable overlay mode\n" "/fit\t\tto fit the images sizes\n" "/showinfo\t\tto show the image info boxes" -msgstr "TortoiseGitIDiff: Vizualizatorul de diferenţiere de imagini pentru TortoiseGit⏎⏎Parametrii disponibili la linia de comandă sunt:⏎ /left:\"calea imaginii din stânga\"⏎ /lefttitle:\"titlul afişat pentru imaginea din stânga\"⏎ /right:\"calea imaginii din dreapta\"⏎ /righttitle:\"titlul afişat pentru imaginea din dreapta\"⏎ /overlay»»pentru a activa modul de suprapunere⏎ /fit»»pentru a potrivi dimensiunile imaginilor⏎ /showinfo»»pentru a afişa căsuţe cu informaţia imaginilor" +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»»pentru a activa modul de suprapunere\n/fit»»pentru a potrivi dimensiunile imaginilor\n/showinfo»»pentru a afişa căsuţe cu informaţia imaginilor" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge nu poate procesa acest fişier petic. Numele de fişier \"%s\" apare de mai multe ori." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10423,11 +10602,11 @@ msgstr "Urmăreşte" msgid "Tracked Remote Branch:" msgstr "Ramură destinaţie monitorizată:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Ramura urmarita" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Se transferă la %s" @@ -10436,39 +10615,35 @@ msgstr "Se transferă la %s" msgid "Transparent &color..." msgstr "&Culoarea transparentă..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" -msgstr "" +msgstr "Decupează la dreapta" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Încercaţi o 'curăţare'. Dacă aceasta nu funcţionează va trebui să faceţi noua aducere." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Încearcă din nou" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turcă" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Modifică setări TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tip" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Tip:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL-ul si directorul nu trebuie sa fie goale." @@ -10492,116 +10667,120 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Nu s-a putut încărca suport pentru sistemul de mesagerie." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Nu s-a putut procesa comanda. Serverul este ocupat." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Nu s-a putut citi din %1, este deschis de alt utilizator." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Nu s-a putut citi proprietatea strict-scriere." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" "Please start the log dialog on this specific file alone and then revert the changes\n" "from the top pane in the log dialog." -msgstr "Nu s-a putut reconstrui calea structurii de lucru!⏎ Acest lucru se poate întâmpla dacă fişierul a fost redenumit.⏎ Vă rog porniţi dialogul de jurnal doar pentru acest fişier şi apoi inversaţi schimbările⏎ din cel mai de sus panou al dialogului de jurnal." +msgstr "Nu s-a putut reconstrui calea structurii de lucru!\nAcest lucru se poate întâmpla dacă fişierul a fost redenumit.\nVă rog porniţi dialogul de jurnal doar pentru acest fişier şi apoi inversaţi schimbările\ndin cel mai de sus panou al dialogului de jurnal." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Nu s-a putut scrie proprietatea strict-citire." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Nu s-a putut scrie la %1, este marcat pentru numai-citire sau este deschis de altcineva." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Debifează" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Anulează" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Anulează %d acţiuni" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Anulează 1 acţiune" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Anulează adaugarea..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" -msgstr "Anulează ultima acţiune⏎ Anulează" +msgstr "Anulează ultima acţiune\nAnulează" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" -msgstr "Anulează ultimele modificări⏎ Anulează" +msgstr "Anulează ultimele modificări\nAnulează" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Format de fişier neaşteptat." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Depliază" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Text fără format\nText fără format" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "&Diferenţiere unificată de revizii HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Necunoscut" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Profunzime necunoscută" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Demarchează acest bloc" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Conflicte nerezolvate!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Fără titlu" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Fără versiune" @@ -10609,7 +10788,7 @@ msgstr "Fără versiune" msgid "Unversioned files mark parent folder as modified" msgstr "Fişierele neversionate marchează dosarul părinte ca modificat" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Ştergere versiuni pentru %s" @@ -10622,23 +10801,23 @@ msgstr "Sus" msgid "Update" msgstr "Actualizare" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Actualizează referinţe" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Actualizează submodule" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Actualizat" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Se actualizează obiectele ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Actualizare index" @@ -10650,30 +10829,26 @@ msgstr "Foloseşte imaginea pre&definită:" msgid "Use &one-pane view as default for 2-file diff" msgstr "F&oloseşte un singur panou când se diferenţiază între două fişiere" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Foloseşte &alt bloc de text" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Foloseşte blocul de text \"propriu\"" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Foloseşte întâi blocul \"propriu\" de text şi apoi \"al lor\"" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Foloseşte blocul de text \"al lor\"" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Foloseşte întâi blocul de text \"al lor\" şi apoi \"propriu\"" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Foloseşte blocuri" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Foloseşte componenta de cale HTTP" @@ -10694,15 +10869,15 @@ msgstr "Foloseşte Thin &Pack (pentru conexiuni de reţea lente)" msgid "Use Unified Diff from &clipboard" msgstr "Folosiţi diferenţierea unificată din &clipboard" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Folosiţi un alt nume sau opţiunea \"Forţează\" pentru a-l suprascrie." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Folosiţi un alt nume sau folosiţi opţiunea \"Suprascrie ramură\"" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10712,7 +10887,7 @@ msgstr "Foloseşte tot conţinutul din vederea de pe stângă\nFoloseşte fişie msgid "Use block from left before right" msgstr "Foloseşte blocul de pe stângă înainte de cel de pe dreaptă" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10722,25 +10897,25 @@ msgstr "Foloseşte blocul din vederea de pe stângă înainte de cel de pe dreap msgid "Use block from right before left" msgstr "Foloseşte blocul de pe dreaptă înainte de cel de pe stângă" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Foloseşte blocul din vederea de pe dreaptă înainte de cel de pe stângă\nFoloseşte blocul de pe dreaptă înainte de cel de pe stângă" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Foloseşte amândouă blocurile de text (acesta întâi)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Foloseşte amândouă blocurile de text (acesta ultimul)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Foloseşte blocul din stânga" @@ -10756,15 +10931,15 @@ msgstr "Folositi culoarea ramurii locale pentru ramura curenta" msgid "Use recycle bin when reverting" msgstr "Foloseşte coşul de gunoi când se inversează" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Foloseşte expresie regulară" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Folosește blocul din dreapta" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Folositi spatii" @@ -10772,61 +10947,61 @@ msgstr "Folositi spatii" msgid "Use system locale for date/time" msgstr "Foloseşte localizarea sistemului pentru data/ora" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Foloseşte blocul de text din 'al &meu'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Foloseşte blocul de text din 'al &lor'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Foloseşte blocul de text din 'al &meu' înainte de 'al lor'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Foloseşte blocul de text din 'propriu' înainte de 'al lor'\nFoloseşte blocul 'propriu' de text şi apoi foloseşte-l pe 'al lor'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Foloseşte blocul de text din 'propriu'\nFoloseşte blocul 'propriu' de text" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Foloseşte blocul de text din 'al &lor' înainte de 'al meu'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Foloseşte blocul de text din 'al lor' înainte de 'propriu'\nFoloseşte blocul 'lor' de text şi apoi foloseşte-l pe 'propriu'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Foloseşte blocul de text din 'al lor'\nFoloseşte blocul 'lor' de text" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Foloseşte blocul de text de pe stângă\nFoloseşte blocul de pe stângă" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Foloseşte &acest bloc de text" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10834,7 +11009,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10846,19 +11021,19 @@ msgstr "Folositi calea originala.\nAplicati peticul la\n%s" msgid "Use this" msgstr "Folositi asta" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Foloseşte totul din fişierul &acesta" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Folosește acest bloc în stânga" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Foloseşte totul din fişierul &celălalt" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Folosit pentru a îmbunătăţi vârful ramurii curente." @@ -10874,25 +11049,25 @@ msgstr "Informaţii utilizator" msgid "User Name:" msgstr "Nume utilizator:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Anulat de către utilizator" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" -msgstr "Numele utilizatorului şi adresa de email trebuie configurate înainte de transmitere.»⏎ Doriţi să le configuraţi acum?" +msgstr "Numele utilizatorului şi adresa de email trebuie configurate înainte de transmitere.\r\nDoriţi să le configuraţi acum?" #. Resource IDs: (1650) msgid "User&name:" msgstr "&Nume utilizator:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Nume utilizator:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10911,7 +11086,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Valoare" @@ -10919,24 +11094,24 @@ msgstr "Valoare" msgid "Version" msgstr "Versiune" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Versiunea 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Versiunea 1 ( Timp de transmitere mai recent)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Versiunea 2 (Bază)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Versiunea 2 (Baza) (Timpul de transmitere mai recent)" @@ -10944,11 +11119,11 @@ msgstr "Versiunea 2 (Baza) (Timpul de transmitere mai recent)" msgid "Version Information" msgstr "Informaţia Versiunii" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Versiune:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Cu versiune" @@ -10960,23 +11135,27 @@ msgstr "Vietnameză" msgid "View" msgstr "Vedere" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Vedere .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Vizualizează petic" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Vizualizează petic>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Afişaţi revizia pentru această cale în vizualizator &web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Vizualizează revizia în editorul alternativ" @@ -10988,11 +11167,11 @@ msgstr "Vizualizează .gitconfig sistem" msgid "Visit our website" msgstr "Vizitaţi pagina noastră" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11003,7 +11182,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ATENTIE:\r\nModificați aceste configurațiile doar dacș sunteți sigur că știți ce faceți!\r\nPentru a revenii la valorile implicite ștergeți textul valorii." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Aşteaptă" @@ -11011,7 +11190,7 @@ msgstr "Aşteaptă" msgid "Wait for the script to finish" msgstr "Aşteaptă terminarea scriptului" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Se aşteaptă intrări" @@ -11019,23 +11198,23 @@ msgstr "Se aşteaptă intrări" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Atenţie" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Atenţie!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" "\r\n" "Do you really want to continue?" -msgstr "Avertisment: \"%s\" va fi şters definitiv. NU va putea fi recuperat!»⏎ »⏎ Chiar doriţi să continuaţi?" +msgstr "Avertisment: \"%s\" va fi şters definitiv. NU va putea fi recuperat!\r\n\r\nChiar doriţi să continuaţi?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11043,56 +11222,56 @@ msgstr "Web" msgid "Western European" msgstr "Europa de Vest" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "Când este activat, ţineţi SHIFT apăsat când faceţi clic dreapta pentru a accesa meniurile TortoiseGit adăugate la meniul contextual" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Când se aplică un petic, ignoră schimbările de spaţii goale în liniile context dacă este necesar" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Cand este activ, versiunile cu numar mai mare apar primele. Din cauza ca de obicei versiunile mai recente sunt mai folositoare" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Când este activat, elementele cu versiune afişate în dialogul de transmitere sunt automat selectate" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Dacă peticul nu este aplicat corect revino la îmbinarea în 3 dacă peticul reţine identitatea petelor pe care ar trebui să le aplice şi avem aceste pete disponibile local." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11102,15 +11281,15 @@ msgid "" "authentication and/or encryption." msgstr "Când lucrează în modul demon, toate datele din acest depozit sunt expuse fără autentificare și / sau encriptare." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Schimbări de spații (tab-uri, spații)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Spaţii goale" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Poziţia ferestrei" @@ -11118,15 +11297,15 @@ msgstr "Poziţia ferestrei" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11170,11 +11349,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "În interiorul unui fișier:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Structură de lucru" @@ -11182,29 +11361,25 @@ msgstr "Structură de lucru" msgid "Working Tree Path:" msgstr "Cale structură de lucru:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Schimbări în dosarul de lucru" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Taie liniile lungi" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" -msgstr "Taie liniile lungi la marginea din dreapta a vederii⏎ Taie liniile lungi" - -#. Resource IDs: (73) -msgid "Yes" -msgstr "Da" +msgstr "Taie liniile lungi la marginea din dreapta a vederii\nTaie liniile lungi" -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Da pentru toate" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Aveţi deja instalată ultima versiune." @@ -11214,119 +11389,119 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Puteți dezactiva manageri specifice de suprapunere aici.\nManageri dezactivate nu vor folosi un loc de suprapunere și vor da o șansa altor extensii shell să afișeze suprapunerile lor." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Puteţi insera bitmap numai cu dimensiunea (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Nu puteţi crea mai multe decât %d bare de unelte definite de utilizator." -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Nu puteţi selecta aceasta proprietate pentru dosare, numai pentru fişiere!\nDacă vreţi să o selectaţi pentru toate fişierele din acest dosar,\nva trebui să bifaţi căsuţă de bifare 'recursiv'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Nu puteţi schimba tipul acestei referinţe prin redenumire." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." -msgstr "Aveţi bifată opţiunea \"include neurmărite\".⏎ Aceasta include un apel \"git clean -fd\", astfel că fişierele/dosarele ignorate sunt şterse fără a fi folosit coşul de gunoi." +msgstr "Aveţi bifată opţiunea \"include neurmărite\".\nAceasta include un apel \"git clean -fd\", astfel că fişierele/dosarele ignorate sunt şterse fără a fi folosit coşul de gunoi." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Aţi modificat proprietăţi fără să le salvaţi.\nVreţi să le salvaţi acum?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" "For every of these items a new instance of the diff viewer will be started.\n" "Do you really want to show the diff for so many items at once?" -msgstr "Aţi selectat %d obiecte pentru care se doreşte diferenţierea.⏎ Pentru fiecare dintre aceste obiecte se va porni o instanţă nouă de vizualizator de diferenţe.⏎ Sunteţi sigur că doriţi să vedeţi diferenţierele pentru atât de multe obiecte în acelaşi timp?" +msgstr "Aţi selectat %d obiecte pentru care se doreşte diferenţierea.\nPentru fiecare dintre aceste obiecte se va porni o instanţă nouă de vizualizator de diferenţe.\nSunteţi sigur că doriţi să vedeţi diferenţierele pentru atât de multe obiecte în acelaşi timp?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Nu aţi înregistrat un număr de problemă!\nSigur doriţi să transmiteţi fără un număr de problemă?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Nu aţi intrpdus linia \"Semnat-de\" proprie!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." -msgstr "Aţi marcat unele fişiere cu \"restaurează după transmitere\".⏎ Doriţi să le restauraţi acum? E posibil să pierdeţi toate schimbările asupra acestui fişier după marcare." +msgstr "Aţi marcat unele fişiere cu \"restaurează după transmitere\".\nDoriţi să le restauraţi acum? E posibil să pierdeţi toate schimbările asupra acestui fişier după marcare." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Puteţi defini până la %d unelte." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Trebuie să introduceţi un mesaj de jurnal pentru transmitere" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Trebuie să reporniţi calculatorul pentru ca modificările să aibă efect." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Trebuie să selectaţi un nume de fişier pentru fişierul zip!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." -msgstr "Aţi selectat un dosar.»⏎ Exporturile sunt posibile doar spre un fişier (zip)." +msgstr "Aţi selectat un dosar.\r\nExporturile sunt posibile doar spre un fişier (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Aţi selectat un fişier cu versiune.\nFişierul va fi adăugat la controlul de versiune când îl transmiteţi." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Ar trebui să introduceţi text!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Ar trebui să selectaţi o imagine!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" -msgstr "Aţi schimbat setul de iconiţe de la %s la %s.⏎Această schimbare nu va avea efect până nu veţi reporni calculatorul sau închideţi şi redeschideţi sesiunea!" +msgstr "Aţi schimbat setul de iconiţe de la %s la %s.\nAceastă schimbare nu va avea efect până nu veţi reporni calculatorul sau închideţi şi redeschideţi sesiunea!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11336,7 +11511,7 @@ msgstr "Mesajele de jurnal anterior înregistrate au fost salvate.\nClic aici pe msgid "Your version is:" msgstr "Versiunea dumneavoastră este:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Versiunea dumneavoastră este: %d.%d.%d.%d" @@ -11346,10 +11521,10 @@ msgid "Zip File" msgstr "Fişier Zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Micşorează" +msgid "Zoo&m out\t-" +msgstr "&Micşorează\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Mărire" @@ -11361,84 +11536,84 @@ msgstr "Măr&eşte" msgid "Zoom &Out" msgstr "Micş&orează" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Mărire 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Măreşte\nMăreşte" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Micşorează\nMicşorează" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Măr&eşte" +msgid "Zoom i&n\t+" +msgstr "Măr&eşte\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Măreşte" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Micşorează" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Potriveşte" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Potriveşte mărimea ca să încapă înălţimea" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Potriveşte mărimea ca să încapă lăţimea" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Implicit]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Nedelegat]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" este invalid." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" nu este depozit git" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" -msgstr "\"git am\" este încă în modul aplicare.⏎ Doriţi să întrerupeţi?" +msgstr "\"git am\" este încă în modul aplicare.\nDoriţi să întrerupeţi?" #. Resource IDs: (65535) msgid "_POPUP_" @@ -11448,7 +11623,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "adaugă \"selectat din\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "adăugat" @@ -11456,7 +11631,7 @@ msgstr "adăugat" msgid "added files" msgstr "fişiere adăugate" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "un fişier fără nume" @@ -11464,14 +11639,19 @@ msgstr "un fişier fără nume" msgid "and support the developers" msgstr "şi ajută dezvoltatorii" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "Presupus-valid" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "bazat pe TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11504,30 +11684,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "transmiteri" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "are conflicte" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" -msgstr "copiat din»⏎ %s - revizia %ld" +msgstr "copiat din\r\n%s - revizia %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "zi" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "şters" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11539,7 +11719,7 @@ msgstr "înlocuitor temporar" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11548,16 +11728,16 @@ msgid "" "%s" msgstr "exportat\n%s\nla\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "extern" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git nu s-a închis corect (cod de ieşire %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorat" @@ -11565,15 +11745,15 @@ msgstr "ignorat" msgid "include &untracked" msgstr "include ne&urmărite" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "incomplet" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "moștenește" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "element păstrat local" @@ -11581,7 +11761,7 @@ msgstr "element păstrat local" msgid "keep the file lists in English" msgstr "păstrează listele fișierelor în engleză" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11590,7 +11770,7 @@ msgid "" "%s = %ld" msgstr "linie: %d(+) %d(-) fişiere: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11605,11 +11785,11 @@ msgstr "linie: %d(+) %d(-) fişiere: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "îmbinat" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "lipseşte" @@ -11617,7 +11797,7 @@ msgstr "lipseşte" msgid "missing/deleted/replaced" msgstr "lipsă/şters/înlocuit" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "modificat" @@ -11625,7 +11805,7 @@ msgstr "modificat" msgid "modified/copied" msgstr "modificat/copiat" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "luna" @@ -11633,40 +11813,44 @@ msgstr "luna" msgid "new branch" msgstr "ramură nouă" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nu" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "pentru această comandă nu este disponibilă nici o descriere" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "fără versiune" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "nu a fost găsit" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "împiedicat" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "în %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixeli" @@ -11674,11 +11858,11 @@ msgstr "pixeli" msgid "possible or real conflict/obstructed" msgstr "conflict posibil sau real" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "trimestru" @@ -11686,35 +11870,35 @@ msgstr "trimestru" msgid "renamed" msgstr "redenumit" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "înlocuit" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "se scanează calea:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "Omite structura de lucru" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "comutat la\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "rezolvă schimbările de submodul" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "în %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "în %s" @@ -11723,35 +11907,35 @@ msgstr "în %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "săptămână" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - toţi utilizatorii Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - utilizatorul Windows curent" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - doar acest depozit" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - utilizatorul Windows curent" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - doar acest depozit" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "an" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "da" diff --git a/Languages/Tortoise_ru.po b/Languages/Tortoise_ru.po index 97c38d547..b33445acb 100644 --- a/Languages/Tortoise_ru.po +++ b/Languages/Tortoise_ru.po @@ -8,11 +8,13 @@ # Andrei Stepanov, 2014-2015 # Arioch , 2012-2013 # Arkady Shapkin , 2011 +# Arkady Shapkin , 2011 # KOLANICH, 2013-2015 # _deniska , 2011 # Дмитрий Сытьков , 2011 # German Borisov , 2012-2013 # KOLANICH, 2013 +# KOLANICH, 2013 # Lübbe Onken , 2011 # Alexander Shchekaturov , 2013 # Sven Strickroth , 2012-2013 @@ -21,22 +23,22 @@ # Arioch , 2012 # Виталий Переславцев , 2013 # Вячеслав Третьяков , 2012-2013 -# Дмитрий Сытьков , 2014 +# Дмитрий Сытьков , 2011,2014 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:59+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Russian (http://www.transifex.com/projects/p/tortoisegit/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -58,138 +60,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# авторов отображаемых индивидуально:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f МиБ передано" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 содержит непредвиденный объект." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 содержит неправильный путь." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 содержит неправильную схему." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 имеет плохой формат." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 не найден." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! день назад" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! дней назад" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! час назад" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! часов назад" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! минут назад" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! месяц назад" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! месяцев назад" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! секунду назад" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! секунд назад" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! неделю назад" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! недель назад" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! год назад" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! лет назад" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! элементов выбрано" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! минут назад" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" -msgstr "%1!s!↩⏎\nПоказано %2!d! файлов, %3!d! подмодулей and %4!d! папок, всего %5!d! элементов" +msgstr "%1!s!\r\nПоказано %2!d! файлов, %3!d! подмодулей and %4!d! папок, всего %5!d! элементов" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" -msgstr "%1!s!↩⏎\nРазмер %2!s!" +msgstr "%1!s!\r\nРазмер %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nПродолжить выполнение скрипта?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -197,52 +199,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nЭтот файл не найден.\nПроверьте корректность пути и имени файла." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig или %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Байт передано" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d КиБ передано" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d фиксаций перед \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d файлов изменено" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d файлов удалено." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "В %d файлах убраны изменения и они восстановлены к %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "файлов выбрано: %d, файлов всего: %d" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d наиболее активных авторов, по крайней мере %d фиксаций у каждого (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -250,78 +252,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% альфа-канал\nщелчок для переключения альфа-канала\nдвойной щелчок для автоматического переключения альфа-канала" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld мин %ld с" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld из %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - до ревизии: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Восстановлено]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s за %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s требует Git версии >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, скорость %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Рабочая копия" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Экспорт (%d) %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Экспорт %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "Не может быть корректно применена заплатка к\n%s ." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nВы всё равно желаете это удалить?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -337,6 +339,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-х сторонние слияние" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Прервать" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&О TortoiseGitBlame..." @@ -365,15 +371,15 @@ msgstr "&Добавить Фильтр" msgid "&Add New/Save" msgstr "&Добавить Новое/Сохранить" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Добавить его" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Добавить или убрать кнопки" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Добавить..." @@ -413,7 +419,7 @@ msgstr "&Назначить" msgid "&Associate double-click event with:" msgstr "Связать &двойной щелчок с:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Скрывать автоматически" @@ -429,15 +435,15 @@ msgstr "&Автоматически загружать ключ" msgid "&Backup original file" msgstr "Сохранять резервную &копию файла" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Авторство" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Авторство изменений" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Авторство ревизий" @@ -461,7 +467,7 @@ msgstr "&Ветвь:" msgid "&Browse Dir" msgstr "&Обзор папки" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "Обзор хранилища" @@ -497,7 +503,7 @@ msgstr "&Категория:" msgid "&Choose commands from:" msgstr "Вы&берите команды:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Очистить..." @@ -521,7 +527,7 @@ msgstr "&Закрыть окна" msgid "&Command:" msgstr "&Команда:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Фиксировать" @@ -529,23 +535,27 @@ msgstr "&Фиксировать" msgid "&Commit submodule..." msgstr "&Фиксировать подмодуль..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Фиксировать без" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Фиксировать..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Сравнить ревизии" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "Сжатый граф" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "П&родолжить" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "Копи&ровать" @@ -565,11 +575,11 @@ msgstr "&Настраиваемая" msgid "&Default" msgstr "По &умолчанию" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Удалить" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Удалить (оставив локально)" @@ -577,9 +587,9 @@ msgstr "&Удалить (оставив локально)" msgid "&Delete Filter" msgstr "&Удалить Фильтр" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" -msgstr "Удалить и локальную и отдалённую" +msgstr "Удалить внешнюю && локальную" #. Resource IDs: (65535) msgid "&Detect moved or copied lines" @@ -589,11 +599,11 @@ msgstr "&Обнаружить перемещённые или скопирова msgid "&Detect moved or copied lines:" msgstr "&Обнаружить перемещённые или скопированные строки:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Различия" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "С&равнить с предыдущей версией" @@ -605,7 +615,7 @@ msgstr "&Папка:" msgid "&Disabled" msgstr "&Отключено" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Отбросить" @@ -613,7 +623,7 @@ msgstr "&Отбросить" msgid "&Do the same for the rest" msgstr "&Сделать то же самое для остальных" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Присоединение" @@ -621,11 +631,15 @@ msgstr "&Присоединение" msgid "&Don't ask me again" msgstr "Не &спрашивать меня снова" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "&Больше не показывать это сообщение" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Вниз" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Загрузить" @@ -633,11 +647,11 @@ msgstr "&Загрузить" msgid "&Edit" msgstr "&Правка" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Редактировать .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Править ВСЕ" @@ -645,7 +659,7 @@ msgstr "&Править ВСЕ" msgid "&Edit Filter" msgstr "&Редактировать Фильтр" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "Редактировать конф&ликты" @@ -670,10 +684,10 @@ msgid "&Enable edit" msgstr "&Разрешить редактирование" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "&Выход" +msgid "&Exit\tCtrl+W" +msgstr "&Выход\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Экспортировать выбранное в..." @@ -685,27 +699,27 @@ msgstr "В&нешняя" msgid "&File" msgstr "&Файл" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Найти" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Найти\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "Вписать изображения в &окно" +msgid "&Fit images in window\tF" +msgstr "&Подогнать изображения в окне\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Жёсткие диски" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "П&лавающее" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "Отслеживать переименования" @@ -717,7 +731,7 @@ msgstr "&Шрифт журнала:" msgid "&Font:" msgstr "&Шрифт:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Принудительно" @@ -737,7 +751,7 @@ msgstr "&Фиксировать в стиле Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Перейти»Ctrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "Несвязанные изменения серым" @@ -749,7 +763,7 @@ msgstr "&Зел:" msgid "&HEAD" msgstr "&ГОЛОВНАЯ" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Справка" @@ -757,7 +771,7 @@ msgstr "&Справка" msgid "&Help Topics" msgstr "&Разделы Справки" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Скрыть" @@ -765,11 +779,11 @@ msgstr "&Скрыть" msgid "&Icon Set:" msgstr "Набор &значков" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Игнорировать" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "Игнорировать %d &элементов по имени" @@ -783,14 +797,14 @@ msgid "&Image" msgstr "&Изображение" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Информация об &изображении" +msgid "&Image info\tI" +msgstr "Информация об &изображении\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "Только &изображение" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "И&мпорт..." @@ -802,7 +816,7 @@ msgstr "&Исходная папка:" msgid "&Initialize submodules (--init)" msgstr "&Инициализировать подмодули (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Установить" @@ -814,11 +828,11 @@ msgstr "&Перейти к первому различию при загрузк msgid "&Keep CR" msgstr "%Сохранять символ перевода каретки CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Сохранить текущее состояние" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Метка" @@ -846,7 +860,7 @@ msgstr "Ограничение:" msgid "&Line number" msgstr "&Номер строки" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Номер строки (%d - %d)" @@ -863,7 +877,7 @@ msgstr "&Мелкие значки" msgid "&Local Branch:" msgstr "&Локальная ветвь:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Локальные ветви" @@ -887,11 +901,11 @@ msgstr "Анимированное &меню:" msgid "&Menu contents:" msgstr "&Содержимое меню:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "С&лияние" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Слить..." @@ -947,6 +961,10 @@ msgstr "&Далее >" msgid "&Next Page" msgstr "&Следующая страница" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Нет" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Нет события по двойному щелчку" @@ -963,11 +981,11 @@ msgstr "&Ничего" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "O&K" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Одна страница" @@ -975,19 +993,15 @@ msgstr "&Одна страница" msgid "&Onto" msgstr "Поверх" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Открыть" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Перейти на сайт Git для Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Открыть..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Открыть...\tCtrl+O" @@ -1000,18 +1014,18 @@ msgid "&Overlay Icon:" msgstr "Пометка:" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "На&ложить изображения" +msgid "&Overlay images\tO" +msgstr "На&ложить изображения\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "Па&роль:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Вставить" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Оставить ВСЕ" @@ -1019,7 +1033,7 @@ msgstr "&Оставить ВСЕ" msgid "&Port:" msgstr "&Порт:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Предварительный просмотр" @@ -1027,11 +1041,15 @@ msgstr "&Предварительный просмотр" msgid "&Print..." msgstr "&Печать..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Печать...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Продолжить" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Получить" @@ -1039,10 +1057,14 @@ msgstr "&Получить" msgid "&Push all branches" msgstr "&Отправить все ветви" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&ПереФиксация" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "&Перебазировать" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Недавние сообщения" @@ -1055,7 +1077,7 @@ msgstr "&Рекурсивно" msgid "&Red:" msgstr "&Крсн:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Вернуть" @@ -1071,23 +1093,23 @@ msgstr "&Обновить" msgid "&Regular Expression" msgstr "&Регулярное выражение" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Напомнить мне позже" #. Resource IDs: (1617) msgid "&Remote Branch:" -msgstr "&Отдалённая ветвь:" +msgstr "&Внешняя Ветвь:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" -msgstr "&Дистанционная ветвь:" +msgstr "&Внешние ветви:" #. Resource IDs: (1490, 1503) msgid "&Remote:" -msgstr "&Отдалённое хранилище:" +msgstr "&Внешнее хранилище:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Удалить" @@ -1099,7 +1121,7 @@ msgstr "&Убрать этот файл из индекса" msgid "&Replace" msgstr "&Заменить" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Обозреватель хранилища" @@ -1107,7 +1129,7 @@ msgstr "Обозреватель хранилища" msgid "&Reset" msgstr "С&брос" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "Сб&росить панель инструментов" @@ -1123,23 +1145,27 @@ msgstr "О&чистить мои данные об использовании" msgid "&Reset to Default" msgstr "С&бросить на исходные" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "Улажено" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Восстановить" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Восстановить старое состояние" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "По&вторить" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Откатить изменения этой фиксации" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Откатить изменения этих фиксаций" @@ -1151,7 +1177,7 @@ msgstr "SSH &клиент:" msgid "&Saturation:" msgstr "&Насыщенность:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Сохранить" @@ -1159,23 +1185,27 @@ msgstr "&Сохранить" msgid "&Save authentication" msgstr "&Сохранить аутентификацию" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Сохранить график как..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "Сохранить с&писок выбранных файлов..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Сохранить\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Установить путь к Git" #. Resource IDs: (1486) msgid "&Set upstream/track remote branch" -msgstr "&Установить верховую/отслеживаемую отдалённую ветвь" +msgstr "&Установить верховую/отслеживаемую внешнюю ветвь" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Настройки" @@ -1195,7 +1225,7 @@ msgstr "&Текстовые метки" msgid "&Signing key ID:" msgstr "ID &ключа для подписи:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Пропустить" @@ -1203,7 +1233,7 @@ msgstr "&Пропустить" msgid "&Squash" msgstr "&Объединить" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Объединить ВСЕ" @@ -1215,7 +1245,7 @@ msgstr "&Начать" msgid "&Start Group" msgstr "&Начальная группа" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Копилка" @@ -1235,7 +1265,7 @@ msgstr "&Крупные значки" msgid "&Tab size:" msgstr "Размер &табул.:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "Документ с &закладками" @@ -1243,7 +1273,7 @@ msgstr "Документ с &закладками" msgid "&Tag" msgstr "&Метка" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Метки" @@ -1279,7 +1309,7 @@ msgstr "&Панели инструментов и закрепляемые ок msgid "&Toolbars:" msgstr "&Панели инструментов:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1291,7 +1321,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Ствол:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "П&опробуйте еще раз" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Две страницы" @@ -1299,15 +1333,15 @@ msgstr "&Две страницы" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Откатить" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "Объединённые разли&чия" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Объединенные различия с" @@ -1319,7 +1353,7 @@ msgstr "&Неизвестные носители" msgid "&Up" msgstr "&Вверх" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Обновить элемент до ревизии" @@ -1331,11 +1365,11 @@ msgstr "&Верховая:" msgid "&Use auto-completion of file paths and keywords" msgstr "&Использовать автозавершение путей файлов и ключевых слов" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Имя:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Вид" @@ -1343,7 +1377,7 @@ msgstr "&Вид" msgid "&View:" msgstr "&Вид:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Предупреждать о неверной подписи фиксации" @@ -1359,6 +1393,10 @@ msgstr "Cлово &целиком" msgid "&Within file" msgstr "&В файле" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "&Да" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Игнорировать изменения пробелов" @@ -1367,46 +1405,46 @@ msgstr "&Игнорировать изменения пробелов" msgid "&known changes" msgstr "&известные изменения" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(по умолчанию в TortoiseGit)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(от %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(не в группе изменений)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(без номера строки)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(нет значения)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(не найден)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(неизвестно)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- всё -" @@ -1414,13 +1452,14 @@ msgstr "- всё -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1428,7 +1467,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config в корне хранилища" @@ -1444,7 +1483,7 @@ msgstr ".gitignore в директориях, содержащих элемен msgid ".gitignore in the repository root" msgstr ".gitignore в корне хранилища" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig в корне хранилища" @@ -1460,31 +1499,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<Все ветви>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "<Автоматически создано в Git>" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "<Локальные Ветви>" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<вне ветви>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "<Разделитель>" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "<Неназванный>" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1493,66 +1532,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit - это расширение оболочки.\nЭто значит, что оно встроено в Проводник Windows.\nДля использования TortoiseGit откройте Проводник и щелкните правой кнопкой мыши на любой папке\nдля вызова контекстного меню, в котором можно найти все команды TortoiseGit.\nИ обязательно читайте руководство!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Предупреждение: Не проверено, полностью ли влиты эти ветви в ГОЛОВНУЮ." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." -msgstr "Предупреждение: Это действие удалит ветви в отдалённом хранилище." +msgstr "Предупреждение: Это действие удалит ветви во внешнем хранилище." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Предупреждение: Эта ветвь не полностью влита в ГОЛОВНУЮ." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "Текущая ГОЛОВНАЯ ветвь отсоединена, с которой вы работаете (нет ветви).\nВы хотите создать ветвь сейчас?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Вы действительно хотите удалить ВСЮ копилку?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Применение в копилку не удалось!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Забрать из копилки не удалось!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Копилка не удалась!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" -msgstr "предыдущий каталог перебазирования все еще существует в режиме применения перебазирования, но почтовый ящик уже выдан⏎\n⏎\nВы хотите" +msgstr "предыдущий каталог перебазирования все еще существует в режиме применения перебазирования, но почтовый ящик уже выдан\n\nВы хотите" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Применение в копилку не удалось, появились конфликты" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Забрать из копилки не удалось, появились конфликты" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Применение в копилку успешно" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Забралось из копилки успешно" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Копилка успешно создана" @@ -1560,7 +1599,7 @@ msgstr "Копилка успешно создана" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<новая группа изменений>" @@ -1572,71 +1611,71 @@ msgstr "<заполнитель>" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Ветвь с именем, совпадающем с введённым вами именем для метки уже существует (таким образом короткая ссылка двусмысленна).\nЭто может привести к проблемам и вам следует избегать подобной ситуации." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Ветка с таким именем уже существует." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "Процесс слияния активен, из-за чего эта фиксация будет фиксацией слияния. Чтобы прервать слияние, необходимо выполнить восстановление или сброс ветви." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Новая версия доступна. Вы можете скачать текущую версию!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Список путей, по одному в строке, где будут показываться пометки на значках.\r\nЕсли вы добавите '*' в конец пути, будут также включены все дочерние файлы и подпапки." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Список папок, в которых не будет показываться контекстные меню. По одной в строке.\nСимвол '*' в конец пути, исключает также все дочерние файлы и подпапки.\nПустой список разрешает контекстные меню во всех папках." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Список папок, в которых не будут показываться пометки на значках. По одной в строке.\nСимвол '*' в конец пути, исключает также все дочерние файлы и подпапки.\nПустой список разрешает пометки во всех папках." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Запрашиваемый ресурс был недоступен." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Метка с именем, совпадающем с введённым вами именем для ветви уже существует (таким образом короткая ссылка двусмысленна).\nЭто может привести к проблемам и вам следует избегать подобной ситуации." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Метка с таким именем уже существует." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Программа просмотра файлов различий GNU (файлов заплаток).\r\nЕсли у вас такой нет, можно использовать Блокнот." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "П&рервать" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&О программе" @@ -1652,11 +1691,11 @@ msgstr "Сокращать переименования" msgid "Abbreviated size" msgstr "Размер сокращений" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Прервать" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Прервать с&лияние" @@ -1664,11 +1703,11 @@ msgstr "Прервать с&лияние" msgid "Abort Merge" msgstr "Прервать слияние" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Прерывает процесс слияния." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "О программе" @@ -1688,12 +1727,12 @@ msgstr "О TortoiseGitMerge" msgid "Accept certificate" msgstr "Принять сертификат" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Доступ к %1 запрещен." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Действие" @@ -1701,26 +1740,26 @@ msgstr "Действие" msgid "Action log" msgstr "Журнал действий" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Действия" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Активировать список задач" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Текущие файлы" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Объекты ActiveX не могут быть сохранены во время завершения работы Windows!\nВы согласны потерять все изменения в %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Добавление" @@ -1728,28 +1767,28 @@ msgstr "Добавление" msgid "Add &Signed-off-by" msgstr "Добавить &Подписано" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Добавить '%s' в словарь" #. Resource IDs: (323) msgid "Add Remote" -msgstr "Добавить Отдалённый" +msgstr "Добавить Внешнее хранилище" #. Resource IDs: (1482) msgid "Add \"&Signed-off-by\"" msgstr "Добавить \"&Подписано\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" -msgstr "" +msgstr "Добавить ещё одну фиксацию?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Добавить программу просмотра различий для определённых расширений" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Добавить программу слияния для определённых расширений" @@ -1757,15 +1796,15 @@ msgstr "Добавить программу слияния для определ msgid "Add new files automatically to Git" msgstr "Добавлять новые файлы автоматически в Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Добавить в список &игнорирования" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Добавить к панели быстрого доступа" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Добавить..." @@ -1773,11 +1812,11 @@ msgstr "Добавить..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Добавить/Править программу различий/слияния для определённых расширений" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Добавлено" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1785,25 +1824,25 @@ msgid "" "to the ignore list." msgstr "Следующие шаблоны файлов\n%s\nдобавлены в список игнорирования." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Добавление" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Добавляет файл(ы) к управлению Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Добавляет выбранные файлы или маску файлов в список игнорирования" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Поправить настройки\nНастройки" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Дополнительно..." @@ -1811,43 +1850,43 @@ msgstr "Дополнительно..." msgid "Advanced Diff/Merge Settings" msgstr "Дополнительные настройки программ Различий/Слияния" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Дополнительные настройки программы просмотра различий" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Дополнительные настройки программы слияния" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Все" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Все команды" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Все файлы (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Все файлы (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Все предки" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Все локальные ветви" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Все ссылки" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Все метки" @@ -1855,80 +1894,80 @@ msgstr "Все метки" msgid "All tags only" msgstr "Только все метки" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Все ваши изменения будут потеряны! Вы действительно желаете выполнить сброс всех меню и панелей инструментов?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Все ваши изменения будут потеряны! Вы действительно желаете выполнить сброс клавиатурных назначений?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Все ваши изменения будут потеряны! Вы действительно желаете выполнить сброс меню '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Все ваши изменения будут потеряны! Вы действительно желаете выполнить сброс панели инструментов '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" -msgstr "Разрешить редактирование этого вида⏎\nРазрешить редактирование" +msgstr "Разрешить редактирование этого вида\nРазрешить редактирование" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Разрешить использовать свой URL Gravatar" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "Позволяет создать пустой коммит, в котором есть только комментарий коммита и нет файлов (cf. git commit --allow-empty)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Уже обновлено" #. Resource IDs: (1482) msgid "Always push to the selected remote archive for this local branch" -msgstr "Всегда отправлять в выбранное отдалённое хранилище архив для этой локальной ветви" +msgstr "Всегда отправлять в выбранное внешнее хранилище архив для этой локальной ветви" #. Resource IDs: (1485) msgid "Always push to the selected remote branch for this local branch" -msgstr "Всегда отправлять в выбранное отдалённое хранилище ветвь для этой локальной ветви" +msgstr "Всегда отправлять в выбранное внешнее хранилище ветвь для этой локальной ветви" #. Resource IDs: (1805) msgid "Always show long format" msgstr "Всегда показывать длинный формат" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Всегда использовать настройки локализации системы для отображения времени и даты" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Изменить" #. Resource IDs: (1555) msgid "Amend &Last Commit" -msgstr "Пересмотреть последний коммит" +msgstr "Пересмотреть крайнюю фиксацию" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Альтернативный редактор. Желательно с поддержкой завершения строк в стиле *nix." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1939,7 +1978,7 @@ msgid "" "%mine: the modified file" msgstr "Внешняя программа различий используется\r\nдля сравнения различных ревизий файлов\r\n\r\nВы можете указать в параметрах следующие пути:\r\n%base: базовый файл\r\n%mine: изменённый файл" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1952,34 +1991,34 @@ msgid "" "%base: the original file without your changes" msgstr "Внешняя программа слияния используется\r\nдля улаживания конфликтующих файлов.\r\n\r\nВы можете указать в параметрах следующие пути:\r\n%merged: конфликтующий файл, куда всё сохранять\r\n%theirs: файл, каков он в хранилище\r\n%mine: ваш файл, с вашими изменениями\r\n%base: оригинал файла, без ваших изменений" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "С %1 был связан неправильный файловый дескриптор." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Произошла неизвестная ошибка." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Произошла неизвестная ошибка при обращении к %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Неизвестный тип строки в строке номер %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Аннотированные метки" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Добавить сзади правый блок" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Добавить сзади этот блок слева" @@ -1991,11 +2030,11 @@ msgstr "Базовые меню приложения:" msgid "Apply &Patch..." msgstr "Применить &заплатку..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Применить серию заплаток..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Применить заплатку..." @@ -2003,7 +2042,7 @@ msgstr "Применить заплатку..." msgid "Apply Patches" msgstr "Применить заплатки" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Прменить серию присланных заплаток" @@ -2011,7 +2050,7 @@ msgstr "Прменить серию присланных заплаток" msgid "Apply unified diff" msgstr "Применение объединённых различий" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Аква стиль" @@ -2019,39 +2058,39 @@ msgstr "Аква стиль" msgid "Arabic" msgstr "Арабский" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "Произвольный &URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Вы уверены, что хотите восстановить состав столбцов?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Вы уверены, что хотите прервать процесс перемещения?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Вы уверены, что желаете пометить конфликтующие файлы как улаженные?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Вы действительно желаете убрать изменения в %d элементе(ах)? Вы потеряете все изменения с момента последнего обновления!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Уверены что нужно сохранять в \"%s\"?\nУ вас выбран другой источник!" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Выстроить по &вертикали" +msgid "Arrange &vertical\tV" +msgstr "Выстроить по &вертикали\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Внесено в группу изменений '%s'" @@ -2060,11 +2099,11 @@ msgstr "Внесено в группу изменений '%s'" msgid "Assigned to:" msgstr "Назначено на:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Предположить неизменённым" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Предположить годным/неизменённым" @@ -2076,34 +2115,34 @@ msgstr "Предположить годным/неизменённым (\"Нео msgid "At file &creation" msgstr "При &создании файла" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "При создании файла" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "До ревизии: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "В данный момент вы можете только переименовывать ветки." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Произведена попытка выполнить неподдерживаемую операцию." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Произведена попытка доступа к %1 за его окончанием." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Произведена попытка чтения из записываемого %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Произведена попытка записи в читаемый %1." @@ -2120,11 +2159,11 @@ msgstr "Аутентификация" msgid "Authentication data" msgstr "Данные аутентификации" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Автор" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Электропочта автора:" @@ -2132,7 +2171,7 @@ msgstr "Электропочта автора:" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Автор:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Авторы" @@ -2144,7 +2183,7 @@ msgstr "Авторы c учётом регистра" msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" -msgstr "Авторы:»Frank Li (lznuaa@gmail.com),⏎\n»»Sven Strickroth (email@cs-ware.de)" +msgstr "Авторы:»Frank Li (lznuaa@gmail.com),\n\t\tSven Strickroth (email@cs-ware.de)" #. Resource IDs: (65535) msgid "Auto CrLf convert" @@ -2154,11 +2193,11 @@ msgstr "Автоматическое преобразование заверше msgid "Auto Crlf:" msgstr "Авто Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Скрывать автоматически" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Автоскрывать все" @@ -2166,23 +2205,23 @@ msgstr "Автоскрывать все" msgid "Auto&Crlf" msgstr "Авто&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Автозакрытие при отсутствии конфликтов" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Автозакрытие при отсутствии ошибок" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Авто-закрыть если более недоступно никаких опций" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Автозакрытие если не было слияний, добавлений или удалений" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2196,7 +2235,7 @@ msgstr "Автоматически использовать ключ" msgid "Autoload Putty &Key" msgstr "Автоматически использовать ключ" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Авто" @@ -2216,7 +2255,7 @@ msgstr "В среднем" msgid "B&rowse..." msgstr "О&бзор..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Назад" @@ -2228,7 +2267,7 @@ msgstr "Фон" msgid "Baltic" msgstr "Балтийский" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Гистограмма" @@ -2248,7 +2287,7 @@ msgstr "Базовый файл:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Основано на TortoiseIDiff из проекта TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Основная информация" @@ -2260,45 +2299,45 @@ msgstr "Между файлами:" msgid "Big5 (Traditional)" msgstr "Big5 (Традиционный китайский)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Сломанный коммит" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Исправный коммит" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Отменить бинарный поиск" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Начать бинарный поиск" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Растровое изображение\nрастровое изображение" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Черный стиль" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Авторство" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Ошибка авторства" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Авторство предыдущих ревизий" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Показывает для каждой строки файла её автора" @@ -2306,26 +2345,30 @@ msgstr "Показывает для каждой строки файла её а msgid "Blend alpha" msgstr "Альфа-сопряжение" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Синий стиль" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Тело" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Были указаны оба параметра: /logmsg и /logmsgfile!\nМожет быть указан только один из них." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Путь к файлу-заплатке и путь назначения должны быть аболютными путями!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Вид снизу:" @@ -2337,30 +2380,30 @@ msgstr "Об&зор..." msgid "Branc&h:" msgstr "Ветвь:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Ветвь" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Ветвь %s отстает от %s\n%s и может быть перемотано на %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Ветвь (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Имя ветви" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Неправильное имя ветви/метки " -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Имя ветви/метки не должно быть пустым или неправильным." @@ -2372,11 +2415,11 @@ msgstr "Ветвь:" msgid "Bro&wse" msgstr "Просмотреть" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Обзор Ссылок" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Выбрать внешнюю программу различий" @@ -2388,7 +2431,7 @@ msgstr "Обзор ссылок" msgid "Browse..." msgstr "Обзор..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID ошибки" @@ -2400,7 +2443,7 @@ msgstr "&Выражение ID ошибки:" msgid "Bug-ID/Issue-Nr:" msgstr "ID ошибки/N проблемы:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "ID ошибок" @@ -2416,7 +2459,7 @@ msgstr "Bugtraq тестер регулярных выражений - TortoiseG msgid "Button Appearance" msgstr "Внешний вид кнопки" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2432,7 +2475,7 @@ msgstr "Проверить" msgid "C&ommands:" msgstr "Ко&манды:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "С&оздать ветвь/метку из ревизии" @@ -2440,11 +2483,11 @@ msgstr "С&оздать ветвь/метку из ревизии" msgid "C&urrent Keys:" msgstr "Текущие &клавиши:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "В&ырезать" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2460,11 +2503,11 @@ msgstr "Подсчитать" msgid "Can double-click in log list to compare with previous revision" msgstr "Включить сравнение ревизии в списке с предыдущей по двойному щелчку" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Невозможно активировать статический объект ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2473,80 +2516,80 @@ msgid "" "%s" msgstr "Не могу скопировать \n%s\nв\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Невозможно скопировать растровое изображение в буфер обмена!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Невозможно создать новое изображение!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Невозможно настроить меню!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Невозможно вставить растровое изображение из буфера обмена!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Отмена" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" -msgstr "Отменить⏎\nНе выходить из TortoiseGitMerge" +msgstr "Отменить\nНе выходить из TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "Отменить⏎\nНе переключать виды" +msgstr "Отменить\nНе переключать виды" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "Отменить⏎\nОставить пустой файл." +msgstr "Отменить\nОставить пустой файл." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "Отменить⏎\nСначала разрешить конфликты." +msgstr "Отменить\nСначала разрешить конфликты." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" -msgstr "Отмена⏎\nОставить текущие файлы" +msgstr "Отмена\nОставить текущие файлы" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" -msgstr "Отмена⏎\nОставить текущие настройки" +msgstr "Отмена\nОставить текущие настройки" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Невозможно объединить коммиты сейчас.\nУбедитесь что вы просматриваете журнал вашей текущей ветви и не применено ни одного фильтра." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Невозможно принудительно обновить текущую ветвь. Используйте команду reset если вы хотите так поступить." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Невозможно показать авторство: \"%s\" не отслеживается git-ом." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Невозможно отобразить различия из-за несогласующихся переводов строк в файле." @@ -2558,7 +2601,7 @@ msgstr "Каска&дом" msgid "Cascaded context menu" msgstr "Вложенное контекстное меню" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "С учётом регистра" @@ -2582,33 +2625,33 @@ msgstr "Верификация сертификата завершена неу msgid "Change log" msgstr "Журнал изменений" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Изменить принтер и настройки печати\nНастройка печати" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Изменить настройки печати\nНастройки страницы" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Изменить стиль приложения\nИзменить стиль" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Изменить позицию окна" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Изменить размер окна" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Изменить тип" @@ -2616,38 +2659,38 @@ msgstr "Изменить тип" msgid "Changed Files" msgstr "Изменённые файлы" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Изменённые файлы между %s и %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Изменённые файлы между %s, %s и %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Изменённых файлов: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Изменённые линии включая добавленные/удалённые файлы" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Изменённые линии включая добавленные/удалённые файлы по дате" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Изменённые линии не включая добавленные/удалённые файлы" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Изменённые линии не включая добавленные/удалённые файлы по дате" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Группа изменений %s перемещена" @@ -2656,7 +2699,7 @@ msgstr "Группа изменений %s перемещена" msgid "Changes made (double-click on file for diff):" msgstr "Произведённые изменения (различия - по двойному щелчку на файле):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Изменяет стиль приложения" @@ -2664,7 +2707,7 @@ msgstr "Изменяет стиль приложения" msgid "Char position where to show a border line in commit text boxes:" msgstr "Ограничение длинны строки в диалоге фиксации. Будет отображаться вертикальная черта." -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Отметить" @@ -2676,31 +2719,31 @@ msgstr "Проверить наличие обновлений - TortoiseGit" msgid "Check For Updates..." msgstr "Проверить обновления..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Проверить на наличие изменени&й" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Проверьте введенные путь и/или URL." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Отметьте пункты меню, которые будут отображаться в основном контекстном меню, а не в подменю TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Отметьте пункты меню, которые будут отображаться только в расширенном контекстном меню (SHIFT + щелчок левой кнопкой мыши)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Отметьте чтобы отображать сколько прошло времени со дня изменения вместо указания конкретной даты" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Отметьте для использования более короткого формата даты и времени в сообщениях журнала." @@ -2708,31 +2751,31 @@ msgstr "Отметьте для использования более корот msgid "Check:" msgstr "Отметить:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Извлечение" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "Извлечение со слиянием" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Пересмотреть" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Пересмотр не удался" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Пересмотреть выбранные фиксации..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Пересмотреть эту фиксацию..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Пересмотр неудачен! Пропустить эту фиксацию?" @@ -2740,11 +2783,11 @@ msgstr "Пересмотр неудачен! Пропустить эту фик msgid "Chinese" msgstr "Китайский" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Выбрать хранилище" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Обратный хронологический порядок (по умолчанию в git)" @@ -2756,78 +2799,78 @@ msgstr "Очистить" msgid "Clean Type" msgstr "Тип очистки" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Удалить навсегда" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Удалить в мусорную корзину" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" -msgstr "Очистить от устаревших ветвей" +msgstr "Очистить от устаревших внешних ветвей" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Производится очистка" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Производится очистка." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Очистке не удалось обработать следующие пути:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Очистка успешно обработала следующие пути:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Очистить" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Инструмент очистки\nОчистка" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Очищает %ld URL, сохранённых для %ld рабочих копий" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Очищает %ld сообщений журнала, сохранённых для %ld рабочих копий" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Очищает %ld пар(ы) имя-пользователя/пароль, %ld сертификатов ssl и %ld имён пользователей" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Очищает кэш сообщений журнала из %ld хранилищ(а)" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Очищает все сохраненные данные аутентификации.\r\nВам нужно будет заново ввести имя-пользователя/пароль для всех хранилищ." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Очищает сохранённые размеры и расположение %ld диалогов" @@ -2836,7 +2879,7 @@ msgstr "Очищает сохранённые размеры и располож msgid "Click here to go to the website" msgstr "Щёлкните здесь для перехода на web-сайт" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Нажмите для выбора из недавно введённых сообщений" @@ -2852,17 +2895,17 @@ msgid "" "extension" msgstr "Нажмите на \"Дополнительно...\" для указания дополнительных программ слияния в зависимости от расширения файла" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Нажмите чтобы увидеть команды для перемещения блоков текста\nИспользовать текстовые блоки" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Буфер обмена" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Клонировать" @@ -2870,7 +2913,7 @@ msgstr "Клонировать" msgid "Clone Existing Repository" msgstr "Клонировать существующее хранилище" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Клонировать хранилище" @@ -2878,49 +2921,49 @@ msgstr "Клонировать хранилище" msgid "Clone into Bare Repo" msgstr "Клонировать в голый репозиторий" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Клонировать..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Закрыть" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Выйти из полноэкранного" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Закрыть предварительный просмотр\n&Закрыть" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Закрывать вручную" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Закрыть предпросмотр печати\nОтменить предпросмотр" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Закрыть текущий документ\nЗакрыть" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Закрывает активное окно и приглашает сохранить документы" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Свернуть" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2946,7 +2989,7 @@ msgstr "Цвета:" msgid "Combine One Mail" msgstr "Объединить в одну почту" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Объединить в одну фиксацию" @@ -2954,11 +2997,11 @@ msgstr "Объединить в одну фиксацию" msgid "Comman&ds:" msgstr "Ко&манды:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Команда" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Командная строка" @@ -2966,7 +3009,7 @@ msgstr "Командная строка" msgid "Command Line To Execute:" msgstr "Командная строка для выполнения:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Сбой при выплнении команды." @@ -2974,41 +3017,41 @@ msgstr "Сбой при выплнении команды." msgid "Commands" msgstr "Команды" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Фиксация" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "Фиксация %s НЕ видна сейчас." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Фиксация %s не найдена в \"%s\". Обновить подмодуль сейчас?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Дата фиксации" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Почта фиксации" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Фиксация завершена" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Информация о фиксации" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Сообщение фиксации" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Название фиксации" @@ -3016,7 +3059,7 @@ msgstr "Название фиксации" msgid "Commit Ordering:" msgstr "Порядок фиксаций:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Фиксировать супер проект" @@ -3024,19 +3067,19 @@ msgstr "Фиксировать супер проект" msgid "Commit to:" msgstr "Фиксировать в:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Фиксировать..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Фиксации по автору" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Фиксации по дате" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Фиксаций (в %s):" @@ -3045,15 +3088,15 @@ msgstr "Фиксаций (в %s):" msgid "Commits each week:" msgstr "Фиксаций в неделю:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Фиксирует ваши изменения в хранилище" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Почта фиксирующего" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3065,52 +3108,52 @@ msgstr "Фиксация неверсированной папки не доба msgid "Common Name:" msgstr "Общее имя:" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Сравнить &ГОЛОВНЫЕ ревизии" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Сравнить выбранные ссылки" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Сравнить два файла" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Сравнивать непечатаемые знаки" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Сравнить с &рабочей копией" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Сравнить с б&азой" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Сравнить с предыдущей ревизией" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Сравнивает все непечатаемые знаки при поиске различий\nСравнивать непечатаемые знаки" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" -msgstr "Сравнивает файл с последней зафиксированной ревизией для показа сделанных вами изменений" +msgstr "Сравнивает файл с крайней зафиксированной ревизией для показа сделанных вами изменений" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Сравнение %s с %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Завершено" @@ -3126,7 +3169,7 @@ msgstr "Показывать настройки" msgid "Config type:" msgstr "Тип конфигурации:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Настроить Фильтры регулярных выражений" @@ -3160,11 +3203,11 @@ msgstr "Настройка программы просмотра файлов р msgid "Confirm to kill running git process" msgstr "Подтвердите принудительную остановку процесса git" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Конфликт" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Конфликтующие файлы" @@ -3172,15 +3215,15 @@ msgstr "Конфликтующие файлы" msgid "Conflict resolved" msgstr "Улаженный конфликт" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Конфликтующее" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Конфликты" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Конфликты: %d" @@ -3193,98 +3236,98 @@ msgstr "Контекстные меню:" msgid "Context lines for patches" msgstr "Контекстные строки для исправлений" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Продолжить" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Сжать присоединённое окно" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Преобразовать пробелы в табуляцию" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Преобразовать табуляцию в пробелы" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Копи&ровать" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Скопировано" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Копия" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Копирование %s в %s, ревизия %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Копировать SHA-1 в буфер обмена" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Инструмент копирования\nКопия" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Скопировать всю информацию в буфер обмена" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Копирование с переименованием" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Копировать журнал сообщений в буфер обмена" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Копировать запись журнала" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Скопировать пути в буфер обмена" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Скопировать имена ветвей" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Копировать выбранное в буфер о&бмена" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Скопировать выбранное в буфер обмена\nКопировать" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Копировать в буфер обмена" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Копирование: Новое имя для %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Копирование %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Копирование..." @@ -3292,25 +3335,25 @@ msgstr "Копирование..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "© TortoiseGit, 2009-2015" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Исправления" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Не могу добавить %s в список игнорирования!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Не могу произвести проверку на наличие новой версии!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "Не могу проверить наличие новой версии! %s (Код ошибки: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3318,76 +3361,76 @@ msgid "" "%s" msgstr "Не могу скопировать файлы!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Невозможно создать %1, поскольку папка полна." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" -msgstr "Не могу определить последнюю зафиксированную ревизию!" +msgstr "Не могу определить крайнюю зафиксированную ревизию!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Не могу найти родительский модуль" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Не могу получить статус!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Невозможно открыть %1, поскольку уже открыто слишком много файлов." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Не могу открыть файл\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Невозможно удалить %1, поскольку это текущая папка." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Не могу удалить %s из списка игнорирования" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Невозможно восстановить состояние изначальной фиксации (первый шаг). Прерываю операцию..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." -msgstr "Невозможно восстановить состояние последней фиксации (второй шаг). Прерываю операцию..." +msgstr "Невозможно восстановить состояние крайней фиксации (второй шаг). Прерываю операцию..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Невозможно восстановить оригинальную ГОЛОВНУЮ ветвь." -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Не могу получить URL файла!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Не могу получить ревизию %s файла %s.\nНевозможно применить заплатку!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Не могу запустить TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3395,7 +3438,7 @@ msgid "" "%s" msgstr "Не могу запустить просмотр изменений!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3403,7 +3446,7 @@ msgid "" "%s" msgstr "Не могу запустить внешнюю программу просмотра различий!\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3411,11 +3454,11 @@ msgid "" "%s" msgstr "Не могу запустить внешнюю программу слияния!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Не могу запустить задание на печать." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3423,11 +3466,11 @@ msgid "" "%s" msgstr "Не могу запустить программу для просмотра текста!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Не могу запустить Putty Agent (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Не могу запустить поток!" @@ -3435,7 +3478,7 @@ msgstr "Не могу запустить поток!" msgid "Coun&t" msgstr "Под&счёт" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "Подсчёт: %u совпадений." @@ -3448,15 +3491,15 @@ msgstr "Создать &библиотеку" msgid "Create .gitignore file" msgstr "Создать файл .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Создать ветвь" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Создать ветвь из этой версии..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Создать ветвь..." @@ -3468,29 +3511,29 @@ msgstr "Создать группу изменений" msgid "Create New Branch" msgstr "Создать новую ветвь" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Создать серию заплаток" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Создать метку" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Создать метку на для версии..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Создать метку..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Создать новый документ\nНовый" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3499,49 +3542,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Создать поверхностный клон хранилища с урезанной историей, содержащей указанное число ревизий. Поверхностное хранилище имеет ряд ограничений (вы не сможете ни клонировать ни извлекать из него, ни отправлять из или в него), но такое хранилище подойдет в случае если вам интересна только недавняя история большого проекта с длинной историей, и вы предполагаете посылать в него фиксации в виде патчей." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Создать файл заплатки" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Создать запрос-получение" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Создать здесь &хранилище..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Создан" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Создать ветвь или метку" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Создает папку библиотеки со специальными настройками для рабочих копий Git" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Создаёт файл заплатки из различий между двумя файлами\nСоздать файл заплатки" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Создает базу данных хранилища в этом месте" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Создает файл объединённых различий со всеми изменениями, которые вы сделали" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Создаю запрос-получение..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Удостоверяющий центр не может быть пустым." @@ -3553,7 +3596,7 @@ msgstr "Удостоверяющий центр:" msgid "Credentials" msgstr "Удостоверения" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "В&ырезать" @@ -3561,7 +3604,7 @@ msgstr "В&ырезать" msgid "Current" msgstr "Текущий" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Текущая ветвь" @@ -3569,7 +3612,7 @@ msgstr "Текущая ветвь" msgid "Current Branch:" msgstr "Текущая ветвь:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3581,7 +3624,7 @@ msgstr "Текущая ветвь %s в актуальном состоянии\ msgid "Current version is:" msgstr "Текущая версия:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Текущая версия: %s" @@ -3594,7 +3637,7 @@ msgstr "На&строить..." msgid "Custom" msgstr "Собственные" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Настроить" @@ -3602,19 +3645,19 @@ msgstr "Настроить" msgid "Customize Keyboard" msgstr "Настроить клавиатуру" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Настроить панель быстрого доступа" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Настроить панель быстрого доступа..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Персонализировать..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3628,123 +3671,127 @@ msgstr "Кирилица" msgid "DCommit Type" msgstr "Тип фиксации в SVN" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Демон" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Дата" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" -msgstr "Дата последней фиксации" +msgstr "Дата крайней фиксации" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "По умолчанию" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Меню по умолчанию" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Меню приложения по умолчанию. Показывается, когда не открыто ни одного документа." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "Ограничение по умолчанию для сообщений журнала:" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Использовать кодировку UTF-8 по умолчанию" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Удалить" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Удаление %d ветвей" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" -msgstr "Удаление %d отдалённых ветвей" +msgstr "Удаление %d внешних ветвей" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Удалить %d метки" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Удалить локально" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Удалить ссылку..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Удалить все метки" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Удалить и игнорировать %d &элементов по имени" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Удалить и добавить в список &игнорирования" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Удалить и игнорировать %d элементов по рас&ширению" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Удаление ветви" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Удалить ветвь/метку" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" -msgstr "Удаление отдалённой ветви" +msgstr "Удалить внешнюю ветвь" #. Resource IDs: (4579) msgid "Delete remote tag - TortoiseGit" -msgstr "Удалить отдалённую метку - TortoiseGit" +msgstr "Удалить внешнюю метку - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." -msgstr "Удалить отдаленные метки у \"%s\"..." +msgstr "Удалить внешние метки у \"%s\"..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." -msgstr "Удалить отдалённые метки..." +msgstr "Удалить внешние метки..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Удалить подмодуль" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Удалить метку" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Удалите существующую ветвь или используйте другое имя." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "Удалить⏎\nФайл удалён." +msgstr "Удалить\nФайл удалён." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Удалено" @@ -3752,38 +3799,38 @@ msgstr "Удалено" msgid "Deleted merge conflict" msgstr "Удалить конфликты слияния" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Удаляет и добавляет выбранные файлы или маску файлов в список игнорирования" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Удаляет файлы/папки из-под управления версиями" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Удаляет файлы/папки из-под управления версиями без удаления самих файлов" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Удаляет файл журнала действий" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Удаление" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Удаление кэшированных данных" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Удаление файла" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." -msgstr "Удаляются отдалённые ссылки..." +msgstr "Удаляем внешние ссылки..." #. Resource IDs: (65535) msgid "Delivery:" @@ -3801,7 +3848,7 @@ msgstr "Описать" msgid "Describe Strategy" msgstr "Описать стратегию" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Описание" @@ -3809,7 +3856,7 @@ msgstr "Описание" msgid "Description:" msgstr "Описание:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Разотметить группу изменений" @@ -3817,33 +3864,33 @@ msgstr "Разотметить группу изменений" msgid "Destination" msgstr "Назначение" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Диск назначения полон." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Обнаружить и выделить перемещённые блоки" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Обнаружить перемещённые и скопированные строки у существующих файлов в любой фиксации" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Обнаружить перемещённые и скопированные строки у существующих файлов в той фиксации, в которой целевой файл был создан" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Обнаружить перемещённые и скопированные строки у файлов, изменённых в одной и той же фиксации" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Обнаружить перемещённые или скопированные строки в пределах файла" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3857,11 +3904,15 @@ msgstr "Размеры и расположение окон" msgid "Dialogs" msgstr "Диалоги" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Настройки сравнения" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Сравнение двух фиксаций" @@ -3893,7 +3944,7 @@ msgstr "Файл различий:" msgid "Diff header" msgstr "Заголовок сравнения" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Различия позже" @@ -3905,12 +3956,12 @@ msgstr "Позиция сравнения" msgid "Diff removed lines" msgstr "Сравнить удалённые линии" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Различия с файлом \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Различие с предком %d" @@ -3923,19 +3974,19 @@ msgstr "Различие между" msgid "Diffing" msgstr "Сравнение" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Сравниваются фиксации" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" -msgstr "Сравнивает файл в рабочей копии с его же версией перед последней фиксацией." +msgstr "Сравнивает файл в рабочей копии с его же версией перед крайней фиксацией." -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Сравнивает две различные фиксации" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Папка..." @@ -3947,26 +3998,26 @@ msgstr "Папка:" msgid "Disable sounds" msgstr "Отключить звуки" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Отключите эту опцию, если у вас действительно большие рабочие копии и происходит\r\nслишком интенсивное обращение к диску при обзоре рабочей копии." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Выключить проверку обновлений" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Отключено" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Диск полон при обращении к %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Выбросить исключение: %1" @@ -3975,44 +4026,52 @@ msgstr "Выбросить исключение: %1" msgid "Display &buttons in this order" msgstr "Показывать &кнопки в этом порядке" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Отобразить страницы полностью\nНапечетать предпросмотр" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Показать справку по щелкаемым кнопкам, меню и окнам\nСправка" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Показать справку по текущей задаче или команде\nСправка" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Показать инструкции по использованию справки\nСправка" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Показать информацию о программе, номер версии и авторские права\nО программе" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "Отобразить тему и содержимое сообщений фиксаций" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "&Не показывать больше это предупреждение (если выбрано Продолжить)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "&Не показывать это предупреждение снова (если выбрано Игнорировать)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "Не делать автовыбор \"пропущенных\" файлов (удалённых, но не подготовленных в таком состоянии к фиксации)" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Не выбирать подмодули автоматически" @@ -4025,54 +4084,71 @@ msgstr "Не показывать контекстное меню для сле msgid "Do not use recycle bin" msgstr "Удалять сразу, без корзины" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Вы действительно хотите удалить %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Вы действительно желаете удалить панель инструментов '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "Вы действительно хотите отменить автоматическую проверку обновлений для TortoiseGit?\n\nАвтоматическая проверка обновлений может быть включена в настройках TortoiseGit на Главной странице." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Вы действительно хотите пометить выбранный файл(ы) как предположительно-годный?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Вы действительно хотите пометить выбранные файл(ы) как опустить-в-рабочей-копии?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Вы действительно желаете переместить этот файл или папку?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Вы действительно хотите навсегда удалить %d выбранных ссылок? Они НЕ смогут быть восстановлены!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "Вы действительно хотите удалить \"%s\" из индекса?" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Вы действительно хотите удалить \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "Вы действительно хотите удалить %d выбранных файлов/каталогов из индекса?" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "Вы действительно хотите удалить %d выбранных файлов/каталогов?" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Вы действительно хотите восстановить копию? Будут потеряны все изменения которые вы сделали после создания копии." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4080,29 +4156,29 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Вы действительно хотите откатить все изменения в\n%s\nи вернуться обратно к этой ревизии? Обратное слияние ревизий откатит все ваши изменения в рабочей копии." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" "%s\n" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." -msgstr "Действительно хотите откатить все изменения в⏎ %s⏎ и вернуться к этой ревизии? Эти изменения будут откачены с помощью reverse-merging ревизии в Вашу рабочую копию." +msgstr "Действительно хотите откатить все изменения в\n%s\nи вернуться к этой ревизии? Эти изменения будут откачены с помощью reverse-merging ревизии в Вашу рабочую копию." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "Вы действительно хотите снять установленный флаг с выбранного файла(ы) как опустить-в-рабочей-копии или предположительно-неизменённый?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" -msgstr "Вы хотите забрать отдалённые ветви из нового добавленного отдалённого хранилища?" +msgstr "Вы хотите забрать внешние ветви из вновь добавленного внешнего хранилища?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Хотите ли загрузить измененные файлы?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4110,21 +4186,21 @@ msgid "" "as resolved?" msgstr "Хотит пометить файл\n%s\nкак улаженный?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Вы действительно желаете восставить автосохранённые документы?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Желаете ли вы перезагрузить документы для отображения изменений в настройках?\nВнимание: вы потеряете все сделанные изменения!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "ВЫ хотите посмотреть изменения?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Вы хотите забрать из копилки сейчас?" @@ -4132,42 +4208,42 @@ msgstr "Вы хотите забрать из копилки сейчас?" msgid "Document :" msgstr "Документ:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Неясно что будет отправлено так как ветвь \"%s\" неизвестна." -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Неясно что отправлять поскольку вы ввели URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Не восстанавливать авто-сохранённые документы\nИспользовать последние сохранённые версии документов" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" -msgstr "Не сохранять⏎\nЗакрыть виды без сохранения изменений" +msgstr "Не сохранять\nЗакрыть виды без сохранения изменений" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "Не сохранять⏎\nПерезагрузить виды без сохранения изменений" +msgstr "Не сохранять\nПерезагрузить виды без сохранения изменений" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" msgstr "Не показывать выбранные элементы: (отображаются при удерживании shift)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Больше не показывать это сообщение" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Готово" @@ -4179,7 +4255,7 @@ msgstr "Вниз" msgid "Download" msgstr "Скачать" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Перетащите, чтобы сделать это меню плавающим" @@ -4207,6 +4283,10 @@ msgstr "Пустая кнопочная форма" msgid "Dumy Group For locat TabCtr" msgstr "Пустая группа для локального TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "Р&едактировать невыбранное" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Исключить пути:" @@ -4215,7 +4295,7 @@ msgstr "&Исключить пути:" msgid "E&xit" msgstr "В&ыход" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Экспорт..." @@ -4235,11 +4315,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Восточная Европа" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Поправить" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Редактировать &глобальный .gitconfig" @@ -4255,23 +4335,23 @@ msgstr "Редактироовать .tgitconfig" msgid "Edit Button Image" msgstr "Редактировать изображение на кнопке" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Редактировать заметки" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Изменить автора" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Редактировать описание" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Редактировать программу различий для конкретных расширений" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Редактировать программу слияния для конкретных расширений" @@ -4283,11 +4363,11 @@ msgstr "Глобальный конфиг" msgid "Edit global &XDG git/config" msgstr "Редактировать глобальный &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Редактировать локальные настройки git" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Редактировать сообщение журнала" @@ -4301,31 +4381,31 @@ msgstr "Поправить..." #. Resource IDs: (1827) msgid "Edit/Split commit" -msgstr "" +msgstr "Редактировать/разделить фиксацию" #. Resource IDs: (1770) msgid "Effective" msgstr "Итог" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Введите имя либо IP-адрес прокси-сервера" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Инструмент эллипс\nЭллипс" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Эл.почта" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Эл.почта основного получателя и получателя копии не могут быть пустыми одновременно." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Электропочты" @@ -4333,7 +4413,7 @@ msgstr "Электропочты" msgid "Empty" msgstr "Отсутствующее" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Разрешить редактирование" @@ -4349,7 +4429,7 @@ msgstr "Включить Gravatar" msgid "Enable drag context menu" msgstr "Включить перетаскиваемое контекстное меню" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Разрешить загружать/сохранять файлы кэша журнала (tortoisegit.data, tortoisegit.index)" @@ -4358,10 +4438,14 @@ msgstr "Разрешить загружать/сохранять файлы кэ msgid "Enable log cache" msgstr "Включить кэш" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Отображать Gravatar'ы в журнале" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "Включить подсветку синтаксиса" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Используемые пометки" @@ -4370,35 +4454,35 @@ msgstr "Используемые пометки" msgid "Encode" msgstr "Кодировать" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Кодировка" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Случилась аппаратная ошибка ввода/вывода при обращении к %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Обнаружено нарушение блокировки при обращении к %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Обнаружено нарушение общего доступа при обращении к %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Обнаружен неправильный аргумент." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Случилась неожиданная ошибка при чтении %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Случилась неожиданная ошибка при записи %1." @@ -4411,11 +4495,11 @@ msgstr "Шифрование" msgid "End" msgstr "Конец" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Стиль конца строки" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Увеличить окно до полного размера" @@ -4423,23 +4507,23 @@ msgstr "Увеличить окно до полного размера" msgid "Enter Log Message" msgstr "Ввод сообщения журнала" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Введите URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Введите GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Введите денежное значение." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Введите дату и/или время." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Введите дату." @@ -4447,33 +4531,33 @@ msgstr "Введите дату." msgid "Enter a name for the changelist:" msgstr "Введите имя для группы изменений:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Введите число между %1 и %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Введите число." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Введите положительное целое." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Введите время." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Введите целое число между %1 и %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Введите целое число между 0 и 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Введите целое число." @@ -4485,7 +4569,7 @@ msgstr "Введите содержимое файла для проверки:" msgid "Enter log &message:" msgstr "Введите &сообщение журнала:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Введите не более %1 символов." @@ -4494,43 +4578,43 @@ msgstr "Введите не более %1 символов." msgid "Enter the regex string below:" msgstr "Введите строку регулярного выражения:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Стереть все\nСтереть все" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Стереть выбранное\nСтереть" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Ошибка" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Ошибка при восстановлении кэша значков оболочки!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "Ошибка проверки сертификата сервера для \"%s\":" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Ошибка при чтении/записи ключа реестра %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Всё обновленно." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4540,28 +4624,28 @@ msgstr "Исполняемые (*.exe)|*.exe|Командные (*.com)|*.com|И msgid "Executable (+x)" msgstr "Выполняемый (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Существующий" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Выход" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Раскрыть (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Развернуть присоединённое окно" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Открыть в Проводнике" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Экспорт" @@ -4569,36 +4653,36 @@ msgstr "Экспорт" msgid "Export Zip File" msgstr "Сохранить в Zip-файл" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Папка экспорта:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Экспортировать выбранное в..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Экспортировать эту версию..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Экспортировать также и неверсированные файлы" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Экспортирование %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Экспортирование..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Экспортировать ревизию в zip файл" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Расширение" @@ -4614,7 +4698,7 @@ msgstr "Расширение:" msgid "Extern DLL Path:" msgstr "Путь к dll:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Внешнее" @@ -4622,101 +4706,101 @@ msgstr "Внешнее" msgid "External Program:" msgstr "Внешняя программа:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Замер" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Неудача" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Не удалось откатить" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Не удалось извлечь файл \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Не удалось переключить файл \"%s\" фиксации %s на \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Не удалось соединиться.\nВозможно, неправильная ссылка." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Не удалось преобразовать объект ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Не удалось создать пустой документ." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Не удалось создать объект. Убедитесь, что приложение заведено в реестр системы." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Ошибка в создании запроса-получения" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Не удалось получить базовый файл." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Не удалось получить файл слияния." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Не удалось запустить справку." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Не удалось запустить серверное приложение." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Не удалось открыть документ." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Не удалось выполнить действие на сервере." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Не удалось сохранить документ." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Не удалось создать/ликвидировать группу изменений '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Не удалось запустить поставщика системы отслеживания проблем '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Не удалось дождаться завершения загрузки ключа в Putty Agent." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Неудача!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Перемотка" @@ -4724,62 +4808,62 @@ msgstr "Перемотка" msgid "Fast Forward o&nly" msgstr "Только перемотка" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Перемотка на %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "Извле&чь" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Извлечь" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Извлечь && Пере&базировать" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Извлечь из хранилища SVN" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Извлечь из \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Извлечь и пере&базировать" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Извлечь..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Извлекается статус..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Извлекаются изменённые файлы..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Извлечение файла..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Извлечение ревизии %s файла" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Файл" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Кодировка файла" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Изменений файлов (в %s):" @@ -4788,27 +4872,27 @@ msgstr "Изменений файлов (в %s):" msgid "File changes each week:" msgstr "Изменений файлов в неделю:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Файловые различия" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Файл не имеет конфликтов" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Файл пустой." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Cписок файлов пуст" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Заплатки файла" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4820,7 +4904,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксел(ов)\nВысота:\t\t\t%ld пиксел(ов)\nРазреш. по горизонтали:\t%.1f dpi\nРазреш. по вертикали:\t%.1f dpi\nГлубина цвета:\t\t%d бит\nУвеличение:\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4840,7 +4924,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксел(ов)\nВысота:\t\t\t%ld пиксел(ов)\nРазреш. по горизонтали:\t%.1f dpi\nРазреш. по вертикали:\t%.1f dpi\nГлубина цвета:\t\t%d бит\nУвеличение:\t\t%d%%\n\nРазмер файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксел(ов)\nВысота:\t\t\t%ld пиксел(ов)\nРазреш. по горизонтали:\t%.1f dpi\nРазреш. по вертикали:\t%.1f dpi\nГлубина цвета:\t\t%d бит\nУвеличение:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4852,7 +4936,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксел(ов)\nВысота:\t\t\t%ld пиксел(ов)\nРазреш. по горизонтали:\t%.1f dpi\nРазреш. по вертикали:\t%.1f dpi\nГлубина цвета:\t\t%d бит\nУвеличение:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4872,7 +4956,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Размер файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксел(ов)\nВысота:\t\t\t%ld пиксел(ов)\nРазреш. по горизонтали:\t%.1f dpi\nРазреш. по вертикали:\t%.1f dpi\nГлубина цвета:\t\t%d бит\nУвеличение:\t\t%d%%\n\nРазмер файла:\t\t%s (%s)\nШирина:\t\t\t%ld пиксел(ов)\nВысота:\t\t\t%ld пиксел(ов)\nРазреш. по горизонтали:\t%.1f dpi\nРазреш. по вертикали:\t%.1f dpi\nГлубина цвета:\t\t%d бит\nУвеличение:\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Имя файла" @@ -4880,17 +4964,17 @@ msgstr "Имя файла" msgid "Files" msgstr "Файлы" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Инструмент заливки\nЗаливка" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Фильтр по" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Фильтр путей" @@ -4902,11 +4986,11 @@ msgstr "Фильтр:" msgid "Filter: " msgstr "Фильтр:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Найти" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4916,17 +5000,17 @@ msgstr "Найти текст\nНайти" msgid "Find:" msgstr "Найти:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Найти: не найден текст \"%s\"" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Найти: Первое вхождение снизу найдено. Достигнуто начало документа." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Найти: Первое вхождение сверху найдено. Достигнут конец документа." @@ -4934,23 +5018,23 @@ msgstr "Найти: Первое вхождение сверху найдено. msgid "Fingerprints" msgstr "Отпечатки пальцев" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Завершить" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Перебазирование завершено." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Закончено!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Первый предок" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Только первый предок" @@ -4959,18 +5043,18 @@ msgid "First known &bad:" msgstr "Первый неудачный:" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Подогнать &высоты изображений" +msgid "Fit image &heights\tH" +msgstr "Подогнать &высоты изображений\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Подогнать &ширину изображений" +msgid "Fit image &widths\tW" +msgstr "Подогнать &ширину изображений\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Гибкие диски (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Папка" @@ -4982,38 +5066,34 @@ msgstr "Отслеживать переименования" msgid "Font" msgstr "Шрифт" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Для справки нажмите F1. Для горизонтальной прокрутки используйте Ctrl+колёсико прокрутки" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Для получения полного списка разотметьте 'Остановиться на копировании/переименовании'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Принудительно" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Принудительное создание ветви/метки, даже если уже существует другая с таким же именем." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." -msgstr "Принудительно отправить возможно только если отдаленная ссылка указывает на ту же фиксацию как и в отдаленно отслеживаемой ветви.\nЭто может вызвать потерю коммитов в отдаленном хранилище; используйте с осторожностью.\nЭта опция соответствует опции git --force-with-lease." +msgstr "Принудительно отправить возможно только если внешняя ссылка указывает на ту же фиксацию как и в отдаленно отслеживаемой ветви.\nЭто может вызвать потерю коммитов во внешнем хранилище; используйте с осторожностью.\nЭта опция соответствует опции git --force-with-lease." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." -msgstr "Принудительно отправить к выбранной отдалённой ссылке и перезаписать ее без каких-либо проверок безопасности.\nЭто может вызвать потерю непросмотренных коммитов в отдаленном хранилище; используйте с осторожностью.\nЭта опция соответствует опции git --force." +msgstr "Принудительно отправить к выбранной внешней ссылке и перезаписать ее без каких-либо проверок безопасности.\nЭто может вызвать потерю непросмотренных фиксаций во внешнем хранилище; используйте с осторожностью.\nЭта опция соответствует опции git --force." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5031,20 +5111,20 @@ msgstr "Передний план" msgid "Format Patch" msgstr "Сформировать заплатку" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Сформировать заплатку..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Вперёд" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Вперёд %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5074,11 +5154,11 @@ msgstr "Из &изменённых файлов" msgid "From SVN Repository" msgstr "Из хранилища SVN" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Из существующих файлов" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Из изменённых файлов" @@ -5086,7 +5166,7 @@ msgstr "Из изменённых файлов" msgid "From:" msgstr "С:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Во весь экран" @@ -5094,7 +5174,7 @@ msgstr "Во весь экран" msgid "Full text search" msgstr "Полнотекстовый поиск" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Полностью рекурсивно" @@ -5102,7 +5182,7 @@ msgstr "Полностью рекурсивно" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Остальные опции перенесены на страницу Диалоги 3" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5110,24 +5190,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Упрощенный китайский национальный стандарт Guojia Biaozhun)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Невозможно инициализировать GDI+" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ не может создать рисунок. Вероятно очень мало памяти." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "GPG подписывает метку, подробнее см. руководство пользователя" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Выполняется сбор информации. Пожалуйста, подождите..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Сбор статистики" @@ -5171,29 +5251,29 @@ msgstr "Общее::Диалоги 3" msgid "General::Set Extend Menu Item" msgstr "Общие::Значки расширенного меню" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Получить информацию о слияниях" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Получение файла %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Получение файла %s в ревизии %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Получение информации..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Получение необходимой информации..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Получение объединённых различий" @@ -5205,23 +5285,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Прогресс выполнения команды git" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Скопировать и добавить файлы в эту корзину" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Скопировать сюда и переименовать" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Скопировать сюда" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Выгрузить все элементы сюда" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Выгрузить версированные элементы сюда" @@ -5229,35 +5309,35 @@ msgstr "Git Выгрузить версированные элементы сю msgid "Git Init" msgstr "Git Инициализация" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Путь для установки Git" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Журнал" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Переместить сюда и переименовать" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Переместить сюда" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" -msgstr "Git настройки отдалённого хранилища" +msgstr "Git настройки внешнего хранилища" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Git Перечень ревизий" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git фиксация в SVN" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5269,7 +5349,7 @@ msgstr "Git Синхронизация" msgid "Git clone - TortoiseGit" msgstr "Git клонировать - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Каталог для Git не установлен (см. Настройки - Общие)" @@ -5277,23 +5357,23 @@ msgstr "Каталог для Git не установлен (см. Настро msgid "Git for Windows" msgstr "Git для Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git для Windows (https://msysgit.github.io/) не найден." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git вернул ошибку при создании хранилища!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Перечень ревизий в Git содержит полную историю файла" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Перечень ревизий в Git отслеживает переименование файлов" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5312,9 +5392,9 @@ msgstr "Git::Удостоверения" #. Resource IDs: (4570) msgid "Git::Remote" -msgstr "Git::Отдалённое" +msgstr "Git::Внешнее" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Глобальное" @@ -5326,47 +5406,47 @@ msgstr "Перейти к строке" msgid "Go to line" msgstr "Перейти к строке" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Перейти к следующему конфликту\nСледующий конфликт" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Перейти к следующему различию\nСледующее различие" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Перейти к следующему различию внутри строки\nСледующее различие в строке" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Перейти к предыдущему конфликту\nПредыдущий конфликт" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Перейти к предыдущему различию\nПредыдущее различие" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Перейти к предыдущему различию внутри строки\nПредыдущее различие в строке" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Перейти к строке" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Граф" @@ -5382,11 +5462,11 @@ msgstr "Серый " msgid "Greek" msgstr "Греческий" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Разбить по группам изменений" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "Несвязанные изменения скрыты" @@ -5402,7 +5482,7 @@ msgstr "ГОЛОВНАЯ" msgid "HEAD:" msgstr "ГОЛОВНАЯ:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Жесткая" @@ -5414,7 +5494,7 @@ msgstr "Жёсткий: Сбросить рабочую копию и индек msgid "Hebrew" msgstr "Иврит" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Справка" @@ -5438,11 +5518,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Скрыть меню для неверсированных папок" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Скрыть заплатку<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Скрыть присоединённое окно" @@ -5450,25 +5530,25 @@ msgstr "Скрыть присоединённое окно" msgid "Hide the script while running" msgstr "Скрыть скрипт во время работы" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Скрыть неизменённые" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Скрыть неизменённые ссылки в Перечне Сравнения Ссылок" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Спрятать/показать список файлов заплаток" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Скрыть/показать список файлов заплатки\nСкрывает или показывает список файлов, затронутых заплаткой " -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Подсказка" @@ -5478,7 +5558,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Подсказка: выберите контекстное меню, перейдите на страницу 'Команды' и перетащите кнопки панели инструментов в окно меню." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Начало" @@ -5494,7 +5574,7 @@ msgstr "Хук Скрипты::Конфигурация отслеживания msgid "Hook Scripts::Issue Tracker Integration" msgstr "Скрипты хуков::Интеграция с системой отслеживания проблем" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Тип Хука" @@ -5510,7 +5590,7 @@ msgstr "В&ключить пути:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5518,55 +5598,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5574,15 +5655,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5606,7 +5687,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5614,7 +5695,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5622,7 +5703,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5630,16 +5711,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5650,17 +5731,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5672,7 +5753,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5736,7 +5817,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Пометки на значках" @@ -5748,7 +5829,7 @@ msgstr "Пометки на значках::Набор значков" msgid "Icon Overlays::Overlay Handlers" msgstr "Наложения иконок::Обработчики наложений" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5758,52 +5839,52 @@ msgstr "Картинки (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg; msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Значки/Дизайн/Код:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Идентичный" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Если отмечено, то контекстное меню и пометки на значках не будут отображаться в диалогах 'сохранить как...' и 'открыть'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Если отмечено то опция --track будет передана в git, если не отмечено то опция --no-track будет передана в git, в других случаях ни --track ни --no-track не будет передана в git (смотрите справку)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Если отмечено, двойной щелчок на ревизии в списке сообщений сравнивает с её предыдущей" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Если отмечено, диалог фиксации будет перезапущен автоматически после ошибки\r\nс теми же выбранными файлами и сообщением журнала." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Если включено, TortoiseGit будет проверять наличие новой версии раз в неделю" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "Если отмечено, то в рабочих копиях на исключённых (но версированных) папках\nвсё равно будет показываться пометка на значке как для статуса 'нормальная'." -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Если отмечено, файлы из неверсированных папок будут показаны в списке состояния.\r\nСписок состояния используется, например, в диалоге фиксации." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5816,16 +5897,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Если вы планируете работать внутри этой папки, не ставьте эту галочку. Изменения в такой репозиторий могут быть только отправлены. (По договоренности имя папки голого репозитория должно оканчиваться на \".git\")" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Игнорировать" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Игнорировать %d элементов по рас&ширению" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Игнорировать Комментарии" @@ -5837,15 +5918,15 @@ msgstr "Игнорировать файл" msgid "Ignore Type" msgstr "Игнорируемые типы файлов" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Игнорировать все пробелы" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Игнорировать все изменения непечатаемых знаков" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Игнорировать пустые строки" @@ -5853,11 +5934,11 @@ msgstr "Игнорировать пустые строки" msgid "Ignore case cha&nges" msgstr "Игнорировать изме&нения регистра" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "Игнорировать изменения⏎\nИгнорировать внешние изменения." +msgstr "Игнорировать изменения\nИгнорировать внешние изменения." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5871,11 +5952,11 @@ msgstr "Игнорировать элемент(ы) рекурсивно" msgid "Ignore line &endings (recommended)" msgstr "Игнорировать &завершения строк(рекомендуется)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Игнорировать все пробелы в конце строки" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Игнорировать изменения пробелов" @@ -5883,29 +5964,29 @@ msgstr "Игнорировать изменения пробелов" msgid "Ignore whitespace" msgstr "Игнорировать непечатаемые символы" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Игнорировать изменения непечатаемых знаков" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Игнорировать непечатаемые символы при сравнении родительских версий и их потомков" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Игнорируемый" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Игнорируемые файлы" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Игнорирует все изменения непечатаемых знаков при поиске различий\nИгнорировать все изменения непечатаемых знаков" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5923,24 +6004,24 @@ msgstr "Изображение &и текст" msgid "Images" msgstr "Изображения" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Непосредственные потомки, включая папки" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Импорт" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Импорт %s в %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Импортировать SVN-настройки игнорирования файлов" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Импортировать SVN-настройки игнорирования файлов..." @@ -5949,16 +6030,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Импортировать файл игнорирования svn в .git/info/exclude file (файл будет перезаписан)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Импорт файла %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "В группе изменений" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "В фиксациях" @@ -5982,24 +6063,24 @@ msgstr "Включить ветвь FETCH_HEAD в выпадающее меню msgid "Include only the following revision range:" msgstr "Включить только следующий диапазон ревизий:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Неправильное имя файла." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Первоначальный импорт" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Инициализировано пустое Git хранилище в %s." -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Различия в строке" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Различия в строке пословно" @@ -6011,25 +6092,25 @@ msgstr "Внутристрочные различия" msgid "Input" msgstr "Ввод" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Вставить содержимое буфера обмена\nВставить" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Недостаточно памяти для выполнения операции." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Внутренняя ошибка приложения." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Неправильное денежное значение." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Неверный номер ревизии!" @@ -6037,7 +6118,7 @@ msgstr "Неверный номер ревизии!" msgid "Issuer:" msgstr "Издатель:" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6060,7 +6141,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Сохранить" @@ -6068,15 +6149,15 @@ msgstr "Сохранить" msgid "Keep changelists" msgstr "Сохранить группы изменений" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Оставить локальный файл?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "Продолжать улаживание⏎\nПерейти к первому неулаженному конфликту" +msgstr "Продолжать улаживание\nПерейти к первому неулаженному конфликту" #. Resource IDs: (16136) msgid "Keyboard" @@ -6086,7 +6167,7 @@ msgstr "Клавиатура" msgid "Keyboard shortcuts:" msgstr "Клавиатурные сокращения:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Клавиши" @@ -6130,19 +6211,39 @@ msgstr "8-я линия" msgid "Language:" msgstr "Язык:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "Крайние %s фиксации(й)" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "Последние %s месяца(ев)" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "Последние %s недель(и)" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "Последние %s года(лет)" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Последний автор" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" -msgstr "Последняя фиксация" +msgstr "Крайняя фиксация" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Последнее изменение" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Последнее изменение:" @@ -6150,7 +6251,11 @@ msgstr "Последнее изменение:" msgid "Last known &good:" msgstr "Последний &хороший:" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "Последняя выбранная дата" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Запускает внешнюю программу различий/слияния для разрешения конфликтов" @@ -6158,17 +6263,17 @@ msgstr "Запускает внешнюю программу различий/с msgid "Least active author:" msgstr "Наименее активный автор:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" -msgstr "Оставить конфликтующим⏎\nФайл сохраняется в статусе конфликта" +msgstr "Оставить конфликтующим\nФайл сохраняется в статусе конфликта" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "Оставить только помеченные блоки" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Вид слева:" @@ -6176,11 +6281,11 @@ msgstr "Вид слева:" msgid "Left image" msgstr "Левое изображение" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "График" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6194,12 +6299,12 @@ msgstr "Полоса линии изменений" msgid "Line differences" msgstr "Различия строк" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Строка перемещена со строки %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Строка перемещена на строку %ld" @@ -6212,26 +6317,26 @@ msgstr "Ширина линии" msgid "Line:" msgstr "Строка:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Строка: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Строк добавлено" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Строк удалено" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Показать разделы справки\nРазделы справки" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6249,23 +6354,23 @@ msgstr "Загрузить изображения" msgid "Load Putty &Key" msgstr "Загрузить ключ Putty" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." -msgstr "Загрузить изменения⏎\nИзменения, сделанные в TortoiseGitMerge, теряются и заменяются новым содержимым." +msgstr "Загрузить изменения\nИзменения, сделанные в TortoiseGitMerge, теряются и заменяются новым содержимым." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "Загрузить изменения⏎\nПредставления обновляются новым содержимым." +msgstr "Загрузить изменения\nПредставления обновляются новым содержимым." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Загрузка..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Локальное" @@ -6273,13 +6378,13 @@ msgstr "Локальное" msgid "Local Branch" msgstr "Локальная ветвь" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "Локальные изменения игнорируются (файлы типа предположительно-годный/неизменённый или пропустить-в-рабочей-копии)" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Локальный статус" @@ -6287,17 +6392,17 @@ msgstr "Локальный статус" msgid "Local:" msgstr "Локальная:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." -msgstr "Место, куда будет сохранено содержимое⏎\nвыбранной ревизии хранилища." +msgstr "Место, куда будет сохранено содержимое\nвыбранной ревизии хранилища." #. Resource IDs: (32854) msgid "Locator Bar" msgstr "Полоса локатора" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Журнал" @@ -6337,12 +6442,12 @@ msgstr "Полученные кэшированные сообщения жур msgid "Login:" msgstr "Login:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Показанные ревизии:- меньшая: %ld - большая: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6353,7 +6458,7 @@ msgstr "Показанные ревизии: - меньшая: %ld - больш msgid "Lum" msgstr "Ярк" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6365,14 +6470,10 @@ msgstr "Макинтош" msgid "Mail" msgstr "E-mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Не подходящий DLL почтовой системы." -#. Resource IDs: (156) -msgid "Main" -msgstr "Главный" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Создать пустой (без рабочей копии)" @@ -6385,47 +6486,47 @@ msgstr "У&правление" msgid "Manage" msgstr "Управление" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" -msgstr "Управление отдалёнными хранилищами" +msgstr "Управление Внешними хранилищами" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Пометить как улаженный" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" -msgstr "Отметить как улаженный⏎\nСтатус файла меняется на изменённый" +msgstr "Отметить как улаженный\nСтатус файла меняется на изменённый" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "Отметить для сравнения" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Пометить этот блок" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Помеченные блоки" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Отмечает файл как улаженный в Git\nОтметить как улаженный" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Отметить ревизию неудачной" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Отметить ревизию удачной" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "С учетом &регистра" @@ -6449,7 +6550,7 @@ msgstr "Отображать в ме&ню недавно использован msgid "Menu" msgstr "Меню" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Полоса меню" @@ -6457,7 +6558,7 @@ msgstr "Полоса меню" msgid "Menu s&hadows" msgstr "&Тени в меню" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Слияние" @@ -6465,34 +6566,34 @@ msgstr "Слияние" msgid "Merge &Message" msgstr "Сообщение &Слияния" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Точка слияния" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Воссоединительное слияние" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Слияние между оригинальной ветвью, содержимым рабочей копии, и ветвью на которую надо переключиться" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Слить с \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Слито" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Слитые файлы" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Слияние с другой ветвью" @@ -6500,22 +6601,22 @@ msgstr "Слияние с другой ветвью" msgid "Merging" msgstr "Слияние" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Слияние из %s, ревизии от %s до %s, ревизия %s в %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Для слияния необходимы различные ревизии или различные URL в полях 'С:' и 'По:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Слияние ревизий %s из %s в %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Сообщение" @@ -6527,7 +6628,7 @@ msgstr "Т&олько сообщение" msgid "Message part &expression:" msgstr "В&ыражение части сообщения:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Сообщения" @@ -6535,11 +6636,11 @@ msgstr "Сообщения" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Мой" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Свернуть полосу" @@ -6551,7 +6652,11 @@ msgstr "Минимальное количество символов в опис msgid "Misc" msgstr "Разное" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Отсутствует" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Смешанное" @@ -6559,35 +6664,35 @@ msgstr "Смешанное" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Смешанный: Сбросить индекс, не трогать рабочую копию" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Дата изменения" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Изменено" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Изменённые файлы." -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Ещё" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Дополнительные кнопки" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Дополнительные команды..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Другие цвета..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Ещё..." @@ -6607,41 +6712,41 @@ msgstr "В&низ" msgid "Move &Up" msgstr "&Вверх" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Переместить элемент вниз" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Переместить элемент вверх" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Перемещение с переименованием" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Переместить в группу изменений" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Перемещение/Переименование" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Перемещение: Новое имя для %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Помещать изменённые файлы в корзину перед тем, как убрать изменения" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Перемещение %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Перемещение..." @@ -6649,11 +6754,11 @@ msgstr "Перемещение..." msgid "My file:" msgstr "Мой файл:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Имя" @@ -6665,7 +6770,7 @@ msgstr "Имя:" msgid "Navigate" msgstr "Навигация" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6675,11 +6780,11 @@ msgstr "Перейти к определенной строке при прос msgid "Navigation Pane Options" msgstr "Параметры панели навигации" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Параметры панели навигации..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Вложен" @@ -6691,7 +6796,7 @@ msgstr "Сеть" msgid "Network::Email" msgstr "Сеть::Электропочта" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Новый" @@ -6700,43 +6805,43 @@ msgid "New &name:" msgstr "Новое &имя:" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "Новая ветвь/метка" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Новое меню" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Новый хэш" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Новое сообщение" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Новое имя для %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Новое имя не должно быть пустым или таким же как исходное имя!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Новое имя:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Создать подмодуль" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Время более новой фиксации" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Новые линии" @@ -6744,33 +6849,29 @@ msgstr "Новые линии" msgid "Next" msgstr "Далее" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Следующая страница\nСледующая страница" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Следующий конфликт" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Следующее различие" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Следующее различие в строке" -#. Resource IDs: (73) -msgid "No" -msgstr "Нет" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Без перемотки" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Без слияний" @@ -6782,102 +6883,107 @@ msgstr "Нет извлечения" msgid "No Co&mmit" msgstr "Не &фиксировать" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "ГОЛОВНАЯ ветвь не найдена" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Не указано ни одной команды!\n\nTortoiseGitProc.exe используется как расширение оболочки и не должен запускаться напрямую!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Не установлено значение для команды!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Различий не найдено!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Различий не найдено! Подмодуль может быть не обновлён. Обновить подмодуль?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Сообщение об ошибке не доступно." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Ошибок не произошло." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "Нет дополнительных изменений после слияния" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Ни один файл или папка не были изменены. TortoiseGit нечего убирать!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Нет ни одного файла для отображения, исходя из текущих настроек.\nОтметьте один или более флажков ниже для того, чтобы увидеть\nневерсированные, игнорируемые и/или неизменённые файлы.\nЧтобы увидеть отдалённые изменения, нажмите на 'Проверить хранилище'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "Нет ни одного файла для отображения, исходя из текущих настроек.\nОтметьте один или более флажков ниже для того, чтобы увидеть\nневерсионированные, игнорируемые и/или неизменённые файлы." -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Ни один файл не изменен и не добавлен\nс момента последнего фиксирования.\nЗдесь нечего делать TortoiseGit..." +"the last commit." +msgstr "Ни один файл не был изменен или добавлен с момента\nпоследней фиксации." -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Ни один файл не изменен и не добавлен\nс момента последнего фиксирования.\nЗдесь нечего делать TortoiseGit...\nЖелаете увидеть неверсированные файлы?" +msgstr "Ни один файл не был изменен или добавлен с момента\nпоследней фиксации.\nЖелаете просмотреть неверсионированные файлы?" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Нет ни одного графа в наличии" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Не найден ни один обработчик для изображения %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "Нет ограничений" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Фиксаций более не найдено." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Нет предыдущей версии." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Ссылки не найдено" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Без исправлений" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Без кэширования статуса. Пометки будут только на версированных папках, файлы - без пометок" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Нет предложений из словаря" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Не найдена рабочая копия" @@ -6885,11 +6991,11 @@ msgstr "Не найдена рабочая копия" msgid "Node size" msgstr "Размер узла" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Без кэширования" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Нормальное" @@ -6901,30 +7007,30 @@ msgstr "Нормальная &SVN Фиксация" msgid "North European" msgstr "Северно-европейский" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Неверсированные файлы" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Не все файлы могут быть загружены и проверены." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Не все компоненты в системном реестре (либо INI-файлы) удалены." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Недостаточно памяти для завершения операции." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Недостаточно памяти!\nПопробуйте сократить размер графа ревизий путём\nсворачивания узлов или уменьшения масштаба." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Заплатки не созданы." @@ -6932,7 +7038,7 @@ msgstr "Заплатки не созданы." msgid "Note node" msgstr "Заметка узла" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6951,26 +7057,26 @@ msgstr "Внимание: папка содержит неверсированн msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Примечание: это затрагивает все Tortoise-клиенты, не только TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Заметки" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Нет необходимости в переносе\n%s эквивалентно %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Нечего перебазировать" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Нечего фиксировать" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Уведомление" @@ -6978,7 +7084,7 @@ msgstr "Уведомление" msgid "Number Commits" msgstr "Количество фиксаций" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Количество (%s):" @@ -6991,7 +7097,7 @@ msgstr "Количество авторов:" msgid "Number of characters required for moved or copied line detection:" msgstr "Число символов, используемое для поиска перемещённых/копированных строк:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Количество отображаемых символов в аббревиатуре хэша" @@ -7063,41 +7169,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-США" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Инициализация OLE не удалась. Убедитись, что библиотеки OLE нужной версии." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "цвета Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Старый хэш" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Старое сообщение" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Время более старой фиксации" @@ -7105,15 +7211,15 @@ msgstr "Время более старой фиксации" msgid "Older lines" msgstr "Более старые строки" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "По требованию" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Найден один или несколько авто-сохранённых документов." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Один или более файлов имеют конфликты." @@ -7125,29 +7231,29 @@ msgstr "Только текущая ветвь" msgid "Only Local Branches" msgstr "Только локальные ветви" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Только слитые файлы" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Только потомки-файлы" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Разрешены только цифры\n(возможно, разделённые запятыми)!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Только этот элемент" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Открыть" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7157,51 +7263,52 @@ msgstr "Открыть существующий документ\nОткрыть msgid "Open certificate" msgstr "Открыть сертификат" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Открыть файлы для сравнения или применить заплатку\nОткрыть файлы" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Открыть из буфера обмена" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Открыть файл изображения..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Открыть родительскую папку" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "Открыть файл с заплаткой" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Открыть этот документ" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Открыть с помощью..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Отрывает справку\nРазделы справки" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Открывает диалог обозревателя ссылок." -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Открывает обозреватель хранилища" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Настройки" @@ -7210,30 +7317,30 @@ msgid "Options" msgstr "Параметры" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Исходный &размер" +msgid "Ori&ginal size\tS" +msgstr "Исходный &размер\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Имя Origin" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Остальные панели задач" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Остальные" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Вне листа изменений" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Вне фиксаций" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Нехватка памяти." @@ -7241,7 +7348,7 @@ msgstr "Нехватка памяти." msgid "Output Directory" msgstr "Каталог назначения" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7249,20 +7356,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Перезаписать существующую ветвь" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Перезаписать" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "Перезаписать изменения в рабочей директории (форсировать)" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "Настройка страницы..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Страница %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7273,15 +7384,15 @@ msgstr "Страница %u\nСтраницы %u-%u\n" msgid "Page :" msgstr "Страница:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Панель 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Панель 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Параметры" @@ -7289,25 +7400,25 @@ msgstr "Параметры" msgid "Parameters:" msgstr "Параметры:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Предок %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Предок %d не существует" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Предок 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Предок 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Предок(и)" @@ -7319,39 +7430,39 @@ msgstr "Частично основано на TortoiseSVN Blame" msgid "Password" msgstr "Пароль" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Пароль:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Вставить" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Вставить последнее сообщение..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "Вставить список имен &файлов" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "Вставить сообщение &крайней фиксации" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "Вставить &недавнее сообщение..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Инструмент вставки\nВставка" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Вставить список имен файлов" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Вставить последнее сообщение фиксации" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Вставляет svn-путь из буфера обмена, выполняя операцию перемещения (вырезания) или копирования" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Заплатка" @@ -7367,32 +7478,32 @@ msgstr "Применить к выбранным" msgid "Patch As Attachment" msgstr "Заплатка как вложение" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Применить заплатки ко всем" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Применить заплатку к отмеченным" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Файлы заплаток (*.diff, *.patch)|*.diff;*.patch|Все файлы (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Применение заплатки" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Патчим файл '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Путь" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Найден путь, который лучше соответствует заплатке." @@ -7400,21 +7511,21 @@ msgstr "Найден путь, который лучше соответству msgid "Path:" msgstr "Путь:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Пути" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Инструмент карандаш\nКарандаш" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Процент от авторства" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Проценты" @@ -7422,24 +7533,24 @@ msgstr "Проценты" msgid "Personalized Menus and Toolbars" msgstr "Настраиваемые меню и панели инструментов" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Оставить" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Взять хеш фиксации" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "Взять &хеш фиксации" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Выбрать сообщение фиксации" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "Выбрать сообщение &фиксации" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "Забрать %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7449,56 +7560,56 @@ msgstr "Картинка (метафайл)\nкартинка" msgid "Picture:" msgstr "Картинка:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Картинки (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All Files (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Картинки (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Круговая диаграмма" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Пожалуйста, введите хук скрипт для исполнения." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Пожалуйста, введите путь для применения хук скрипта." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Пожалуйста, выберите тип хука" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Выберите, пожалуйста, ветвь" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Выберите, пожалуйста, верховую:" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Пожалуйста просмотрите пропущенные фиксации" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Пожалуйста, подождите отмены..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Подождите, пожалуйста, пока получаются различия..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Подождите, пожалуйста..." @@ -7514,11 +7625,11 @@ msgstr "Порт:" msgid "Port:" msgstr "Порт:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Хук после-фиксации" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Хук после отправки" @@ -7526,23 +7637,23 @@ msgstr "Хук после отправки" msgid "Pre&v Page" msgstr "Пре&дыдущая страница" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Хук перед-фиксацией" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Хук перед отправкой" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Подготовка фиксации..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Добавить спереди правый блок" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Добавить спереди этот блок слева" @@ -7554,11 +7665,11 @@ msgstr "Нажмите &новую клавишу быстрого доступ msgid "Press &new shortcut key:" msgstr "Нажмите &новую клавишу быстрого доступа:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Предварительный просмотр" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Предпросмотр файла с заплаткой" @@ -7570,51 +7681,51 @@ msgstr "Предварительный просмотр:" msgid "Previous" msgstr "Предыдущий" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Предыдущая страница\nПредыдущая страница" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Предыдущая версия" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Предыдущий конфликт" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Предыдущее различие" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Предыдущее различие в строке" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Печать" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Печать документа\n&Печать" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Распечатать текущий документ используя текущие настройки\nБыстрая печать" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Распечатать текущий документ\nПечать" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Печать в файл" @@ -7622,7 +7733,7 @@ msgstr "Печать в файл" msgid "Printer :" msgstr "Принтер:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Файлы печати (*.prn)|*.prn|Все файлы (*.*)|*.*||" @@ -7630,11 +7741,11 @@ msgstr "Файлы печати (*.prn)|*.prn|Все файлы (*.*)|*.*||" msgid "Printing" msgstr "Идёт печать" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Программа" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Программы (*.exe)|*.exe|Все файлы (*.*)|*.*||" @@ -7642,11 +7753,11 @@ msgstr "Программы (*.exe)|*.exe|Все файлы (*.*)|*.*||" msgid "Progress" msgstr "Окно выполнения" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Проект" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Свойство" @@ -7654,7 +7765,7 @@ msgstr "Свойство" msgid "Property Page" msgstr "Страница свойств" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Поставщик" @@ -7684,17 +7795,17 @@ msgstr "Упростить" #. Resource IDs: (1785) msgid "Prune (All remotes)" -msgstr "Подрезать (все отдалённые)" +msgstr "Подрезать (все внешние)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Получить" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Для получения изменений необходимо указать одну из локальных ветвей в качестве текущей." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Получить..." @@ -7702,19 +7813,19 @@ msgstr "Получить..." msgid "Pull/Fetch" msgstr "Получить/Извлечь" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "Изменения при получении" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "Журнал получения" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "Отп&равить" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Отправить" @@ -7730,11 +7841,11 @@ msgstr "Отправить по URL:" msgid "Push notes" msgstr "Отправить заметки" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Отправить мет&ки" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Отправить..." @@ -7742,26 +7853,26 @@ msgstr "Отправить..." msgid "Putty Key:" msgstr "Ключ PuTTy" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Закрытый ключ Putty (*.ppk)|*.ppk|Все файлы (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "%d Кв./%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Выходит из приложения; приглашает сохранить документы\nВыход" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" -msgstr "Выйти⏎\nВыйти из TortoiseGitMerge без сохранения изменений" +msgstr "Выйти\nВыйти из TortoiseGitMerge без сохранения изменений" #. Resource IDs: (1633) msgid "QuotePath" @@ -7775,11 +7886,15 @@ msgstr "RAM &диски" msgid "R&eset" msgstr "&Сбросить" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "&Восстановить этот файл из индекса" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "&Вернуть к этой ревизии" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "ПЕРЕБАЗИРОВАТЬ" @@ -7787,7 +7902,7 @@ msgstr "ПЕРЕБАЗИРОВАТЬ" msgid "Randomize Sync Dialog startup position" msgstr "Случайное положение окна синхронизации" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7809,7 +7924,7 @@ msgstr "От&далённое хранилище:" msgid "Re&movable drives" msgstr "&Сменные диски" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "П&ереименовать..." @@ -7825,15 +7940,15 @@ msgstr "Сбро&сить все" msgid "Re&store defaults" msgstr "Восстановить ис&ходные" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Убрать и&зменения..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Доступное" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Прочитайте 'Руководство по ежедневному использованию', пока не застряли..." @@ -7841,21 +7956,21 @@ msgstr "Прочитайте 'Руководство по ежедневному msgid "Rebase" msgstr "Перебазировать" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Перебазировать \"%s\" на эту..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Перебазировать..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Перебазирование... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Недавний" @@ -7867,21 +7982,21 @@ msgstr "Недавний файл" msgid "Recently modified lines" msgstr "Недавно изменённые строки" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Только регистрация" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Восстановление автоматически сохраненных документов\nОткрыть авто-сохранённые версии вместо сохраненных версий" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Восстановить к состоянию до перебазирования" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7895,17 +8010,21 @@ msgstr "Рекурсивно подмодуль" msgid "Recursive" msgstr "Рекурсивно" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Повторно выполняет предыдущее отменённое действие\nВозврат" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Уменьшает окно до иконки" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ссылка" @@ -7913,31 +8032,31 @@ msgstr "Ссылка" msgid "Ref (Click it then go to)" msgstr "Ссылка (Нажмите на нее для перехода)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Список Ссылок" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "Просмотр ссылки" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "ЖурналСсылок" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Имя ссылки" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Обновить" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Обновление..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Фильтр регулярного выражения" @@ -7949,7 +8068,7 @@ msgstr "Фильтры регулярных выражений" msgid "Regex:" msgstr "Регулярное выражение:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7968,7 +8087,7 @@ msgid "" "\\s : whitespaces" msgstr "Регулярные выражения для фильтра:\n. : любой символ\nc+ : соответствует одному или более вхождениям символа c\nc* : соответствует нулю или более вхождениям символа c\n^ : начало строки\n$ : конец строки\n(строка){n} : соответствует n вхождениям строки\n(abcd) : подвыражение\n[aei0-9] : соответствует a,e,i и 0..9\n[^aei0-9] : всё, кроме a,e,i и 0..9\n\n\\w : соответствует a-z,A-Z,0-9 и _\n\\W : любой не цифро-буквенный символ\n\\d : цифры 0-9\n\\s : непечатаемые знаки (пробельные символы)" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Патч для '%s' отменён" @@ -7981,7 +8100,7 @@ msgstr "Относительное время" msgid "Reload" msgstr "Перечитать" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -7997,54 +8116,54 @@ msgstr "Напоминание: Зафиксируйте ваши изменен #. Resource IDs: (1573) msgid "Remote" -msgstr "Отдалённый" +msgstr "Внешнее" #. Resource IDs: (65535) msgid "Remote &Branch:" -msgstr "Отдалённая &ветвь:" +msgstr "Внешняя &Ветвь:" #. Resource IDs: (1618) msgid "Remote &URL:" -msgstr "Отдалённый &URL:" +msgstr "Внешний &URL:" #. Resource IDs: (1754) msgid "Remote &tracking branch" -msgstr "Отдаленная &отслеживаемая ветвь" +msgstr "Внешняя &отслеживаемая ветвь" #. Resource IDs: (65535) msgid "Remote Branch" -msgstr "Отдалённая ветвь" +msgstr "Внешняя Ветвь" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." -msgstr "Отдалённый URL не может быть пустым." +msgstr "Внешний URL не может быть пустым." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" -msgstr "Отдалённое обновление" +msgstr "Внешнее обновление" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." -msgstr "Отдалённое имя не может быть пустым." +msgstr "Внешнее имя не может быть пустым." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" -msgstr "Отдалённый статус" +msgstr "Статус внешнего" #. Resource IDs: (65535) msgid "Remote:" -msgstr "Отдалённое хранилище:" +msgstr "Внешнее хранилище:" #. Resource IDs: (1332, 1470) msgid "Remove" msgstr "Удалить" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Удаление %ld элементов" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Удаление %s" @@ -8053,7 +8172,7 @@ msgstr "Удаление %s" msgid "Remove &all untracked files (-fx)" msgstr "Убрать &все неверсированные файлы (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Удалить &ветвь" @@ -8061,21 +8180,21 @@ msgstr "Удалить &ветвь" msgid "Remove &non-ignored untracked files (-f)" msgstr "Убрать &неигнорируемые неверсированные файлы (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Убрать все комментарии перед сравнением чтобы отличия в комментариях не отображались как отличия" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Удалить из списка &игнорирования" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Убрать из панели быстрого доступа" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Убрать из группы изменений" @@ -8087,7 +8206,7 @@ msgstr "Убрать игнорируемые файлы (-fX)" msgid "Remove untracked directories (-d)" msgstr "Удалить не отслеживаемые папки (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Удалить неверсированные файлы из рабочей копии, ..." @@ -8095,11 +8214,11 @@ msgstr "Удалить неверсированные файлы из рабоч msgid "Removed" msgstr "Убранное" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Убрано из группы изменений" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8107,7 +8226,7 @@ msgid "" "from the ignore list." msgstr "Следующие шаблоны файлов\n%s\nудалены из списка игнорирования." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Удаляет файлы или маску файлов из списка игнорирования" @@ -8115,11 +8234,11 @@ msgstr "Удаляет файлы или маску файлов из списк msgid "Rena&me..." msgstr "П&ереименовать..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Переименование" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Переименовать %s" @@ -8128,20 +8247,20 @@ msgstr "Переименовать %s" msgid "Rename - TortoiseGit" msgstr "Переименовать - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Переименовать \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Переименование/перемещение" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Переименовывает файлы/папки внутри управления версиями" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8151,7 +8270,7 @@ msgstr "Повторить последнее действие\nПовторит msgid "Replace &All" msgstr "Заменить &все" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8165,12 +8284,12 @@ msgstr "Заменить на:" msgid "Replace:" msgstr "Переместить:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Заменено %d совпадений" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Перемещено" @@ -8194,11 +8313,11 @@ msgstr "Запросить получение" msgid "Requests a username and a password" msgstr "запрашивает имя пользователя и пароль" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "У&ладить..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Сброс" @@ -8210,25 +8329,25 @@ msgstr "Сбросить &все" msgid "Reset Type" msgstr "Сбросить тип" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Сбросить \"%s\" до этого..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Восстановить текущую ветвь" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Сбросить колонки" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Восстановить текущую ветвь \"%s\" к" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Улаживание" @@ -8236,126 +8355,122 @@ msgstr "Улаживание" msgid "Resolve Submodule Conflict" msgstr "Уладить конфликт подмодуля" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Уладить конфликт, используя 'мой' файл" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Уладить конфликт, используя 'их' файл" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Улажено" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Улажено:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Улаживает файлы с конфликтами" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Перезапустить перебазирование" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Восстановить" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Сбросить на исходные" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Восстановить после фиксации" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Восстановить окно до нормальных размеров" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Восстановлено" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Повторить" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Повтор попытки через 2 секунды..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Откатить" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Откатить фиксацию" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Откатить фиксацию %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Откатить к родительской ревизии" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Откатить к ревизии %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Возвращено" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Убирает все изменения, которые вы сделали после последнего обновления" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Убирает добавленное из-под управления версиями" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Просмотреть заплатку в TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Просмотреть/применить файл объединённых различий при помощи TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Посмотреть/применить одну заплатку" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Ревизия" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Ревизия %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Ревизия %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Граф Ревизий" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "Файлы фиксации" @@ -8371,31 +8486,31 @@ msgstr "Фильтр для графа ревизий" msgid "Revision graph" msgstr "Граф ревизий" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Проведен откат ревизии(й). Все изменения проинтегрированы в вашу рабочую копию." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Ревизия:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Перемотка" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Перемотка %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Текст с фоматированием (RTF)\nтекст с заданием шрифтов и формата абзацев" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Вид справа:" @@ -8403,21 +8518,21 @@ msgstr "Вид справа:" msgid "Right image" msgstr "Правое изображение" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Строка %d из %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Строка %d-%d из %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Строка вниз" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Строка вверх" @@ -8425,11 +8540,11 @@ msgstr "Строка вверх" msgid "S&elect..." msgstr "&Выбрать..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Ото&бражать кнопки в одну строку" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Ото&бражать кнопки в две строки" @@ -8437,15 +8552,23 @@ msgstr "Ото&бражать кнопки в две строки" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Ото&бражать панель быстрого доступа под полосой" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "Пр&опустить невыбранное" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "&Убрать невыбранное" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "Ста&тистика" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "Перекл&ючить..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8465,7 +8588,7 @@ msgstr "SMTP Сервер требует авторизации пользова msgid "SMTP Server:" msgstr "SMTP Сервер:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, напрямую на сервер назначения" @@ -8473,11 +8596,11 @@ msgstr "SMTP, напрямую на сервер назначения" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8485,19 +8608,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN Тип фиксации" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN фиксация..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Fetch" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN Перебазирование" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "рев. SVN" @@ -8509,15 +8632,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Совпадение" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Совпадающее время фиксации" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8535,124 +8658,128 @@ msgstr "Пример сообщения журнала для тестирова msgid "Sample text:" msgstr "Примерный текст:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Сохранить" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Сохранить &как..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Сохранить &как...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Сохранить как" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" -msgstr "Сохранить нижний файл как⏎\nУ вас спросили куда сохранить нижний файл" +msgstr "Сохранить нижний файл как\nУ вас спросили куда сохранить нижний файл" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Сохранить файл" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" -msgstr "Сохранить файл слева как⏎\nУ вас спросили куда сохранить файл слева" +msgstr "Сохранить файл слева как\nУ вас спросили куда сохранить файл слева" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" "The modifications are saved to\n" "%s" -msgstr "Сохранить файл слева⏎\nИзменения будут сохранены в⏎\n%s" +msgstr "Сохранить файл слева\nИзменения будут сохранены в\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" -msgstr "Сохранить файл справа как⏎\nУ вас спросили куда сохранить файл справа" +msgstr "Сохранить файл справа как\nУ вас спросили куда сохранить файл справа" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" "The modifications are saved to\n" "%s" -msgstr "Сохранить файл справа⏎\nИзменения будут сохранены в⏎\n%s" +msgstr "Сохранить файл справа\nИзменения будут сохранены в\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" -msgstr "Сохранить всё⏎\nОба файла сохранены" +msgstr "Сохранить всё\nОба файла сохранены" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "Сохранить и исключить\nВаши изменения сохранены и оригинальное содержимое будет использовано" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "Сохранить и игнорировать выбранные блоки\nТолько ваши ручные правки будут сохранены, помеченные блоки останутся как есть" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "Сохранить и включить\nВаши изменения сохранены и помеченные блоки будут включены" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Сохранить как" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Сохранить как..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "Сохранить как⏎\nВас попросили указать куда сохранить файл" +msgstr "Сохранить как\nВас попросили указать куда сохранить файл" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Сохранить изменения в %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Сохранить изменения." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "Сохранить файл с заплаткой" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Сохранить ревизию &в..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Сохранить текущий документ под новым именем\nСохранить как" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Сохранить текущий документ\nСохранить" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8674,30 +8801,30 @@ msgstr "Сохранить объединённые различия" msgid "Save unified diff since HEAD" msgstr "Сохранить объединённые различия по сравнению с ГОЛОВНОЙ ветвью" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "Сохранить⏎\nСохранить файл с маркерами конфликта." +msgstr "Сохранить\nСохранить файл с маркерами конфликта." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" "The modifications are saved to\n" "%s" -msgstr "Сохранить⏎\nИзменения сохранены в⏎\n%s" +msgstr "Сохранить\nИзменения сохранены в\n%s" #. Resource IDs: (108) msgid "Saved Data" msgstr "Сохранённые данные" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Сохранить конфигурацию не удалось (ключ: \"%s\", значение: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Сохранить заметки не удалось." @@ -8709,11 +8836,11 @@ msgstr "Сканировать" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Прокрутить влево" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Прокрутить вправо" @@ -8721,7 +8848,7 @@ msgstr "Прокрутить вправо" msgid "Se&ttings..." msgstr "&Настройки..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Найти в &сообщениях журнала..." @@ -8733,20 +8860,20 @@ msgstr "Поиск &вверх" msgid "Search for:" msgstr "Что искать:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Поиск подходящего пути для применения заплатки..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Поиск не удался на %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Выбрать" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Выбрать &все" @@ -8762,59 +8889,59 @@ msgstr "Выбрите контекстное &меню:" msgid "Select &window:" msgstr "Выбрите &окно:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Инструмент выбора цвета\nВыбор цвета" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Выбрать файл..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Выбрать клиент SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Выберите кнопку." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Выберите объект, по которому надо получить справку" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Отметить группу изменений" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Выбрать приложение просмотра различий" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Выбрать файл" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Выберите папку, с которой будет связана эта система отслеживания проблем" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Выберите папку для экспорта.\nВам может понадобится создать новую папку перед выполнением этого экспорта." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Выберите папку для запуска скрипта" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Выберите папку, в которую будут сохранены выбранные файлы" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Выбрать файл хук скрипта" @@ -8822,20 +8949,20 @@ msgstr "Выбрать файл хук скрипта" msgid "Select items automatically" msgstr "Отмечать элементы автоматически" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Выбрать приложение слияния" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Выберите с чем производить слияние" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "Выберите поведение окна выполнения по окончанию операции." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8847,25 +8974,29 @@ msgid "" "checker used for commit messages." msgstr "Выберите язык проекта. Эта настройка влияет на проверку орфографии в диалоге фиксации." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "Выбрать отслеживаемую ветвь" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Выберите программу просмотра файлов различий" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Выберите файл, который вы хотите сохранить как" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" -msgstr "Выберите файл, который вы хотите сохранить⏎\nПримечание: Есть неулаженный конфликт!" +msgstr "Выберите файл, который вы хотите сохранить\nПримечание: Есть неулаженный конфликт!" #. Resource IDs: (1067) msgid "Select/deselect &all" msgstr "Выбрать/снять &все" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "Предыдущий выбор" @@ -8873,7 +9004,7 @@ msgstr "Предыдущий выбор" msgid "Send" msgstr "Отправить" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Отправить e-mail" @@ -8881,11 +9012,11 @@ msgstr "Отправить e-mail" msgid "Send Mail after create" msgstr "Отправить e-mail после создания" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Не удалось отослать письмо." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Отправить e-mail..." @@ -8893,19 +9024,19 @@ msgstr "Отправить e-mail..." msgid "Send Patch" msgstr "Отправить заплатку" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Отправить заплатку по почте" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Отправить заплатку(и) по эл.почте" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Передача содержимого" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Передача..." @@ -8925,28 +9056,28 @@ msgstr "Установить автора" msgid "Set author &date" msgstr "Установить &дату автора" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." -msgstr "Установить отдалённое хранилище как \"отдалённое для отправки\" для выбранной локальной ветви." +msgstr "Установить внешнее хранилище как \"внешнее для отправки\" для выбранной локальной ветви." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." -msgstr "Установить отдалённую ветвь как \"ветвь для отправки\" для выбранной локальной ветви." +msgstr "Установить внешнюю ветвь как \"ветвь для отправки\" для выбранной локальной ветви." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Установка свойств..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Настройки" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Настройки - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "В оболочке" @@ -8954,7 +9085,7 @@ msgstr "В оболочке" msgid "Shell Extended" msgstr "Оболочка расширена" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Кэш значков оболочки восстановлен!" @@ -8966,7 +9097,7 @@ msgstr "Shift-JIS японская кодировка" msgid "Short &date/time format in log messages" msgstr "Короткий формат &даты/времени" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Сократить список свойств" @@ -8978,7 +9109,7 @@ msgstr "Показать" msgid "Show &Accelerator for:" msgstr "Показать &акселератор для:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Показать &ЖурналСсылок" @@ -8986,15 +9117,15 @@ msgstr "Показать &ЖурналСсылок" msgid "Show &Unversioned Files" msgstr "Показывать неверсированные файлы" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Показать весь проект" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Показать &изменения" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "&Журнал" @@ -9002,15 +9133,19 @@ msgstr "&Журнал" msgid "Show &log..." msgstr "&Журнал..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "Показать &вложенные ссылки" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Показывать &пометки и контекстное меню только в проводнике" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Отображать над полосой" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Отображать под полосой" @@ -9018,35 +9153,35 @@ msgstr "Отображать под полосой" msgid "Show Environment Variables" msgstr "Показать переменные окружения" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Показывать меньше кнопок" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Показать узлы ГОЛОВНОЙ ревизии" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Показывать внутристрочные различия по словам\nВнутристрочные различия по словам" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Показывать внутристрочные различия\nВнутристрочные различия" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Показывать больше кнопок" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Показывать панель быстрого доступа над полосой" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Показывать панель быстрого доступа под полосой" @@ -9054,11 +9189,11 @@ msgstr "Показывать панель быстрого доступа под msgid "Show Screen&Tips on toolbars" msgstr "Показывать по&дсказки в панелях инструментов" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Показать непечатаемые знаки" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Показать окно с изображением всего графа" @@ -9066,7 +9201,7 @@ msgstr "Показать окно с изображением всего гра msgid "Show asterisk log prefix" msgstr "Отображать префикс-звёздочку журнала" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "Отображать префикс-звёздочку в диалоге журнала" @@ -9074,11 +9209,11 @@ msgstr "Отображать префикс-звёздочку в диалоге msgid "Show author" msgstr "Показать автора" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Показать ветви, содержащие эту фиксацию" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Показать изменения как объединённые разли&чия" @@ -9098,31 +9233,35 @@ msgstr "Показать дату" msgid "Show describe in log" msgstr "Показывать описание в журнале" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "Показывать описание в диалоге журнала" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Показать папку назначения" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Показать изменения" #. Resource IDs: (1556) msgid "Show diff to last commit" -msgstr "Показать сравнение с последней фиксацией" +msgstr "Показать сравнение с крайней фиксацией" #. Resource IDs: (1126) msgid "Show excluded folders as normal" msgstr "Показывать исключённые папки как нормальные" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "Показать дополнительные изменения после слияния" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Показывать &полные меню после небольшой задержки" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Показать имя файла" @@ -9138,7 +9277,7 @@ msgstr "Показать &игнорируемые файлы" msgid "Show ignore local changes flagged files" msgstr "Показать файлы, помеченные как игнорировать-локальные-изменения" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Только со ссылками" @@ -9146,90 +9285,90 @@ msgstr "Только со ссылками" msgid "Show linenumber&s" msgstr "Показывать но&мера строк" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Показать журнал" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Показать журнал &до переименования" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Показать журнал для %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Показать журнал подмодуля" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Показать журнал этой папки" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Показать журнал..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "Показывать длинный формат даже если метка стоит именно на этой фиксации" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Показать изменённые файлы в рабочей копии" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Показывает следующее изменение в коммите\nПоказать следующее" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Показать старейшие узлы сверху" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Показать или спрятать панель различий строк\nПереключить панель различий строк" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Показать или спрятать полосу местоположения\nПереключить полосу местоположения" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Показать или спрятать строку статуса\nПереключить строку статуса" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Показать или спрятать строку статуса\nПереключить строку статуса" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Показать или спрятать панель инструментов\nПереключить панель инструментов" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Показать изначальный номер строки" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Показывает предыдущее изменение в коммите\nПоказать предыдущее" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Показать свойства ревизии" @@ -9237,7 +9376,7 @@ msgstr "Показать свойства ревизии" msgid "Show shortcut &keys in ScreenTips" msgstr "Показывать клавиши &быстрого доступа в подсказках" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9247,7 +9386,7 @@ msgstr "Показать специальные символы для непеч msgid "Show status of subrepositories in parent folders" msgstr "Показывать состояние подрепозиториев в родительских папках" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Показать символы на бирках ссылок для подстановки частей имен ссылок" @@ -9259,45 +9398,43 @@ msgstr "Показать файлы без из&менений" msgid "Show un&versioned files" msgstr "Показать не&версированные файлы" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Показать/скрыть" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Отображается %1!d! ссылки(-ок), %2!d! ссылки(-ок) выбрано" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Показано %ld фиксации(й), от фиксации %s до фиксации %s - %ld фиксации(й) выбрано, %ld файла(ов) выбрано»\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Показывает копии/метки/ответвления в графическом виде" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Показывает все файлы, которые изменились после последнего обновления, локально и в хранилище" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "Показывает все файлы, которые изменились после крайней фиксации" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Показывает информацию о TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Показывает журнал ссылок" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Показывает журнал действий в текстовом редакторе по умолчанию" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Показывает журнал для выбранного файла/папки" @@ -9309,7 +9446,7 @@ msgstr "Под&писать" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "Значительный вклад внесли: (полный список в Git-репозитории)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Серебристый стиль" @@ -9317,20 +9454,20 @@ msgstr "Серебристый стиль" msgid "Since" msgstr "с" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Размер" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Пропустить" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Пропустить заплатку: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "Пропустить рабочую копию" @@ -9338,23 +9475,23 @@ msgstr "Пропустить рабочую копию" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "Пропустить рабочую копию (\"Заблокировано\" в TortoiseSVN)" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Пропущено" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Пропущена отсутствующая цель" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Сдвиг" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Символ смарт табуляции" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Мягкая" @@ -9362,13 +9499,13 @@ msgstr "Мягкая" msgid "Soft: Leave working tree and index untouched" msgstr "Мягкий: Оставить рабочую копию и индекс как есть" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Файл(ы) был изменен внешней программой, по отношению к TortoiseGitMerge.\nВы хотите загрузить изменения?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9382,7 +9519,7 @@ msgstr "Сортировать по количеству фиксаций" msgid "Sort tag list in reversed order" msgstr "Отсортировать список меток в обратном порядке" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9392,49 +9529,53 @@ msgstr "Задаёт количество недавно введённых со msgid "Spin1" msgstr "Счётчик1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Разделить на строки" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Разделить активное окно на панели\nРазделить" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Объединить" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "Убрать (с фиксацией ниже)" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Гистограмма стопкой" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "График стопкой" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Стандартные" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Старт (быстрая перемотка)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Начать пересмотр" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Хук начало-фиксации" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Начать перебазирование" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Начать бинарный поиск..." @@ -9442,7 +9583,7 @@ msgstr "Начать бинарный поиск..." msgid "Start registry editor" msgstr "Запустить редактор реестра" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Запустить сервер git с протоколом git" @@ -9454,39 +9595,47 @@ msgstr "Копилка" msgid "Stash &Message" msgstr "&Сообщение копилки" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Применить в копилку" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Лист копилки" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Забрать из копилки" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Сохранить в копилку" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Операция с копилкой выполняется..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Статический" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Статистика" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Статус" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Конфигурация строки состояния" @@ -9498,32 +9647,32 @@ msgstr "Цвета состояний и действий" msgid "Status cache" msgstr "Кэширование статуса" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "Кэш статуса только для одной папки, с полным статусом и рекурсивными пометками иконок" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "Кэш статуса содержится во внешнем процессе, который определяет изменения файлов, может отображать пометки иконок файлов рекурсивно" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Кэширование статуса только для одной папки, без рекурсивных пометок" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Завершить бинарный поиск" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "Хранит путь файла, используемого позже при выборе пункта Сравнить во всплывающем меню по щелчку правой кнопкой мыши. Нажмите кнопку Ctrl для удаления последнего сохраненного пути." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Стратегия" @@ -9531,15 +9680,15 @@ msgstr "Стратегия" msgid "Strip lines starting with \"#\" in commit message" msgstr "Очищать от пробелов строки начинающиеся с \"#\" в сообщении фиксации" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Стиль" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Тема" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Тема:" @@ -9547,7 +9696,7 @@ msgstr "Тема:" msgid "Submodule" msgstr "Подмодуль" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "Подмодуль &Обновить..." @@ -9555,7 +9704,7 @@ msgstr "Подмодуль &Обновить..." msgid "Submodule Add" msgstr "Подмодуль Добавить" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Подмодуль Добавить..." @@ -9563,15 +9712,15 @@ msgstr "Подмодуль Добавить..." msgid "Submodule Diff" msgstr "Подмодуль Различия" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Подмодуль Инициализация" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Подмодуль Синхронизировать" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Подмодуль Обновить" @@ -9579,12 +9728,12 @@ msgstr "Подмодуль Обновить" msgid "Submodule Update Options" msgstr "Настройки обновления подмодуля" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" "Revision %2!s!" -msgstr "Подмодуль \"%1!s!\"↩⏎\nРевизия %2!s!" +msgstr "Подмодуль \"%1!s!\"\r\nРевизия %2!s!" #. Resource IDs: (1585) msgid "Submodule of Project: " @@ -9594,15 +9743,15 @@ msgstr "Подмодуль проекта" msgid "Submodules" msgstr "Подмодули" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Успешно" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Переключение" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Переключение %s на %s, ревизия %s" @@ -9611,43 +9760,43 @@ msgstr "Переключение %s на %s, ревизия %s" msgid "Switch To" msgstr "Пересмотреть..." -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Переключиться на предыдущую панель\nПредыдущая панель" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Переключить между одно- и двухпанельным видом" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Переключает из однопанельного вида в двухпанельный и наоборот\nПереключение между однопанельным и двухпанельным видами" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Переключить левый и правый вид" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Поменять местами левую и правую панель\nПоменять левую панель с правой" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Переключиться на следующее окно документа" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Переключиться на следующую панель\nСледующая панель" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Переключиться на предыдущее окно документа" @@ -9655,19 +9804,19 @@ msgstr "Переключиться на предыдущее окно докум msgid "Switch/Checkout" msgstr "Переключить" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Переключиться на" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Переключиться на этот..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Переключить рабочую копию на другую ветвь/метку" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Изменить сравнение левый<->правый" @@ -9679,23 +9828,23 @@ msgstr "Изображать символически имена ссылок" msgid "Symlink" msgstr "Символическая ссылка" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" -msgstr "Синхронизировать отдалённые хранилища, включая получение, отправление, email-заплатки и т.д." +msgstr "Синхронизировать внешние хранилища, включая получение, отправление, email-заплатки и т.д." -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Синхронизировать..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "Системное" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Система в режиме офф-лайн. Проверьте Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9705,11 +9854,11 @@ msgstr "Все компоненты реестра и INI-файлы (если msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" @@ -9725,7 +9874,7 @@ msgstr "Заполнитель закладки" msgid "Tab size:" msgstr "Размер табул.:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Метка" @@ -9733,16 +9882,16 @@ msgstr "Метка" msgid "Tag (FF)" msgstr "Метка (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Информация о метке" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Для рабочей копии назначена метка %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Метки" @@ -9750,11 +9899,11 @@ msgstr "Метки" msgid "Tags:" msgstr "Метки:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Задачи" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Панель задач" @@ -9766,11 +9915,11 @@ msgstr "Временные файлы (включая изображения Gra msgid "Test" msgstr "Тест" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Только проверка" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Текстовые файлы (*.txt)|*.txt|Все файлы (*.*)|*.*||" @@ -9778,78 +9927,98 @@ msgstr "Текстовые файлы (*.txt)|*.txt|Все файлы (*.*)|*.*| msgid "Thai" msgstr "Тайский" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" -msgstr "Настройки отдалённых хранилищ изменены.\nВы хотите сохранить или отменить изменения?" +msgstr "Настройки внешних хранилищ изменены.\nВы хотите сохранить или отменить изменения?" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "Значение \"количество\" для этих \"Последних N\" опций.\nДолжно быть > 0" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" "\n" "Do you really want to delete it?" -msgstr "Ветвь \"%s\" находится на отдалённом сервере.\n\nВы действительно хотите удалить ее?" +msgstr "Ветвь \"%s\" является внешней ветвью.\n\nВы действительно хотите удалить ее?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Размер куска кода на соответствует количеству добавленных/удаленных строк!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Сообщение фиксации не может быть пустым" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Удостоверяющий центр с таким URL \"%s\" уже существует.\nВы хотите перезаписать его?" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "Удостоверяющий центр был изменён.\nСохранить или отменить изменения?" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "Текущая рабочая копия не очищена.\nВы хотите поместить в копилку изменения?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "Ограничение по умолчанию на сообщения в журнале когда вы открываете диалоговое окно Журнала.\nПримечание: для показа всех фиксаций в диалоговом окне Журнала,\nвы можете нажать правой кнопкой мыши на поле \"ОТ\" и затем выбрать пункт \"Без ограничений\"." + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Механизм различий прервал работу из-за ошибки:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "Введенная ссылка-исходник сомнительна и двусмысленна.\nНеобходимо сделать ее уникальной (т.е. добавить \"refs/heads\" в качестве префикса для ветвей или \"refs/tags\" для меток)!" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "Текущая ветвь может быть быстро-перемотана вперёд до состояния полученной ветви.\n\nСлить изменения или открыть диалог перебазирования?" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Файл %s не существует!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Файл %s не найден в файле заплаток!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Файл \"%s\" не существует в вашей рабочей копии.\nВыбрать другой файл для сравнения?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9858,15 +10027,15 @@ msgid "" "Do you want to remove the file?" msgstr "Файл\n%s\nпуст!\nЖелаете ли вы его удалить?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Файл слишком велик" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Файл слишком большой для открытия." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9874,7 +10043,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Файл\n%s\nуже существует! Желаете ли вы его перезаписать?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9882,14 +10051,14 @@ msgid "" "is not a valid text file!" msgstr "Файл\n%s\nне является корректным текстовым файлом!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Папка %s\nсодержит неверсированные и/или изменённые файлы. Вы всё равно желаете её удалить?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9898,78 +10067,78 @@ msgid "" "Would you like to create it first?" msgstr "Папка\n%s\nне существует.\nЖелаете ли вы сначала её создать?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Хук скрипт вернул ошибку:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Не могу показать изображение." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Поставщик системы отслеживания проблем не может быть создан. Убедитесь, что он установлен корректно." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Поставщик системы отслеживания проблем не принял строку параметров" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Строка, обозначающая новый файл, ожидалась в строке %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Номер строки должен быть между %d и %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." -msgstr "Локальная ветвь \"%s\" не может быть быстро-вперёд-перемотана к отдалённой ветви \"%s\"." +msgstr "Локальная ветвь \"%s\" не может быть быстро-вперёд-перемотана к внешней ветви \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" -msgstr "Имя локальной ветви и имя отдалённой ветви пустое.\nПродолжить?" +msgstr "Имя локальной ветви и имя внешней ветви пустое.\nПродолжить?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" -msgstr "Пустое имя локальной ветки/метки. Это приведет к удалению из отдалённого хранилища.\nПродолжить?" +msgstr "Пустое имя локальной ветки/метки. Это приведет к удалению из внешнего хранилища.\nПродолжить?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Максимальное количество строк в журнале действий.\nПри добавлении строк свыше этого предела из файла начнут удалятся наиболее старые строки." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Операция провалилась." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Параметры '/path' и '/pathfile' являются взаимоисключающими.\nНеобходимо указать только один из них." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "Заплатка не применилась корректно к %s и нет никакой информации о версии.\nПрименение заплатки невозможно!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9979,7 +10148,7 @@ msgid "" "do not match!" msgstr "Похоже, заплатка устарела! Строка файла\n%s\nи строка заплатки\n%s\nне совпадают!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9990,7 +10159,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Похоже, что введенный вами путь/url недопустим в Windows!\nВы можете оставить его так, как есть, но в этом случае вы можете получить ошибку позже.\n\nКорректный путь в Windows не должен содержать '<<>|\"?*:' или одно из следующих имён устройств:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nВы действительно желаете использовать это значение?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -10001,36 +10170,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Путь\n%s\nне соответствует пути в файле заплатки.\nНо TortoiseGitMerge нашел путь\n%s\nкоторый подходит больше. Желаете ли вы использовать предложенный путь вместо исходного?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Процесс всё еще выполняется.\nВы действительно хотите прервать?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "Плохая, негодная регулярка!\nВведите хорошую, ну пожалуйста!" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" -msgstr "Отдалённый \"%s\" уже существует.\nВы хотите перезаписать его?" +msgstr "Внешнее хранилище \"%s\" уже существует.\nВы хотите перезаписать его?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "Внешняя ветвь не изменена.\n\nОткрыть диалог перебазирования невзирая на?" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Хранилище создано успешно." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Похоже, в выбранном файле остались конфликтные отметки.\nВы уверены, что желаете пометить его как улаженный?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10038,7 +10214,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "Подмодуль \"%s\" не чист.\nПростой фиксацией родительского модуля невозможно отследить или сохранить подобные изменения в подмодуле.\nФиксировать подмодуль сейчас или игнорировать нечистые изменения?" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10047,7 +10223,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Целевая папка\n%s\nявляется специальной и нежелательно чтобы она была корнем хранилища!\nВы действительно хотите инициализировать хранилище Гит внутри этой папки?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10056,26 +10232,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Папка назначения \n%s\nне пустая!\nВы уверены что хотите создать git хранилище в этой папке?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "Текст идентичный, но файлы не совпадают!\nНайдены следующие различия:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Время в секундах, после которого прекращается разбор выбранных файлов.\r\nМеньшее значение сделает доступным список автозавершения раньше,\r\nно при этом могут быть просмотрены не все файлы." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Выбранные URL не были созданы из общей основы.\nНевозможно показать сообщения журнала между ними!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10085,34 +10261,34 @@ msgstr "Рабочая копия не очищена и содержит неп msgid "Their file:" msgstr "Их файл:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Их" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Есть изменения или неверсированные элементы в папке(папках), содержащихся в субмодулях.\nЭти файлы не включены в список фиксирования. Их необходимо зафиксировать отдельно." -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Сейчас установлено %d обработчиков оверлеев кроме тех, которые используются Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" -msgstr "Остались еще редактируемые виды.⏎\nКакой вид вы хотите сохранить?" +msgstr "Остались еще редактируемые виды.\nКакой вид вы хотите сохранить?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Нет поставщиков интеграции с системами отслеживания проблем." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10121,85 +10297,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Остался неулаженный конфликт в сторке %d!\nВы должны уладить его перед сохранением.\nВы действительно желаете сохранить файл, содержащий конфликт?\nЕсли ответить ДА, вам придётся уладить конфликт вручную в другом редакторе!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Произведённые изменения не были сохранены!\nЖелаете ли вы сохранить эти изменения?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "Не найдено ничего, что можно добавить. Все файлы и папки либо уже под управлением версиями, либо проигнорированы в соответствии со свойством svn:ignore или общей конфигурационной настройкой игнорирования файлов." -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Словарь" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Содержатся недавно сохранённые документы содержащие изменения, которые были сделаны до закрытия приложения." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Это поле обязательно и не может быть пустым." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Введённое не является корректным URL.\nПожалуйста, введите здесь правильный URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Этот путь не является корректным!\nКорректный путь не должен содержать '<<>|\"?*:' или одно из следующих имён устройств:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." -msgstr "" +msgstr "Эта операция не может быть начата пока журнал всё ещё загружает фиксации." -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Эта программа связана с отсутствующим экспортом %s в файле %s. Возможно, эта машина имеет несовместимую версию %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Эта программа требует файл %s, не найденный в этой системе." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "У файла не может быть этого свойства, только у папки." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" -msgstr "Это отдаленное имя конфликтует с извлеченным refspec других отдаленных хранилищ\nИспользуйте другое имя, пожалуйста" +msgstr "Это внешнее имя конфликтует с извлеченным refspec других внешних хранилищ\nИспользуйте другое имя, пожалуйста" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Для этого вам нужна \"чистая\" рабочая копия." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Сейчас будет удалена регистрация всех команд, выполненных вами в этом приложении и восстановлен набор видимых по умолчанию команд в меню и панелях инструментов. Это не затрагивает явно выполненных настроек. Вы уверены, что желаете это сделать?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Трёхсторонние различия" @@ -10215,14 +10391,14 @@ msgstr "Выстроить по &горизонтали" msgid "To" msgstr "К/в" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" -msgstr "Чтобы избежать неверных меток при извлечении, если это не официальное отдаленное хранилище,⏎\nпредлагаем отключить извлечение меток для этого отдаленного хранилища.⏎\nОтключить извлечение меток?" +msgstr "Чтобы избежать неверных меток при извлечении, если это не официальное внешнее хранилище,\nпредлагаем отключить извлечение меток для этого внешнего хранилища.\nОтключить извлечение меток?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10234,13 +10410,13 @@ msgstr "Для очистки временных файлов вы должны msgid "To:" msgstr "По:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Переключение отображения одной/двух страниц\nПереключение отображения одной/двух страниц" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Переключить фильтры" @@ -10252,11 +10428,11 @@ msgstr "Панель инструментов" msgid "Toolbar Name" msgstr "Наименование панели инструментов" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Параметры панели инструментов" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Внутренняя ошибка панели инструментов. Пожалуйста, свяжитесь с поставщиком приложения." @@ -10272,16 +10448,16 @@ msgstr "Инструменты" msgid "Tools:" msgstr "Инструменты:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Сборка %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10291,20 +10467,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit обнаружил что файл \"%s\" не существует, но он подготовлен \"На добавление\".\nДиалоговое окно фиксации не может обработать такую ситуацию.\n\nВы хотите убрать этот файл из индекса? " +"Do you want to restore or remove it from the index?" +msgstr "TortoiseGit обнаружил что файл \"%s\" не существует, но он подготовлен \"На добавление\" или \"Модифицирован\".\nДиалоговое окно фиксации не может обработать такую ситуацию.\n\nВы хотите откатить изменения или убрать этот файл из индекса? " -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit обнаружил похожие имена. Желаете ли вы, чтобы следующие файлы: %s\nтоже были бы переименованы?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit не будет показывать следующие оверлеи: %s" @@ -10313,18 +10489,18 @@ msgstr "TortoiseGit не будет показывать следующие ов msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame уже инициализирован для хранилища %s. Невозможно переподключиться к другому хранилищу (\"%s\") в процессе работы." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10340,7 +10516,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10348,7 +10524,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseIDiff - инструмент сравнения изображений, часть TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10362,16 +10538,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10380,18 +10556,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge не может обработать этот файл заплатки. Имя файла \"%s\" используется более одного раза." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10428,13 +10604,13 @@ msgstr "Отслеживать" #. Resource IDs: (11023) msgid "Tracked Remote Branch:" -msgstr "Отслеживаемая отдалённая ветвь:" +msgstr "Отслеживаемая Внешняя Ветвь:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Отслеживаемая ветвь" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Передача на %s" @@ -10443,39 +10619,35 @@ msgstr "Передача на %s" msgid "Transparent &color..." msgstr "Прозрачный &цвет..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Обрезать справа" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Попробуйте команду 'Очистить'. Если это не поможет, вам надо будет извлечь заново." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Попробуйте еще раз" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Турецкий" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Подстроить TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Тип" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Тип:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL и папка не должны пустовать." @@ -10499,24 +10671,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Невозможно загрузить поддержку почтовой системы." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Невозможно выполнить команду, сервер занят." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Невозможно прочитать из %1: он открыт кем-то еще." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Невозможно прочитать свойство типа 'только-для-записи'." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10524,91 +10696,95 @@ msgid "" "from the top pane in the log dialog." msgstr "Невозможно воссоздать путь в рабочей копии!\nТакое может случится, если файл был переименован.\nЗапустите диалог журнала только для этого файла и уберите изменения,\nиспользуя контекстное меню в верхней панели диалога." -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Невозможно записать свойство типа 'только-для-чтения'." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Невозможно записать в %1: он только-для-чтения либо открыт кем-то еще." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Снять" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Отменить" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Откатить %d действий(я)" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Откатить 1 действие" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Отменить добавление..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Отменить последнее действие\nОткат" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Отменить последние изменения\nОтменить" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Неожиданный формат файла." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "Снять пометку как пропустить-в-рабочей-копии и предположительно-неизменённый" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Развернуть" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Неформатированный текст\nтекст без форматирования" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Объединённые разли&чия ГОЛОВНЫХ ветвей" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Неизвестно" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Неизвестная глубина" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Снять пометку с этого блока" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Неулаженные конфликты!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "Отозвать отслеживаемую ветвь" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Неназванный" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Неверсируемый" @@ -10616,7 +10792,7 @@ msgstr "Неверсируемый" msgid "Unversioned files mark parent folder as modified" msgstr "Неверсированные файлы помечают родительскую папку как изменённую" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Разверсирование %s" @@ -10629,23 +10805,23 @@ msgstr "Вверх" msgid "Update" msgstr "Обновить" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Обновить ссылку" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Обновить подмодули" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Обновлено" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Обновление объектов ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Обновляется индекс" @@ -10657,30 +10833,26 @@ msgstr "Использовать изображение по &умолчанию msgid "Use &one-pane view as default for 2-file diff" msgstr "&Однопанельный вид по умолчанию для двуфайловых различий" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Использовать &другой текстовый блок" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Использовать 'мой' текстовый блок" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Использовать 'мой' текстовый блок затем 'их'" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Использовать 'их' текстовый блок" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Использовать 'их' текстовый блок затем 'мой'" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Использовать блоки" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Использовать компонент пути HTTP" @@ -10701,15 +10873,15 @@ msgstr "Использовать тонкие пакеты (для медлен msgid "Use Unified Diff from &clipboard" msgstr "Использовать объединённые &различия из буфера обмена" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Используйте другое имя или воспользуйтесь опцией \"Принудительно\" для перезаписи." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Используйте другое имя или воспользуйтесь опцией \"Заместить ветвь\"." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10719,7 +10891,7 @@ msgstr "Использовать всё содержимое из левой п msgid "Use block from left before right" msgstr "Использовать левый блок перед правым" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10729,25 +10901,25 @@ msgstr "Использовать блок из левой панели пере msgid "Use block from right before left" msgstr "Использовать правый блок перед левым" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Использовать блок из правой панели перед блоком из левой\nИспользовать правый блок перед левым" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Использовать оба текстовых блока (этот в начале)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Использовать оба текстовых блока (этот в конце)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "Использовать сконфигурированный сервер" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Использовать левый блок" @@ -10763,15 +10935,15 @@ msgstr "Использовать цвет локальной ветви для msgid "Use recycle bin when reverting" msgstr "Использовать корзину при возврате изменений" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Регулярное выражение" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Использовать правый блок" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Использовать пробелы" @@ -10779,93 +10951,93 @@ msgstr "Использовать пробелы" msgid "Use system locale for date/time" msgstr "Использовать формат даты/времени из системных настроек" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Использовать '&мой' текстовый блок" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Использовать '&их' текстовый блок" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Использовать 'м&ой' текстовый блок перед 'их'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Использовать 'мой' текстовый блок перед 'их'\nСначала 'мой', затем 'их'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Использовать 'мой' текстовый блок\nИспользовать 'мой' текстовый блок" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Использовать 'и&х' текстовый блок перед 'моим'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Использовать 'их' текстовый блок перед 'моим'\nСначала 'их', затем 'мой'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Использовать 'их' текстовый блок\nИспользовать 'их' текстовый блок" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Использовать текстовый блок из левой панели\nИспользовать левый блок" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Использовать э&тот текстовый блок" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "Использовать текущее время путем присвоения даты у автора дате фиксации." -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" "Apply the patch to\n" "%s" -msgstr "Использовать найденный путь.⏎\nПрименить заплатку к⏎\n%s" +msgstr "Использовать найденный путь.\nПрименить заплатку к\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" "Apply the patch to\n" "%s" -msgstr "Использовать исходный путь.⏎\nПрименить заплатку к⏎\n%s" +msgstr "Использовать исходный путь.\nПрименить заплатку к\n%s" #. Resource IDs: (1825, 1826) msgid "Use this" msgstr "Использовать это" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Использовать &весь этот файл" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Использовать этот блок слева" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Использовать весь другой &файл" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Используется для изменения последнего коммита текущей ветви." @@ -10881,11 +11053,11 @@ msgstr "информация о пользователе" msgid "User Name:" msgstr "Имя пользователя:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Отменено пользователем" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10895,11 +11067,11 @@ msgstr "Имя и эл.почта пользователя должны быть msgid "User&name:" msgstr "Имя &пользователя:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Имя пользователя:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10918,7 +11090,7 @@ msgid "" "/line:" msgstr "Верные параметры командной строки:\n/base:<путь к базовому файлу>\n/basename:<базовое имя в заголовке>\n/theirs:<путь к \"их\" файлу>\n/theirsname:<\"их\" имя в заголовке>\n/mine:<путь к \"нашему\" файлу>\n/minename:<\"наше\" имя в заголовке>\n/merged:<путь к слитому файлу>\n/mergedname:\n/diff:<путь к файлу унифицированноных различий>\n/patchpath:<путь к папке>\n/saverequired\n/saverequiredonconflicts\n/oneway <принудительный однонаправленный вид>\n/line:<номер строки, к которой перейти>" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Значение" @@ -10926,24 +11098,24 @@ msgstr "Значение" msgid "Version" msgstr "Версия" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Версия: %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Версия 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Версия 1 (Более новое время фиксации)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Версия 2 (Базовая)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Версия 2 (Базовая) (Более новое время фиксации)" @@ -10951,11 +11123,11 @@ msgstr "Версия 2 (Базовая) (Более новое время фик msgid "Version Information" msgstr "Информация о версии" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Версия:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Версировано" @@ -10967,23 +11139,27 @@ msgstr "Вьетнамский" msgid "View" msgstr "Вид" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Просмотреть .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Посмотреть заплатку" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Посмотреть заплатку>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Посмотреть ревизию для пути в &веб-обозревателе" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Просмотреть ревизию в альтернативном редакторе" @@ -10995,11 +11171,11 @@ msgstr "Смотреть системный gitconfig" msgid "Visit our website" msgstr "Посетить наш вебсайт" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11010,7 +11186,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "ВНИМАНИЕ:\r\nИзменяйте эти настройки, если вы точно знаете что делаете!\r\nДля сброса настроек, очистите значения." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Ждать" @@ -11018,7 +11194,7 @@ msgstr "Ждать" msgid "Wait for the script to finish" msgstr "Ждать окончания работы скрипта" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Ожидаю ввода" @@ -11026,15 +11202,15 @@ msgstr "Ожидаю ввода" msgid "Walk Be&haviour" msgstr "Поведение" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Предупреждение" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Предупреждение!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11042,7 +11218,7 @@ msgid "" "Do you really want to continue?" msgstr "Предупреждение: \"%s\" будет удалён навсегда. Его будет НЕВОЗМОЖНО восстановить!!!\n\nЖелаете продолжить?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11050,56 +11226,56 @@ msgstr "Web" msgid "Western European" msgstr "Западно-европейский" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "После активации, зажмите кнопку Shift и щелкните правой кнопкой мыши для добавления меню TortoiseGit к контекстому меню" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "При применении заплатки, игнорировать изменения в пробелах в контексте линий если необходимо" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Спрашивать о завершении процесса при попытке закрыть окно до завершения обработки" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Когда включен, пункты перемещения контекстного меню TortoiseGit будут доступны при перетаскивании папок / файлов" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Если включено, большие номера версий будут идти первыми. Потому что последние версии обычно полезнее." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Если включено, перечисленные в диалоге фиксации версированные элементы автоматически отмечаются как выбранные " -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Когда заплатка не применилась корректно, вернитесь к 3-х стороннему слиянию: если заплатка содержит идентификаторы файлов к которым ее предполагается применить, эти файлы доступны локально." -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." -msgstr "При вводе URL, если вы не указали хранилище, то автоматически будет подставляться \"origin\", так что можете не заполнять." +msgstr "При вводе URL, если вы не указали внешнее хранилище, то автоматически будет подставлено \"origin\", так что можете не заполнять." -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "Ссылаться ли только на аннотированные метки, все метки или все ссылки" @@ -11109,15 +11285,15 @@ msgid "" "authentication and/or encryption." msgstr "Во время работы демона, все данные этого хранилища доступны без аутентификации и/или шифрования." -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Изменения непечатаемых знаков (символы табуляции, пробелы)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Непечатаемые знаки" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Расположение окна" @@ -11125,15 +11301,15 @@ msgstr "Расположение окна" msgid "Windows" msgstr "Окна" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11177,11 +11353,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "В файле:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "В файле" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Рабочая копия" @@ -11189,29 +11365,25 @@ msgstr "Рабочая копия" msgid "Working Tree Path:" msgstr "Путь к рабочей копии:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Изменения в рабочей копии" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Переносить длинные строки" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Переносить длинные строки по правой видимой границе\nПереносить длинные строки" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Да" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Да для всех" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "У вас уже установлена самая последняя версия." @@ -11221,119 +11393,119 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Здесь вы можете отключить отдельные обработчики наложений.\nОтключенные обработчики не будут использовать оверлейные слоты и предоставляют другим расширениям оболочки возможность отобразить их оверлейные значки." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Можно вставлять изображение только размером %d на %d!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Нельзя создать больше, чем %d пользовательских панелей инструментов!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Это свойство применимо к файлам, а не папкам!\nЕсли вы желаете установить его на всех файлах в этой папке,\nнеобходимо отметить флажок 'рекурсивно'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Вы не можете изменить тип этой ссылки переименованием." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "У вас установлена старая версия Git для Windows (https://msysgit.github.io/) имеющая некоторые проблемы безопасности. \n\nВам следует рассмотреть возможность обновления до версии 1.9.5+." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "Вы отметили \"включая неверсированные\".\nЭто подразумевает выполнение команды \"git clean -fd\", при которой игнорируемые файлы и директории будут удалены без помещения их в корзину." -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "Вы отметили изменённые блоки. Как эти блоки следует сохранить?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Свойства были изменены и не были сохранены.\nВы желаете сохранить их сейчас?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" "For every of these items a new instance of the diff viewer will be started.\n" "Do you really want to show the diff for so many items at once?" -msgstr "Вы выбрали %d элементов, чтобы показать их сравнение.⏎ Для каждого элемента будет запущен собственный экземпляр diff viewerа.⏎ Вы действительно хотите просмотреть различия для стольких элементов сразу?" +msgstr "Вы выбрали %d элементов, чтобы показать их сравнение.\nДля каждого элемента будет запущен собственный экземпляр diff viewerа.\nВы действительно хотите просмотреть различия для стольких элементов сразу?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Вы не ввели номер проблемы!\nВы действительно желаете зафиксировать файл(ы) без номера проблемы?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Вы не ввели строку вашей подписи!" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "Вы пометили некоторые файлы как \"Восстановить после коммита\".\nВы хотите восстановить их сейчас? Вы можете потерять все изменения в этих файлах после такой пометки." -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Можно задать до %d инструментов." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Вам необходимо ввести текст сообщения для фиксации" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Вы должны перезагрузить систему, чтобы изменения вступили в силу." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Вы должны выбрать имя файла для zip" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Вы выбрали папку.\nЭкспорт возможен в файл (zip)." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Вы выбрали неверсированный файл.\nЭтот файл будет внесён под управление версиями при фиксировании." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Вы должны ввести текст!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Вы должны выбрать изображение!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Вы изменили набор значков с %s на %s.\nЭти изменения вступят в силу только после перезагрузки, или после нового входа в операционную систему!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11343,7 +11515,7 @@ msgstr "Ваши ранее введённые сообщения журнала msgid "Your version is:" msgstr "Ваша версия:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Ваша версия: %d.%d.%d.%d" @@ -11353,10 +11525,10 @@ msgid "Zip File" msgstr "Zip-файл" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "У&меньшить" +msgid "Zoo&m out\t-" +msgstr "У&меньшить\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Увеличение" @@ -11368,80 +11540,80 @@ msgstr "У&величить" msgid "Zoom &Out" msgstr "У&меньшить" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Масштаб 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Увеличить\nУвеличить" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Уменьшить\nУменьшить" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "У&величить" +msgid "Zoom i&n\t+" +msgstr "У&величить\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Увеличить" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Уменьшить" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "По содержимому" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "По высоте" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "По ширине" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[По умолчанию]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Не назначено]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "\"%s\" содержит git хранилище. Оно не сможет в текущем виде работать как Подмодуль.\nВы хотите удалить .git-запись и добавить все файлы к хранилищу, или же сохранить их как независимое хранилище в своём подкаталоге?" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "\"%s\" содержит git Подмодуль. Скорее всего он более не будет работать на целевом каталоге после копирования.\nВы хотите удалить .git-запись и добавить все файлы к хранилищу, или игнорировать этот возможный нюанс и сохранить Подмодуль?" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" недействительна." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" не является git хранилищем" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11455,7 +11627,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "добавить \"пересмотрено вручную из\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "добавлен" @@ -11463,7 +11635,7 @@ msgstr "добавлен" msgid "added files" msgstr "добавленные файлы" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "безымянный файл" @@ -11471,14 +11643,19 @@ msgstr "безымянный файл" msgid "and support the developers" msgstr "и поддержать разработчиков" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "предположительно-годный" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "автор" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "автор (>= 0.5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "Основано на TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11511,30 +11688,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "фиксации" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "конфликт" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "скопировано из\r\n%s - ревизия %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "день" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "удалён" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "сравнить из канала" @@ -11546,7 +11723,7 @@ msgstr "пустой" msgid "eMail settings" msgstr "eMail настройки" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11555,16 +11732,16 @@ msgid "" "%s" msgstr "%s\nэкспортирован в\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "внешнее" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git завершил выполнение некорректно (код завершения %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "игнорируемый" @@ -11572,15 +11749,15 @@ msgstr "игнорируемый" msgid "include &untracked" msgstr "включая неверсированные" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "незакончен" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "не перекрывать" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "элемент оставлен локально" @@ -11588,16 +11765,16 @@ msgstr "элемент оставлен локально" msgid "keep the file lists in English" msgstr "сохранить список файлов на англисйком" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" "%s = %ld\n" "%s = %ld\n" "%s = %ld" -msgstr "строк: %d(+) %d(-) файлов: %s = %ld⏎\n%s = %ld⏎\n%s = %ld⏎\n%s = %ld" +msgstr "строк: %d(+) %d(-) файлов: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11606,17 +11783,17 @@ msgid "" "%s = %ld\n" "%s = %ld\n" "%s = %ld" -msgstr "строки: %d(+) %d(-) файлы: %s = %ld⏎\n%s = %ld⏎\n%s = %ld⏎\n%s = %ld⏎\n%s = %ld⏎\n%s = %ld" +msgstr "строки: %d(+) %d(-) файлы: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" #. Resource IDs: (1494) msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "Слит" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "отсутствует" @@ -11624,7 +11801,7 @@ msgstr "отсутствует" msgid "missing/deleted/replaced" msgstr "Отсутствует/удалён/замещён" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "изменён" @@ -11632,7 +11809,7 @@ msgstr "изменён" msgid "modified/copied" msgstr "Изменён/скопирован" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "месяц" @@ -11640,40 +11817,44 @@ msgstr "месяц" msgid "new branch" msgstr "новая ветвь" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "нет" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "нет описания для этой команды" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "неверсирован" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "ничего" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "нормальный" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "не найден" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "мешающий" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "на %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "пикселы" @@ -11681,11 +11862,11 @@ msgstr "пикселы" msgid "possible or real conflict/obstructed" msgstr "Конфликтующий/мешающий" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "квартал" @@ -11693,35 +11874,35 @@ msgstr "квартал" msgid "renamed" msgstr "переименованный" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "замещён" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "просматриваем путь:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "опустить-рабочую-копию" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "переключено на\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "заботиться об изменениях в подмодуле" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "до %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "в %s" @@ -11730,35 +11911,35 @@ msgstr "в %s" msgid "u&nknown changes" msgstr "н&еизвестные изменения" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "неделя" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - все пользователи Windows" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - текущий пользователь Windows" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - только это хранилище" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - текущий пользователь Windows" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - только это хранилище" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "год" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "да" diff --git a/Languages/Tortoise_sk.po b/Languages/Tortoise_sk.po index 7f78bf34f..84a343cc4 100644 --- a/Languages/Tortoise_sk.po +++ b/Languages/Tortoise_sk.po @@ -4,14 +4,14 @@ # This file is distributed under the same license as TortoiseGit # # Translators: -# pavolmnich , 2014 -# Sven Strickroth , 2014 +# pavolmnich, 2014-2015 +# Sven Strickroth , 2014-2015 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/tortoisegit/language/sk/)\n" "MIME-Version: 1.0\n" @@ -20,7 +20,7 @@ msgstr "" "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -42,138 +42,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "počet samostatne zobrazených autorov:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "Prenesené dáta: %.2f MiB" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 obsahoval neočakávaný objekt." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 obsahuje nesprávnu cestu." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 obsahuje nesprávnu schému." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 má zlý formát." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 nebol nájdený." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nPokračovať v skripte?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -181,52 +181,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nTento súbor nemožno nájsť.\nSkontrolujte, či je zadaná správna cesta a meno súboru." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "Prenesené dáta: %I64d B" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "Prenesené dáta: %I64d KiB" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d zmenených súborov" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d odstránených súborov." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -234,78 +234,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alfa\nklikom prepnite alfu\ndvojklik zmení alfu automaticky" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld z %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Obnovené]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s v %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nChcete napriek tomu odstrániť?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -321,6 +321,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&O TortoiseGitBlame..." @@ -349,15 +353,15 @@ msgstr "&Pridať filter" msgid "&Add New/Save" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Pridať odstrániť tlačítka" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Pridať..." @@ -397,7 +401,7 @@ msgstr "&Priradiť" msgid "&Associate double-click event with:" msgstr "&Priradiť dvojklik k:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Skryť automaticky" @@ -413,15 +417,15 @@ msgstr "" msgid "&Backup original file" msgstr "&Zálohuj pôvodný súbor" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "O&bviniť zmeny" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Obviniť revízie" @@ -445,7 +449,7 @@ msgstr "&Vetva:" msgid "&Browse Dir" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Prezerať úložisko" @@ -481,7 +485,7 @@ msgstr "&Kategória:" msgid "&Choose commands from:" msgstr "&Vybrať príkazy z:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Vyčistiť..." @@ -505,7 +509,7 @@ msgstr "&Zatvoriť okno(á)" msgid "&Command:" msgstr "&Príkaz:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "" @@ -513,23 +517,27 @@ msgstr "" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Odovzdať..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Porovnať revízie" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopírovať" @@ -549,11 +557,11 @@ msgstr "&Prispôsobenie" msgid "&Default" msgstr "&Predvolené" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Vymazať" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Odstrániť (zachovať lokálne)" @@ -561,7 +569,7 @@ msgstr "&Odstrániť (zachovať lokálne)" msgid "&Delete Filter" msgstr "&Zrušiť filter" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "" @@ -573,11 +581,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Porovnať" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Porovnať s predchádzajúcou verziou." @@ -589,7 +597,7 @@ msgstr "&Adresár:" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "" @@ -597,7 +605,7 @@ msgstr "" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Zachytávanie" @@ -605,11 +613,15 @@ msgstr "&Zachytávanie" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Dole" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Stiahnuť" @@ -617,11 +629,11 @@ msgstr "&Stiahnuť" msgid "&Edit" msgstr "&Upraviť" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Upraviť .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Upraviť všetko" @@ -629,7 +641,7 @@ msgstr "&Upraviť všetko" msgid "&Edit Filter" msgstr "&Upraviť filter" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Upraviť konflikty" @@ -654,10 +666,10 @@ msgid "&Enable edit" msgstr "&Povoliť úpravy" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportovať výber do..." @@ -669,27 +681,27 @@ msgstr "&Externé" msgid "&File" msgstr "&Súbor" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Hľadať" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Hľadať\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Zväčšiť na veľkosť okna" +msgid "&Fit images in window\tF" +msgstr "&Zväčšiť na veľkosť okna\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Pevné disky" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Plávajúce" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -701,7 +713,7 @@ msgstr "&Písmo správ denníka:" msgid "&Font:" msgstr "&Písmo:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -721,7 +733,7 @@ msgstr "" msgid "&Go to\tCtrl+G" msgstr "&Ísť na\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -733,7 +745,7 @@ msgstr "&Zelené:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Pomoc" @@ -741,7 +753,7 @@ msgstr "&Pomoc" msgid "&Help Topics" msgstr "Témy &pomocníka" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Skryť" @@ -749,11 +761,11 @@ msgstr "&Skryť" msgid "&Icon Set:" msgstr "&Sada ikon:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorovať" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorovať %d objektov podľa mena" @@ -767,14 +779,14 @@ msgid "&Image" msgstr "&Obrázok" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informácie o obrázku" +msgid "&Image info\tI" +msgstr "&Informácie o obrázku\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Iba obrázky" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importovať..." @@ -786,7 +798,7 @@ msgstr "&Počiatočný adresár:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Inštalovať" @@ -798,11 +810,11 @@ msgstr "Po načítaní skoč na prvý &rozdiel" msgid "&Keep CR" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "&Značky" @@ -830,7 +842,7 @@ msgstr "&Limit:" msgid "&Line number" msgstr "&Číslo riadka" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "Číslo &riadka (%d - %d)" @@ -847,7 +859,7 @@ msgstr "&Zoznam" msgid "&Local Branch:" msgstr "&Lokálna vetva:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Lokálne vetvy" @@ -871,11 +883,11 @@ msgstr "Animácie &ponuky:" msgid "&Menu contents:" msgstr "Obsah &ponuky:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Zlúčiť" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Zlúčiť..." @@ -931,6 +943,10 @@ msgstr "" msgid "&Next Page" msgstr "&Ďalšia strana" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Nie" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Žiadna akcia dvojkliku" @@ -947,11 +963,11 @@ msgstr "Žiad&ne" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Jeden panel" @@ -959,19 +975,15 @@ msgstr "&Jeden panel" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Otvoriť" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Otvoriť...\tCtrl+O" @@ -984,18 +996,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "Prekrývať &obrázky" +msgid "&Overlay images\tO" +msgstr "Prekrývať &obrázky\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Heslo:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Vložiť" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1003,7 +1015,7 @@ msgstr "" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Náhľad pred tlačou" @@ -1011,11 +1023,15 @@ msgstr "&Náhľad pred tlačou" msgid "&Print..." msgstr "&Tlačiť..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Tlačiť...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1023,10 +1039,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Ostatné záznamy" @@ -1039,7 +1059,7 @@ msgstr "" msgid "&Red:" msgstr "&Červené:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Znova" @@ -1055,7 +1075,7 @@ msgstr "&Obnoviť" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1063,7 +1083,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "&Vzdialená vetva:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "&Vzdialené vetvy:" @@ -1071,7 +1091,7 @@ msgstr "&Vzdialené vetvy:" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Odstrániť" @@ -1083,7 +1103,7 @@ msgstr "" msgid "&Replace" msgstr "&Nahradiť" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "P&rehliadať úložisko" @@ -1091,7 +1111,7 @@ msgstr "P&rehliadať úložisko" msgid "&Reset" msgstr "&Vrátiť štandardné" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Prednastaviť lištu" @@ -1107,23 +1127,27 @@ msgstr "&Vynulovať moje údaje o používaní" msgid "&Reset to Default" msgstr "&Vrátiť štandardné" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Vyriešené" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Obnoviť" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1135,7 +1159,7 @@ msgstr "&SSH klient:" msgid "&Saturation:" msgstr "&Saturácia:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Uložiť" @@ -1143,15 +1167,19 @@ msgstr "&Uložiť" msgid "&Save authentication" msgstr "&Uložiť autentifikáciu" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Uložiť graf ako..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Uložiť zoznam vybraných súborov do..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Uložiť\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1159,7 +1187,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Nastavenia" @@ -1179,7 +1207,7 @@ msgstr "&Zobraziť názvy" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Preskočiť" @@ -1187,7 +1215,7 @@ msgstr "&Preskočiť" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1199,7 +1227,7 @@ msgstr "" msgid "&Start Group" msgstr "&Začať skupinu" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Odložiť" @@ -1219,7 +1247,7 @@ msgstr "&Zobrazenie znakov" msgid "&Tab size:" msgstr "Veľkosť &tab.:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "Dokument so &záložkami" @@ -1227,7 +1255,7 @@ msgstr "Dokument so &záložkami" msgid "&Tag" msgstr "&Značka" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Značky" @@ -1263,7 +1291,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Nástroje:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1275,7 +1303,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dva panely" @@ -1283,15 +1315,15 @@ msgstr "&Dva panely" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Späť" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Unifikované porovnanie" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1303,7 +1335,7 @@ msgstr "&Neznáme disky" msgid "&Up" msgstr "&Hore" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Aktualizovať objekt na revíziu" @@ -1315,11 +1347,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "Po&užiť automatické doplňovanie ciest súborov a kľúčových slov" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Užívateľ:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Zobraziť" @@ -1327,7 +1359,7 @@ msgstr "&Zobraziť" msgid "&View:" msgstr "&Zobrazenie:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1343,6 +1375,10 @@ msgstr "Celé &slovo" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -1351,46 +1387,46 @@ msgstr "" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(od %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(žiaden zoznam zmien)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(nie je číslo riadku)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(bez hodnoty)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nenájdené)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(neznámy)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- všetko -" @@ -1398,13 +1434,14 @@ msgstr "- všetko -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1412,7 +1449,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config v koreňovom adresári repozitára" @@ -1428,7 +1465,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr ".gitignore v koreňovom adresári repozitára" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig v koreňovom adresári repozitára" @@ -1444,31 +1481,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<Žiadna vetva>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1477,66 +1514,66 @@ msgid "" "And read the manual!" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1544,7 +1581,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1556,71 +1593,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Je dostupná nová verzia. Prosím, stiahnite si aktuálnu verziu!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Novými riadkami oddeľovaný zoznam ciest, pre ktoré nebude zobrazená kontextová ponuka.\r\nKeď pridáte znak '*' na koniec cesty, všetky súbory a podadresáre tohto adresára budú tiež vylúčené.\r\nPrázdny zoznam povolí kontextovú ponuku pre všetky cesty." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Požadovaný zdroj nebol prístupný." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Prehliadač súborov 'GNU diff' (súborov záplat).\r\nAk žiadny nemáte bude použité: Poznámkový blok (notepad)." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "" @@ -1636,11 +1673,11 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Prerušiť" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Prerušiť &zlučovanie" @@ -1648,11 +1685,11 @@ msgstr "Prerušiť &zlučovanie" msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "O programe" @@ -1672,12 +1709,12 @@ msgstr "" msgid "Accept certificate" msgstr "Akceptovať certifikát" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Prístup k %1 bol zamietnutý." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Akcia" @@ -1685,26 +1722,26 @@ msgstr "Akcia" msgid "Action log" msgstr "Denník úkonov" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Akcie" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Aktivovať zoznam úloh" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktívne súbory" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Nie je možné uložiť objekty ActiveX keď sa Windows vypína!\nZahodiť všetky zmeny v %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Pridať" @@ -1712,7 +1749,7 @@ msgstr "Pridať" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Pridať '%s' do slovníka" @@ -1725,15 +1762,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Pridať porovnávací program pre príponu" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Upraviť zlučovací program pre príponu" @@ -1741,15 +1778,15 @@ msgstr "Upraviť zlučovací program pre príponu" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Pridaj do zoznamu &ignorovaných" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Pridať do lišty rýchleho prístupu" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Pridať..." @@ -1757,11 +1794,11 @@ msgstr "Pridať..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Pridať/upraviť porovnávací program pre príponu" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Pridané" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1769,25 +1806,25 @@ msgid "" "to the ignore list." msgstr "Pridaná šablóna\n%s\ndo zoznamu ignorovaných." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Pridávam" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Pridá vybrané súbory, alebo masku do zoznamu ignorovaných" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Zmeniť nastavenia\nNastavenia" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Pokročilé" @@ -1795,43 +1832,43 @@ msgstr "Pokročilé" msgid "Advanced Diff/Merge Settings" msgstr "Pokročilé nastavenia pre rozdiely/zlúčenie" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Rozšírené nastavenia porovnávania" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Pokročilé nastavenia zlučovania" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Všetko" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Všetky príkazy" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Všetky súbory (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Všetky súbory (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1839,47 +1876,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Všetky vaše zmeny budú stratené! Naozaj chcete predvolené nastavenie všetkých líšt a ponúk?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Všetky vaše zmeny budú stratené! Naozaj chcete predvolené nastavenie priradenia klávesov?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Všetky vaše zmeny budú stratené! Naozaj chcete predvolené nastavenie pre ponuku '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Všetky vaše zmeny budú stratené! Naozaj chcete predvolené nastavenie lišty '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Povoliť úpravy pre toto okno\nPovoliť úpravy" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1895,11 +1932,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Vždy použiť systémové nastavenie pre zobrazenie času a dátumu" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1907,12 +1944,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1923,7 +1960,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1936,34 +1973,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Neplatný identifikátor súboru k %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Nastala neznáma chyba." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Počas prístupu k %1 nastala neznáma chyba." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Bol nájdený neznámy typ riadku %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Pripojiť pravý blok" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Pripojiť blok do prava" @@ -1975,11 +2012,11 @@ msgstr "Rámcová ponuka aplikácie" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Použiť záplatu..." @@ -1987,7 +2024,7 @@ msgstr "Použiť záplatu..." msgid "Apply Patches" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -1995,7 +2032,7 @@ msgstr "" msgid "Apply unified diff" msgstr "Použiť unifikované porovnanie" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Vodný štýl" @@ -2003,39 +2040,39 @@ msgstr "Vodný štýl" msgid "Arabic" msgstr "Arabské" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Naozaj chcete označiť súbor(y) v stave konfliktu za vyriešené?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Naozaj chcete uložiť do \"%s\"?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Usporiadať &vertikálne" +msgid "Arrange &vertical\tV" +msgstr "Usporiadať &vertikálne\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Priradené k zoznamu zmien '%s'" @@ -2044,11 +2081,11 @@ msgstr "Priradené k zoznamu zmien '%s'" msgid "Assigned to:" msgstr "Priradené k:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2060,34 +2097,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Na revízií: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Pokus o nepodporovanú operáciu." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Attempted to access %1 past its end." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Pri zapisovaní do %1 bol pokus o čítanie." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Pri čítaní %1 bol pokus o čítanie." @@ -2104,11 +2141,11 @@ msgstr "Autentifikácia" msgid "Authentication data" msgstr "Autentifikačné údaje" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2116,7 +2153,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan KUENG" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autori" @@ -2136,37 +2173,37 @@ msgstr "" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "" +msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Automaticky skryť" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Automaticky skryť všetko" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Automaticky zavrieť, keď nie sú konflikty" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Automaticky zavrieť, keď nie sú chyby" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Automaticky zavrieť, keď nie sú zlúčenia, pridania alebo vymazania" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2180,7 +2217,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatika" @@ -2200,7 +2237,7 @@ msgstr "Priemer" msgid "B&rowse..." msgstr "P&rechádzaj..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Späť" @@ -2212,7 +2249,7 @@ msgstr "" msgid "Baltic" msgstr "Baltické" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Stĺpcový graf" @@ -2232,7 +2269,7 @@ msgstr "Základný súbor:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Základné informácie" @@ -2244,45 +2281,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmapa\nbitmapa" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Čierny štýl" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Obviniť" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Obviní každý riadok autora v súbore" @@ -2290,26 +2327,30 @@ msgstr "Obviní každý riadok autora v súbore" msgid "Blend alpha" msgstr "Alfa zmiešania" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Modrý štýl" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Boli zadane /logmsg aj /logmsgfile!\nMôže byť zadané iba jedno." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Obe cesty - cesta súboru záplaty a cieľová cesta - musia byť absolútne." -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Dolné okno:" @@ -2321,30 +2362,30 @@ msgstr "P&rechádzaj..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Vetva" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Názov vetvy" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2356,11 +2397,11 @@ msgstr "Vetva:" msgid "Bro&wse" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "" @@ -2372,7 +2413,7 @@ msgstr "" msgid "Browse..." msgstr "Prezerať..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID Chyby" @@ -2384,7 +2425,7 @@ msgstr "&Výraz pre Bug-ID:" msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "ID chýb" @@ -2400,7 +2441,7 @@ msgstr "" msgid "Button Appearance" msgstr "Zobrazenie tlačidiel" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2416,7 +2457,7 @@ msgstr "S&kontroluj teraz" msgid "C&ommands:" msgstr "&Príkazy" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "Vytvo&r vetvu/značku z revízie" @@ -2424,17 +2465,17 @@ msgstr "Vytvo&r vetvu/značku z revízie" msgid "C&urrent Keys:" msgstr "Ak&tuálny kláves:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "Vyrez&ať" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" #. Resource IDs: (65535) msgid "CC:" -msgstr "" +msgstr "CC:" #. Resource IDs: (1741) msgid "Calculate" @@ -2444,93 +2485,93 @@ msgstr "Prepočítať" msgid "Can double-click in log list to compare with previous revision" msgstr "Dvojklik na zoznam denníka k porovnaniu s predchádzajúcou revíziou" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Nemožno aktivovať statický objekt ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" "%s\n" "to\n" "%s" -msgstr "" +msgstr "Nemožno kpírovať \n%s\ndo\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Obrázok nie je možne kopírovať do schránky" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Nie je možné vytvoriť nový obrázok" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Ponuku nie je možné prispôsobiť!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Nie je možné vložiť obrázok zo schránky!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Zrušiť" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Zrušiť\nNeprepínať zobrazenia" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Zrušiť\nPonechať prázdny súbor." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Zrušiť\nNajprv vyriešiť konflikty." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Zrušiť\nPonechať aktuálne súbory" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Zrušiť\nPonechať aktuálne nastavenia" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Nemožno zobraziť porovnanie, pretože sú nekonzistentné ukončenia riadkov v súbore." @@ -2542,7 +2583,7 @@ msgstr "Kaská&da" msgid "Cascaded context menu" msgstr "Kaskádová kontextová ponuka" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "" @@ -2566,33 +2607,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Zmeniť štýl programu\nZmení štýl" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Zmeniť polohu okna" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Zmeniť veľkosť okna" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Zmeniť typ" @@ -2600,38 +2641,38 @@ msgstr "Zmeniť typ" msgid "Changed Files" msgstr "Zmenené súbory" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Zoznam zmien %s bol presunutý:" @@ -2640,7 +2681,7 @@ msgstr "Zoznam zmien %s bol presunutý:" msgid "Changes made (double-click on file for diff):" msgstr "Boli vykonané zmeny (dvojklik na zobrazenie rozdielov):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Zmení štýl programu" @@ -2648,7 +2689,7 @@ msgstr "Zmení štýl programu" msgid "Char position where to show a border line in commit text boxes:" msgstr "Pozícia znaku kde ukazovať čiaru okraja riadku v odovzdávacom okne:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Skontrolovať" @@ -2660,31 +2701,31 @@ msgstr "Skontrolovať aktualizácie - TortoiseGit" msgid "Check For Updates..." msgstr "Skontrolovať aktualizácie..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Skontrolovať &zmeny" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Skontrolujte cestu a URL adresu, ktorú ste zadali." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Zaškrtnite ak chcete menej výpisov dátumu a času v správach denníka" @@ -2692,31 +2733,31 @@ msgstr "Zaškrtnite ak chcete menej výpisov dátumu a času v správach denník msgid "Check:" msgstr "Skontrolovať:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Získať" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2724,11 +2765,11 @@ msgstr "" msgid "Chinese" msgstr "Čínske" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Vybrať repozitár" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2740,78 +2781,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Čistenie" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Na nasledovných cestách bolo čistenie neúspešne:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Na nasledovných cestách prebehlo čistenie úspešne:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Vymazať" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Nástroj guma\nGuma" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Vymaže uložené správy denníka z %ld úložísk" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Vymaže uložené polohy a veľkosti dialógových okien (%ld)" @@ -2820,7 +2861,7 @@ msgstr "Vymaže uložené polohy a veľkosti dialógových okien (%ld)" msgid "Click here to go to the website" msgstr "Kliknite sem, aby ste sa dostali na webovú stránku" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Kliknite pre vybranie naposledy napísanej správy" @@ -2836,17 +2877,17 @@ msgid "" "extension" msgstr "Vyberte \"Pokročilé\" k zadaniu náhradného zlučovacieho programu podľa prípon" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Kliknite aby sa zobrazili príkazy na presúvanie textu\nPoužitie blokov textu" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Schránka" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Klonovať" @@ -2854,7 +2895,7 @@ msgstr "Klonovať" msgid "Clone Existing Repository" msgstr "Klonovať existujúci repozitár" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Klonovať repozitár" @@ -2862,49 +2903,49 @@ msgstr "Klonovať repozitár" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Klonovať..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Zatvoriť" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Zatvoriť celoobrazovkové zobrazenie" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Zatvoriť náhľad pred tlačou\n&Zatvoriť" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Zatvoriť ručne" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Zatvorí aktívne okno a vyzve k uloženiu dokumentov" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Zbaliť" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2930,7 +2971,7 @@ msgstr "Farby:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2938,11 +2979,11 @@ msgstr "" msgid "Comman&ds:" msgstr "Príka&zy" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Príkaz" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Príkazový riadok" @@ -2950,7 +2991,7 @@ msgstr "Príkazový riadok" msgid "Command Line To Execute:" msgstr "Príkazový riadok na vykonanie:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Príkaz zlyhal." @@ -2958,41 +2999,41 @@ msgstr "Príkaz zlyhal." msgid "Commands" msgstr "Príkazy" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Odovzdať" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "" @@ -3000,7 +3041,7 @@ msgstr "" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3008,19 +3049,19 @@ msgstr "" msgid "Commit to:" msgstr "Odovzdať do:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Odovzdať ..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Odovzdania podľa autorov" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Odovzdania podľa času" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "" @@ -3029,15 +3070,15 @@ msgstr "" msgid "Commits each week:" msgstr "Odovzdania každý týždeň:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Odovzdať vaše zmeny do úložiska" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3049,52 +3090,52 @@ msgstr "" msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Porovnať &HEAD revízie" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Porovnať dva súbory" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Porovnávať biele znaky" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Porovnať so zákl&adom" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Porovnať s predchádzajúcou revíziou" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Porovnať všetky biele znaky pri porovnávaní\nPorovnať biele znaky" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Porovná súbor s naposledy odovzdanou revíziou, aby ste videli zmeny, ktoré ste vykonali" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Hotovo" @@ -3110,7 +3151,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3144,11 +3185,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Konflikt" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "" @@ -3156,15 +3197,15 @@ msgstr "" msgid "Conflict resolved" msgstr "Konflikt bol vyriešený" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Konfliktné" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Konflikty" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konflikty: %d" @@ -3177,124 +3218,124 @@ msgstr "Kontextové ponuky:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Pokračovať" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Zúžiť zakotvené okno" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Zmeniť medzery na tabulátory" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Zmeniť tabulátory na medzery" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Kopíruj" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Skopírované" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopírovať" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Nástroj kopírovať\nKopírovať" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopírovať a premenovať" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Kopírovať výber do &schránky" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Kopírovať výber a vlož ho do schránky\nKopírovať" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Kopírovať do schránky" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopírovať: Nové meno pre %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Kopírovanie %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopírovanie..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Opravy" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Nemožno pridať %s do zoznamu vylúčení!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Nemožno skontrolovať novšiu verziu!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3302,76 +3343,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 nemohol byť vytvorený, pretože je plný adresár." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Nemožno určiť posledne odovzdanú revíziu." -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Nemožno získať stav!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 nemohol byť otvorený, pretože je otvorených príliš veľa súborov." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Nemožno otvoriť súbor\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 nemohol byť zmazaný, pretože je to aktuálny adresár." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Nemožno odstrániť %s zo zoznamu vylúčení" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Nemožno získať URL súboru!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Nie je možné spustiť TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3379,7 +3420,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3387,7 +3428,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3395,11 +3436,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Nemožno začať tlačovú úlohu." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3407,11 +3448,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Nemožno spustiť vlákno!" @@ -3419,7 +3460,7 @@ msgstr "Nemožno spustiť vlákno!" msgid "Coun&t" msgstr "Poče&t" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3432,15 +3473,15 @@ msgstr "Vytvoriť &Knižnicu" msgid "Create .gitignore file" msgstr "Vytvoriť súbor .gitignore" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Vytvoriť vetvu" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Vytvoriť vetvu v tejto verzii..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Vytvoriť vetvu..." @@ -3452,29 +3493,29 @@ msgstr "Vytvoriť zoznam zmien!" msgid "Create New Branch" msgstr "Vytvoriť novú vetvu" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Vytvoriť značku" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Vytvoriť značku..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3483,49 +3524,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Vytvoriť záplatu" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Vytvorené" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Vytvoriť vetvu alebo značku" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Vytvorí záplatu z rozdielu dvoch súborov\nVytvoriť súbor záplaty" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Vytvorí databázu úložiska na aktuálnom mieste" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Vytvorí súbor unifikovaného porovnania so všetkými zmenami, ktoré ste urobili" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3537,7 +3578,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Vyreza&ť" @@ -3545,7 +3586,7 @@ msgstr "Vyreza&ť" msgid "Current" msgstr "Aktuálne" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Aktuálna vetva" @@ -3553,7 +3594,7 @@ msgstr "Aktuálna vetva" msgid "Current Branch:" msgstr "Aktuálna vetva:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3565,7 +3606,7 @@ msgstr "" msgid "Current version is:" msgstr "Aktuálna verzia:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Aktuálna verzia: %s" @@ -3578,7 +3619,7 @@ msgstr "Vlas&tné" msgid "Custom" msgstr "Prispôsobenie" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Prispôsobiť" @@ -3586,19 +3627,19 @@ msgstr "Prispôsobiť" msgid "Customize Keyboard" msgstr "Prispôsobiť klávesy" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Prispôsobiť lištu rýchleho prístupu" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Prispôsobiť lištu rýchleho prístupu..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Prispôsobiť..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3612,88 +3653,92 @@ msgstr "Cyrilika" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Dátum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Prednastavené" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Prednastavená ponuka" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Predvolená ponuka aplikácie. Zobrazuje sa keď nie je otvorený žiaden dokument." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Predvolené UTF-8 kódovanie" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Vymazať" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Odstrániť všetky značky" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Vymazať a &ignorovať %d objektov podľa mena" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Vymazať a ignorovať %d objektov podľa &prípony" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Zmazať vetvu" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Odstrániť vetvu/značku" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3701,34 +3746,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Odstrániť značku" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Vymazať\nOdstrániť súbor" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Vymazané" @@ -3736,36 +3781,36 @@ msgstr "Vymazané" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Vymaže a pridá vybrané súbory, alebo masku do zoznamu ignorovaných" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Vymaže súbor zoznamu úkonov" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Vymazávanie" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3785,7 +3830,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Popis" @@ -3793,7 +3838,7 @@ msgstr "Popis" msgid "Description:" msgstr "Popis:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Odznačiť zoznam zmien" @@ -3801,33 +3846,33 @@ msgstr "Odznačiť zoznam zmien" msgid "Destination" msgstr "Cieľ" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Cieľový disk je plný" -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Zistiť a vyznačiť presunuté bloky" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3841,11 +3886,15 @@ msgstr "Veľkosť a poloha dialógových okien" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Možnosti porovnania" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3877,7 +3926,7 @@ msgstr "Súbor porovnania:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Porovnať neskôr" @@ -3889,12 +3938,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3907,19 +3956,19 @@ msgstr "Rozdiel medzi" msgid "Diffing" msgstr "Porovnávanie" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3931,26 +3980,26 @@ msgstr "Adresár:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disk plný pri prístupe k %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Prijatá výnimka: %1" @@ -3959,44 +4008,52 @@ msgstr "Prijatá výnimka: %1" msgid "Display &buttons in this order" msgstr "Zobraziť &tačídla v tomto poradí" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Zobraziť pomoc o tlačidlách, ponukách a oknách\nPomoc" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Zobraz pomoc pre aktuálnu úlohu, alebo príkaz\nPomoc" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Zobraz ako používať pomoc\nPomoc" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Zobraz informácie o programe, číslo verzie a copyright\nO programe" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4009,54 +4066,71 @@ msgstr "Nezobrazovať kontextovú ponuku pre nasledovné cesty:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Chcete naozaj odstrániť túto lištu '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Naozaj chcete tento súbor alebo adresár presunúť?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Naozaj chcete odstrániť \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4064,7 +4138,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4072,21 +4146,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Chcete načítať zmenený súbor?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4094,21 +4168,21 @@ msgid "" "as resolved?" msgstr "Checete označiť súbor\n%s\nza vyriešený?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Chcete obnoviť tieto automaticky uložené dokumenty?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Chcete znova načítať dokumenty, aby sa prejavili zmeny nastavení?\nPoznámka: stratíte všetky zmeny, ktoré ste urobili!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Chcete vidieť zmeny?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4116,28 +4190,28 @@ msgstr "" msgid "Document :" msgstr "Dokument :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Neobnovovať automaticky uložené dokumenty\nPoužije poslenú uživateľom uloženú verziu dokumentu" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Neukladať\nZatvoriť zobrazenia bez ukladania zmien" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4147,11 +4221,11 @@ msgstr "Neukladať\nObnoví zobrazenia bez uloženia zmien" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Túto správu už viac nezobrazovať" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "" @@ -4163,7 +4237,7 @@ msgstr "Dole" msgid "Download" msgstr "Stiahnúť" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Presunutie spraví túto ponuku plávajúcou" @@ -4191,6 +4265,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Vylúčené cesty:" @@ -4199,7 +4277,7 @@ msgstr "&Vylúčené cesty:" msgid "E&xit" msgstr "U&končiť" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportovať..." @@ -4219,11 +4297,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Východoeurópske" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Upraviť" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4239,23 +4317,23 @@ msgstr "Upraviť .tgitconfig" msgid "Edit Button Image" msgstr "Upraviť obrázok tlačidla" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Upraviť poznámky" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Zmeniť autora" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Upraviť popis" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Upraviť porovnávací program podľa prípony" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Upraviť zlučovací program pre príponu" @@ -4267,11 +4345,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Zmeniť správu denníka" @@ -4291,25 +4369,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "IP adresa, alebo meno proxy servera" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Nástroj elipsa\nElipsa" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "E-mail" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "E-maily" @@ -4317,7 +4395,7 @@ msgstr "E-maily" msgid "Empty" msgstr "Prázdne" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Povoliť úpravy" @@ -4333,7 +4411,7 @@ msgstr "Povoliť Gravatar" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4342,10 +4420,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Povolené prekrývajúce popisovače" @@ -4354,35 +4436,35 @@ msgstr "Povolené prekrývajúce popisovače" msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Kódovanie textu v súbore" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Bola zistená hardvérová chyba pri prístupe k %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Bolo zistené porušenie zamknutia pri prístupe k %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Bolo zistené porušenie zdielania pri prístupe k %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Zistený nesprávny argument." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Pri čítaní %1 nastala neočakávaná chyba." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Pri zápise %1 nastala neočakávaná chyba." @@ -4395,11 +4477,11 @@ msgstr "Šifrovanie" msgid "End" msgstr "Koniec" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Štýl koncov riadkov" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Zväčšiť okno na plnú veľkosť" @@ -4407,23 +4489,23 @@ msgstr "Zväčšiť okno na plnú veľkosť" msgid "Enter Log Message" msgstr "Zadaj správu denníka" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Zadaj URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Zadajte GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Zadajte menu." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Zadajte dátum a/alebo čas." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Zadajte dátum." @@ -4431,33 +4513,33 @@ msgstr "Zadajte dátum." msgid "Enter a name for the changelist:" msgstr "Zadajte meno zoznamu zmien:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Zadajte číslo medzi %1 a %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Zadajte číslo." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Zadajte kladné číslo." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Zadajte čas." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Zadajte celé číslo medzi %1 a %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Zadajte celé číslo medzi 0 a 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Zadajte celé číslo." @@ -4469,7 +4551,7 @@ msgstr "Nižšie zadajte obsah súboru na testovanie:" msgid "Enter log &message:" msgstr "Zadaj &správu denníka:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Zadajte nie viac ako %1 znakov." @@ -4478,43 +4560,43 @@ msgstr "Zadajte nie viac ako %1 znakov." msgid "Enter the regex string below:" msgstr "Nižšie zadajte regulárny výraz:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Vymazanie všetkého\nVymazať všetko" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Vymazanie výberu\nVymazanie" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Chyba" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Prebuduj zásobu ikoniek pre šel." -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4524,28 +4606,28 @@ msgstr "Spustiteľné (*.exe)|*.exe|Príkazy (*.com)|*.com|Informácie (*.pdf)|* msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existujúce" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Ukončiť" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Rozšíriť (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Rozšíriť zakotvené okno" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Preskúmať do" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportovať" @@ -4553,36 +4635,36 @@ msgstr "Exportovať" msgid "Export Zip File" msgstr "Exportovať Zip súbor" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Priečinok na exportovanie:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exportovať túto verziu..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportuj aj neverziované súbory" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exportovanie %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exportovanie..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Prípona" @@ -4598,7 +4680,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "Cesta k externým DLL knižniciam:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Externé" @@ -4606,101 +4688,101 @@ msgstr "Externé" msgid "External Program:" msgstr "Externý program:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Zoslabiť" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Vrátenie zlyhalo" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Nepodarilo sa pripojiť.\nMôže byť zlé spojenie." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Konverzia objektu ActiveX zlyhala." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Vytváranie prázdneho dokumentu zlyhalo." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Objekt nebolo možné vytvoriť. Uistite sa, že sa aplikácia nachádza v registroch systému." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Zlyhalo spustenie pomoci." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Zlyhalo spustenie servera." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Otváranie dokumentu zlyhalo." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Nepodarilo sa vykonať operáciu na serveri." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Ukladanie dokumentu zlyhalo." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Zlyhanie!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4708,62 +4790,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Získavanie súboru..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Získavanie revízie %s súboru:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Súbor" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Kódovanie textu v súbore" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "" @@ -4772,27 +4854,27 @@ msgstr "" msgid "File changes each week:" msgstr "Súbor menený každý týždeň:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Rozdiely súboru" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Súbor je bez konfliktov" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Súbor je prázny." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Zoznam súborov je prázdny" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Záplaty súboru" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4804,7 +4886,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veľkosť súboru:\t%s (%s)\nŠírka:\t\t\t%ld pixelov\nVýška:\t\t\t%ld pixelov\nHorizontálne rozlíšenie:\t%.1f dpi\nVertikálne rozlíšenie:\t%.1f dpi\nFarebná hĺbka:\t\t%d bit\nZväčšenie:\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4824,7 +4906,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veľkosť súboru:\t\t%s (%s)\nŠírka:\t\t\t%ld pixelov\nVýška:\t\t\t%ld pixelov\nHorizontálne rozlíšenie:\t%.1f dpi\nVertikálne rozlíšenie:\t%.1f dpi\nHĺbka:\t\t\t%d bitov\nZväčšenie:\t\t\t%d%%\n\nVeľkosť súboru:\t\t\t%s (%s)\nŠírka:\t\t\t%ld pixelov\nVýška:\t\t\t%ld pixelov\nHorizontálne rozlíšenie:\t%.1f dpi\nVertikálne rozlíšenie:\t\t%.1f dpi\nHĺbka:\t\t\t%d bitov\nZväčšenie:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4836,7 +4918,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veľkosť súboru:\t\t%s (%s)\nŠírka:\t\t\t%ld bodov\nVýška:\t\t\t%ld bodov\nHorizontálne rozlíšenie:\t%.1f dpi\nVertikálne rozlíšenie:\t%.1f dpi\nFarebná hĺbka:\t\t%d bit\nZväčšenie:\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4856,7 +4938,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veľkosť súboru:\t\t\t%s (%s)\nŠírka:\t\t\t%ld pixelov\nVýška:\t\t\t%ld pixelov\nHorizontálne rozlíšenie:\t%.1f dpi\nVertikálne rozlíšenie:\t\t%.1f dpi\nHĺbka:\t\t\t%d bitov\nZväčšenie:\t\t\t%d%%\n\nVeľkosť súboru:\t\t%s (%s)\nŠírka:\t\t\t%ld pixelov\nVýška:\t\t\t%ld pixelov\nHorizontálne rozlíšenie:\t%.1f dpi\nVertikálne rozlíšenie:\t\t%.1f dpi\nHĺbka:\t\t\t%d bitov\nZväčšenie:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Názov súboru" @@ -4864,17 +4946,17 @@ msgstr "Názov súboru" msgid "Files" msgstr "Súbory" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Nástroj vyplň\nVýplň" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrované" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filter ciest" @@ -4886,11 +4968,11 @@ msgstr "Filter:" msgid "Filter: " msgstr "Filter:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Nájsť" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4900,17 +4982,17 @@ msgstr "Nájsť zadaný text\nNájsť" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4918,23 +5000,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Ukončené!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Prvý rodič" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "" @@ -4943,18 +5025,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Zväčšiť obrá&zok na výšku okna" +msgid "Fit image &heights\tH" +msgstr "Zväčšiť obrázok na výšku okna\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Zväčšiť obrá&zok na šírku okna" +msgid "Fit image &widths\tW" +msgstr "Zväčšiť obrázok na šírku okna\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Adresár" @@ -4966,38 +5048,34 @@ msgstr "" msgid "Font" msgstr "Písmo" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Pre pomoc stlačte F1. Horizontálne rolovanie môžete rolovacím koliečkom pri súčasnom držaní klávesu Ctrl." -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Pre úplnú históriu vypnite 'Zastaviť na kopírovať/premenovať'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Vynútiť" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5015,20 +5093,20 @@ msgstr "" msgid "Format Patch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Dopredu" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5058,11 +5136,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5070,7 +5148,7 @@ msgstr "" msgid "From:" msgstr "Od:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Celá obrazovka" @@ -5078,7 +5156,7 @@ msgstr "Celá obrazovka" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Plne rekurzívne" @@ -5086,32 +5164,32 @@ msgstr "Plne rekurzívne" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" -msgstr "" +msgstr "G&ravatar" #. Resource IDs: (5061) msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Nemožno inicializovať GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ nemohol vytvoriť rastrový obrázok. Pravdepodobne nemáte dostatok pamäte." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Získavanie informácií. Čakajte prosím ..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5155,29 +5233,29 @@ msgstr "General::Dialógy 3" msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Získať denník zlučovania" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Získavam súbor %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Získavam súbor %s revízie %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Získavanie informácií..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Získavanie potrebných informácií..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Získavam unifikované porovnanie" @@ -5189,23 +5267,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5213,35 +5291,35 @@ msgstr "" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5253,31 +5331,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5298,7 +5376,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5310,47 +5388,47 @@ msgstr "Skočiť na riadok" msgid "Go to line" msgstr "Choď na riadok" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Choď na ďalší konflikt\nĎalší konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Choď na ďalší rozdiel\nĎalší rozdiel" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Skočiť na nasledovný riadkový rozdiel\nNasledovný riadkový rozdiel" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Choď na predchádzajúci konflikt\nPredchádzajúci konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Choď na predchádzajúci rozdiel\nPredchádzajúci rozdiel" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Skočiť na predchádzajúci riadkový rozdiel\nPredchazajúci riadkový rozdiel" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Skočiť na riadok" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Graf" @@ -5366,11 +5444,11 @@ msgstr "Šedé" msgid "Greek" msgstr "Grécke" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Skupina zoznamu zmien" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5386,7 +5464,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5398,7 +5476,7 @@ msgstr "" msgid "Hebrew" msgstr "Hebrejské" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Pomoc" @@ -5422,11 +5500,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Skryť ponuku pre neverziované cesty" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Skryť zakotvené okno" @@ -5434,25 +5512,25 @@ msgstr "Skryť zakotvené okno" msgid "Hide the script while running" msgstr "Skryť skript počas behu" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Skryť/zobraziť zoznam záplat v súbore" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Skryť/zobraziť zoznam súborov záplat\nSkryje, alebo zobrazí zoznam súborov záplat" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5462,7 +5540,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Tip: vyberte kontextovú ponuku, zmeňte stranu na 'Príkazy' a presuňte tlačidla na okno ponuky." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Domov" @@ -5478,7 +5556,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Pripnuté skripty::Integrácia so sledovačom prípadov" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Typ pripnutia" @@ -5494,7 +5572,7 @@ msgstr "&Zaradené cesty:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5502,55 +5580,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5558,15 +5637,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5590,7 +5669,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5598,7 +5677,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5606,7 +5685,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID: 32883: VC +" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5614,16 +5693,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5634,17 +5713,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5656,7 +5735,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5720,7 +5799,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Prekrytie ikon" @@ -5732,7 +5811,7 @@ msgstr "Prekrytie ikon::Sada ikon" msgid "Icon Overlays::Overlay Handlers" msgstr "Prekrytie ikon::Popisovače" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5742,52 +5821,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ikony/Design/Kód:\t\tLuebbe ONKEN" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Aktivované zabráni zobrazovaniu prekrývajúcich ikoniek a kontextových ponúk v dialógových oknách 'uložiť ako...' a 'otvoriť'." -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Ak je zaškrtnuté, dvojklik na revíziu v denníku vyvolá porovnanie s predchádzajúcou revíziu" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Keď je nastavené, súbory v neverziovaných adresároch môžu byť v správe stavov.\r\nSpráva stavov je napríklad použitá v odovzdávacom dialógu." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5800,16 +5879,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorovať" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorovať %d objekty podľa &prípony" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignorovať poznámky" @@ -5821,15 +5900,15 @@ msgstr "Ignorovať súbor" msgid "Ignore Type" msgstr "Ignorovať typ" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignorovať všetky medzery" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorovať všetky zmeny bielych znakov" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignorovať prázdne riadky" @@ -5837,7 +5916,7 @@ msgstr "Ignorovať prázdne riadky" msgid "Ignore case cha&nges" msgstr "Ignorovať zmeny vo &veľkosti písma" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5855,11 +5934,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Ignorovať &konce riadkov (doporučené)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignorovať medzery na konci riadka" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5867,29 +5946,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "Ignorovať biele znaky" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorovať zmeny bielych znakov" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorované" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Ignorované súbory" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignoruje všetky biele znaky pri porovnaní\nIgnorovať všetky zmeny bielych znakov" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5907,24 +5986,24 @@ msgstr "Obrázok &a text" msgid "Images" msgstr "Obrázky" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Priame deti, vrátane adresárov" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importovať" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importovať %s do %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5933,16 +6012,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5966,24 +6045,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Iba nasledovný rozsah revízií:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Nesprávny názov súboru." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Prvotný import" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Riadkový rozdiel" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Riadkový rozdiel založený na slovách" @@ -5995,25 +6074,25 @@ msgstr "Rozdiely v riadkoch" msgid "Input" msgstr "Vstup" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Vloží obsah schránky\nVlož" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Nedostatok pamäte na vykonanie úkonu." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Vnútorná chyba programu." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Chybná mena." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6021,7 +6100,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6044,7 +6123,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Ponechať" @@ -6052,11 +6131,11 @@ msgstr "Ponechať" msgid "Keep changelists" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6070,7 +6149,7 @@ msgstr "Klávesnica" msgid "Keyboard shortcuts:" msgstr "Klávesové skratky:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Kľúče" @@ -6114,19 +6193,39 @@ msgstr "RIADOK8" msgid "Language:" msgstr "Jazyk:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Naposledy zmenené" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Naposledy zmenené:" @@ -6134,7 +6233,11 @@ msgstr "Naposledy zmenené:" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6142,17 +6245,17 @@ msgstr "" msgid "Least active author:" msgstr "Najmenej aktívny autor:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Ponechať v konflikte\nStav konfliktu bude ponechaný" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "ľavý pohľad: " @@ -6160,11 +6263,11 @@ msgstr "ľavý pohľad: " msgid "Left image" msgstr "Ľavý obrázok" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Čiarový graf" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6178,12 +6281,12 @@ msgstr "Rámček riadkového porovnania" msgid "Line differences" msgstr "Rozdiely riadkov" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Riadok bol presunutý z riadka %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Riadok bol presunutý na riadok %ld" @@ -6196,26 +6299,26 @@ msgstr "" msgid "Line:" msgstr "Riadok:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Riadok: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Riadky pridané" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Riadky odstránené" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Zoznam tém pomocníka\nTémy pomocníka" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6233,23 +6336,23 @@ msgstr "Načítať obrázok" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Načítať zmeny\nOkná budú aktualizované novým obsahom." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6257,13 +6360,13 @@ msgstr "" msgid "Local Branch" msgstr "Lokálna vetva" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Lokálny stav" @@ -6271,7 +6374,7 @@ msgstr "Lokálny stav" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6281,7 +6384,7 @@ msgstr "" msgid "Locator Bar" msgstr "Navigačná lišta" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "" @@ -6321,12 +6424,12 @@ msgstr "Správy denníka (Zobrazenie denníka)" msgid "Login:" msgstr "Prihlasovacie meno:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6337,7 +6440,7 @@ msgstr "" msgid "Lum" msgstr "Jas" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6349,14 +6452,10 @@ msgstr "" msgid "Mail" msgstr "E-mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Neplatná DLL knižnica pre emaily." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6369,47 +6468,47 @@ msgstr "" msgid "Manage" msgstr "Manažovať" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Označiť ako vyriešené" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Označiť za vyriešný\nZmení stav súboru na vyriešený" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Označiť revíziu za zlú" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Označiť revíziu za dobrú" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Rozlišovať &veľkosť písma" @@ -6433,7 +6532,7 @@ msgstr "Po&nuka zobrazujúca naposledy použité príkazy" msgid "Menu" msgstr "Ponuka" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Ponuka" @@ -6441,7 +6540,7 @@ msgstr "Ponuka" msgid "Menu s&hadows" msgstr "&Tiene ponuky" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Spájať" @@ -6449,34 +6548,34 @@ msgstr "Spájať" msgid "Merge &Message" msgstr "Zlúčiť &správu" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Reintegračné zlúčenie" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Zlúčiť do \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Zlúčené" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Zlúčené súbory" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Zlúčiť inú vetvu" @@ -6484,22 +6583,22 @@ msgstr "Zlúčiť inú vetvu" msgid "Merging" msgstr "Zlučovanie" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Správa" @@ -6511,7 +6610,7 @@ msgstr "" msgid "Message part &expression:" msgstr "Výraz pre &správu:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Správy" @@ -6519,11 +6618,11 @@ msgstr "Správy" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Moje" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Zminimalizovať na lištu" @@ -6535,7 +6634,11 @@ msgstr "Minimálny počet znakov správy pre odovzdanie:" msgid "Misc" msgstr "Rôzne" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Zmiešané" @@ -6543,35 +6646,35 @@ msgstr "Zmiešané" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Dátum zmeny" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Zmenené" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Zmenené súbory" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Viac" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Viac tlačidiel" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Viac príkazov..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Viac farieb..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Viac..." @@ -6591,41 +6694,41 @@ msgstr "Presunúť &nižšie" msgid "Move &Up" msgstr "Presunúť &vyššie" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Presunúť hore" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Presunúť dole" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Presunúť a premenovať" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Presunúť do zoznamu zmien" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Presunúť/premenovať" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Presun: Nové meno pre %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Presunie zmenené súbory do koša pred vrátením zmien." -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Presúvam %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Presúvam..." @@ -6633,11 +6736,11 @@ msgstr "Presúvam..." msgid "My file:" msgstr "Môj súbor:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Meno" @@ -6649,7 +6752,7 @@ msgstr "Meno:" msgid "Navigate" msgstr "Navigácia" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6659,11 +6762,11 @@ msgstr "Skočiť na zadaný riadok v panely\nSkočí na riadok" msgid "Navigation Pane Options" msgstr "Nastavenia navigačného panela" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Nastavenia navigačného panela..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Vnorené" @@ -6675,7 +6778,7 @@ msgstr "Sieť" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Nový" @@ -6684,43 +6787,43 @@ msgid "New &name:" msgstr "Nové me&no" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "Nová vetva/značka" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Nová ponuka" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nová správa" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nové meno pre %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Nové meno nesmie byť prázdne ani rovnaké ako pôvodné meno!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nové meno:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Nové riadký" @@ -6728,33 +6831,29 @@ msgstr "Nové riadký" msgid "Next" msgstr "Ďalšie" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Nasledovná strana\nĎalšia strana" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Nasledovný konflik" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Nasledovný rozdiel" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Nasledovný rozdiel v riadku" -#. Resource IDs: (73) -msgid "No" -msgstr "Nie" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6766,102 +6865,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Nebola zadaná žiadna hodnota príkazu!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Zmeny nenájdené!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Chybové hlásenie je nedostupné." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Nenastala žiadna chyba." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Pri aktuálnom nastavení nie sú žiadne súbory na zobrazenie.\nVyberte jedno alebo viac nastavení nižšie, aby ste videli neverziované, ignorované či nezmenené súbory.\nNa prezretie vzdialených zmien vyberte 'Skontrolovať úložisko'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." +"the last commit." msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Graf nie je k dispozícií" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Nebol nájdený obrázkový kóder pre %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Žiadne predošlé verzie." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Bez pamäte stavu. Iba verziované adresáre získajú prekrytie, súbory budú bez prekrývajúcich ikon." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Tezaurus nemá návrh" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6869,11 +6973,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Žiadne" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normálne" @@ -6885,30 +6989,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Neverziované súbory" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nie všetky položky systémových registrov (alebo INI súbor) boli vymazané." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Nedostatok pamäte!\nPokúste sa zmenšiť graf revízií\nzbalením uzlov alebo zmenšením lupy." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6916,7 +7020,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6935,26 +7039,26 @@ msgstr "Poznámka: adresár obsahuje neverziované objekty" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Poznámky" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Poznámka" @@ -6962,7 +7066,7 @@ msgstr "Poznámka" msgid "Number Commits" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "" @@ -6975,7 +7079,7 @@ msgstr "Počet autorov:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7047,41 +7151,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "farby Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Pôvodná správa" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7089,15 +7193,15 @@ msgstr "" msgid "Older lines" msgstr "Staršie riadky" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Bol nájdených jeden alebo viac automaticky uložených dokumentov." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Jeden alebo viac súborov v stave konfliktu." @@ -7109,29 +7213,29 @@ msgstr "Iba aktuálna vetva" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Iba zlúčené súbory" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Iba súbory" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Sú povolené iba čísla!\n(eventuálne oddelené čiarkami)" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Iba tento objekt" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Otvoriť" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7141,51 +7245,52 @@ msgstr "Otvoriť existujúci dokument\nOtvoriť" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Otvoriť súbory na porovnanie alebo použiť záplatu\nOtvoriť súbory" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Otvoriť zo schránky" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Otvor obrázok..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Otvoriť hlavný adresár" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Otvoriť tento dokument" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Otvoriť pomocou..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Otvorí pomocníka\nTémy pomocníka" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Voľby" @@ -7194,30 +7299,30 @@ msgid "Options" msgstr "Voľby" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Pôvodná &veľkosť" +msgid "Ori&ginal size\tS" +msgstr "Pôvodná &veľkosť\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Ostatné panely úloh" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Ostatný" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Nedostatok pamäte." @@ -7225,7 +7330,7 @@ msgstr "Nedostatok pamäte." msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7233,20 +7338,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Prepísať existujúcu vetvu" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Prepísať" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Strana %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7257,15 +7366,15 @@ msgstr "Strana %u\nStrany %u-%u\n" msgid "Page :" msgstr "Strana :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametre" @@ -7273,25 +7382,25 @@ msgstr "Parametre" msgid "Parameters:" msgstr "Parametre:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Rodič 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Rodič 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Rodič(ia)" @@ -7303,39 +7412,39 @@ msgstr "" msgid "Password" msgstr "Heslo" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Heslo:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Vložiť" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Nástroj vložiť\nVložiť" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Vlož zoznam súborov" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Vloží svn cestu zo schránky - vykoná operáciu presunutia, alebo kopírovania" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7351,32 +7460,32 @@ msgstr "Zaplátať &vybrané objekty" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Zaplátať všetky súbory" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Zaplátať vybrané súbory" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Záplatavanie" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Cesta" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Bola najdená cesta, ktorá lepšie zodpovedá záplate." @@ -7384,21 +7493,21 @@ msgstr "Bola najdená cesta, ktorá lepšie zodpovedá záplate." msgid "Path:" msgstr "Cesta:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Cesty" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Nástroj ceruzka\nCeruzka" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Percento autorstva" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Percentá" @@ -7406,24 +7515,24 @@ msgstr "Percentá" msgid "Personalized Menus and Toolbars" msgstr "Prispôsobená ponuka a nástrojové lišty" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7433,56 +7542,56 @@ msgstr "Obrázok (Metafile)\nobrázok" msgid "Picture:" msgstr "Obrázok:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Koláčový graf" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Prosím zadajte pripnutý (hook)skript na vykonanie." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Prosím zadajte cestu, pre ktorú sa má vykonať pripnutý (hook)skript." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Prosím vyberte typ pripnutia" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Čakajte prosím, prebieha stornovanie ..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Čakajte prosím na získanie rozdielov ..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Čakajte, prosím..." @@ -7498,11 +7607,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Poodovzdávací pripnutý (hook)skript" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7510,23 +7619,23 @@ msgstr "" msgid "Pre&v Page" msgstr "Pre&došlá strana" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Predodovzdávací skript" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Prepojiť pravý blok" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Prepojiť tento blok vľavo" @@ -7538,11 +7647,11 @@ msgstr "Stlačte &novú klávesovú skratku:" msgid "Press &new shortcut key:" msgstr "Stlačte &novú klávesovú skratku:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Náhľad" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Náhľad zaplátaného súboru" @@ -7554,51 +7663,51 @@ msgstr "Náhľad: " msgid "Previous" msgstr "Predošlé" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Predchádzajúca strana\nPredchádzajúca strana" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Predchádzajúci konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Predchádzajúci rozdiel" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Predchádzajúci riadkový rozdiel" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Tlačiť" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Vytlačiť dokument\n&Tlačiť" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Tlačiť do súboru" @@ -7606,7 +7715,7 @@ msgstr "Tlačiť do súboru" msgid "Printer :" msgstr "Tlačiareň :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Súbory tlačiarne (*.prn)|*.prn|Všetky súbory (*.*)|*.*||" @@ -7614,11 +7723,11 @@ msgstr "Súbory tlačiarne (*.prn)|*.prn|Všetky súbory (*.*)|*.*||" msgid "Printing" msgstr "Tlačenie" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programy (*.exe)|*.exe|Všetky súbory (*.*)|*.*||" @@ -7626,11 +7735,11 @@ msgstr "Programy (*.exe)|*.exe|Všetky súbory (*.*)|*.*||" msgid "Progress" msgstr "Priebeh" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Projekt" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Vlastnosť" @@ -7638,7 +7747,7 @@ msgstr "Vlastnosť" msgid "Property Page" msgstr "Strana vlastností" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Poskytovateľ" @@ -7670,15 +7779,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7686,19 +7795,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "" @@ -7714,11 +7823,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7726,22 +7835,22 @@ msgstr "" msgid "Putty Key:" msgstr "Kľúč Putty:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Ukončenie programu; vyzve k uloženiu dokumentov\nUkončiť" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7759,11 +7868,15 @@ msgstr "R&AM disky" msgid "R&eset" msgstr "P&redvolené" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "Vrátiť do tejto re&vízie" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7771,7 +7884,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7793,7 +7906,7 @@ msgstr "" msgid "Re&movable drives" msgstr "&Vyberateľné disky" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Preme&novať..." @@ -7809,15 +7922,15 @@ msgstr "P&redvolené všetko" msgid "Re&store defaults" msgstr "&Obnoviť prednastavené" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Vrátiť" -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Pred tým ako sa zaseknete si prečítajte 'Návod pre denné použite' ('Daily Use Guide')" @@ -7825,21 +7938,21 @@ msgstr "Pred tým ako sa zaseknete si prečítajte 'Návod pre denné použite' msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Minulé" @@ -7851,21 +7964,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Naposledy menené riadky" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Iba záznam" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Obnoviť automaticky uložené dokumenty\nOtvorí automaticky uložené dokumenty namiesto užívaľom uložených verzií" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7879,17 +7992,21 @@ msgstr "" msgid "Recursive" msgstr "Rekurzívne" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Zopakovať predchádzajúci vrátený úkon\nZopakovať" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Zmenšiť okno na ikonu" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7897,31 +8014,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Obnoviť" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Obnovovanie..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7933,7 +8050,7 @@ msgstr "" msgid "Regex:" msgstr "Regulárny výraz:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7952,7 +8069,7 @@ msgid "" "\\s : whitespaces" msgstr "Filter regulárnych výrazov:\r\n. : akýkoľvek znak\r\nc+ : znak raz, alebo viac krát\r\nc* : akýkoľvek počet výskytov znaku\r\n^ : začiatok riadka\r\n$ : koniec radka\r\n(string){n} : výskyt práve n-krát\r\n(abcd) : podvýraz\r\n[aei0-9] : zodpovedá: a,e,i a 0..9\r\n[^aei0-9] : čokoľvek okrem a,e,i a 0..9\r\n\r\n\\w : zodpovedá a-z,A-Z,0-9 a _\r\n\\W : čokoľvek okrem písmen a čísel\r\n\\d : čísla 0-9\r\n\\s : biele znaky" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Odmietnutá záplata hunks '%s'" @@ -7965,7 +8082,7 @@ msgstr "" msgid "Reload" msgstr "Znovu načítať" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -7999,19 +8116,19 @@ msgstr "" msgid "Remote Branch" msgstr "Vzdialená vetva" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Vzdialený stav" @@ -8023,12 +8140,12 @@ msgstr "Vzdialený:" msgid "Remove" msgstr "Odstrániť" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Odstrániť %ld objektov" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Odstrániť %s" @@ -8037,7 +8154,7 @@ msgstr "Odstrániť %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8045,21 +8162,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Odstráni poznámky pred porovaním, takže zmeny v poznámkach sa nezobrazia ako rozdiel" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Odstrániť zo zoznamu &ignorovaných" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Odstrániť z lišty rýchleho prístupu" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Odstrániť zo zoznamu zmien" @@ -8071,7 +8188,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8079,11 +8196,11 @@ msgstr "" msgid "Removed" msgstr "Odstránené" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Odstránené zo zoznamu zmien" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8091,7 +8208,7 @@ msgid "" "from the ignore list." msgstr "Odstránené šablóny súborov\n%s\nzo zoznamu vylúčenia." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Odstráni súbor alebo súborovú masku zo zoznamu vylúčených súborov" @@ -8099,11 +8216,11 @@ msgstr "Odstráni súbor alebo súborovú masku zo zoznamu vylúčených súboro msgid "Rena&me..." msgstr "Preme&novať..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Premenovať" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Premenovať %s" @@ -8112,20 +8229,20 @@ msgstr "Premenovať %s" msgid "Rename - TortoiseGit" msgstr "Premenovať - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Premenovať/presunúť" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8135,7 +8252,7 @@ msgstr "Opakovať posledný úkon\nOpakovať" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8149,12 +8266,12 @@ msgstr "" msgid "Replace:" msgstr "Nahradadiť:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Nahradzovanie" @@ -8178,11 +8295,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Vyžiada užívateľské meno a heslo" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "&Vyriešiť..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "" @@ -8194,25 +8311,25 @@ msgstr "Predvolené &všetko" msgid "Reset Type" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Prednastaviť stĺpce" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Vyriešiť" @@ -8220,126 +8337,122 @@ msgstr "Vyriešiť" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Vyriešiť konflikt použitím \"Moje\"" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Vyriešiť konflikt použitím 'Ich'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Vyriešené" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Vyriešené:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Rieši súbory v konflikte" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Obnoviť" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Obnoviť základné" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Obnoviť po odovzdaní" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Obnoviť základnú veľkosť okna" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Obnovené" -#. Resource IDs: (73) -msgid "Retry" -msgstr "" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Vrátiť" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Vrátené" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Vrátiť všetky zmeny od poslednej aktualizácie" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Vrátiť pridanie do správy verzií" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revízia" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revízia %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revízia %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Graf revízií" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8355,31 +8468,31 @@ msgstr "Filter grafu revízií" msgid "Revision graph" msgstr "Graf revízií" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revízia:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\ntext s formátovaním písma a odstavcov" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Pravý pohľad:" @@ -8387,21 +8500,21 @@ msgstr "Pravý pohľad:" msgid "Right image" msgstr "Pravý obrázok" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Riadok %d z %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Riadok %d-%d z %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Riadok dole" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Riadok hore" @@ -8409,11 +8522,11 @@ msgstr "Riadok hore" msgid "S&elect..." msgstr "&Vybrať" -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Tlačidlá z&obraziť v jednom riadku" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Tlačidlá z&obraziť v dvoch riadkoch" @@ -8421,25 +8534,33 @@ msgstr "Tlačidlá z&obraziť v dvoch riadkoch" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Zob&raziť lištu rýchleho prístupu pod lištou" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "Š&tatistika" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8449,7 +8570,7 @@ msgstr "" msgid "SMTP Server:" msgstr "SMTP server:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8457,31 +8578,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8493,15 +8614,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8519,35 +8640,39 @@ msgstr "" msgid "Sample text:" msgstr "Ukážkový text:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Uložiť" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Uložiť &ako..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Uložiť &ako...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Uložiť ako" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Uložiť spodný súbor ako\nBudete opýtaný kam uložiť spodný súbor" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Uložiť súbor" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Uložiť ľavý súbor ako\nBudete opýtaný kam uložiť ľavý súbor" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8555,13 +8680,13 @@ msgid "" "%s" msgstr "Uložiť pravý súbor\nZmeny budú uložené do\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Uložiť pravý súbor ako\nBudete opýtaný kam uložiť pravý súbor" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8569,74 +8694,74 @@ msgid "" "%s" msgstr "Uložiť ľavý súbor\nZmeny budú uložené do\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Uložiť všetko\nBudú uložené oba súbory" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Uložiť ako" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Uložiť ako..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Uložiť ako\nBudete opýtaný kam sa má súbor uložiť" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Uložiť zmeny do %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Uložiť zmeny." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Uložiť revíziu &do..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8658,13 +8783,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Uložiť\nUloží súbor so značkami konfliktov." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8676,12 +8801,12 @@ msgstr "Uložiť\nZmeny budú uložené do\n%s" msgid "Saved Data" msgstr "Uložené údaje" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" @@ -8693,11 +8818,11 @@ msgstr "Analyzovať" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Doľava" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Doprava" @@ -8705,7 +8830,7 @@ msgstr "Doprava" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Vyhľadaj &správy denníka..." @@ -8717,20 +8842,20 @@ msgstr "" msgid "Search for:" msgstr "Hľadať:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Vyhladávanie lepšej cesty na použitie záplaty" -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Vyhľadanie zlyhalo na %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Vybrať" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Ozn&ač všetko" @@ -8746,59 +8871,59 @@ msgstr "Vybrať &kontextovú ponuku:" msgid "Select &window:" msgstr "Vybrať &okno:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Nástroj výberu farby\nVýber farby" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Vyber súbor..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Vyberte SSH klienta" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Zvoľte tlačidlo." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Vybrať objekt, pre ktorý chcete pomoc" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Označiť zoznam zmien" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Vybrať porovnávací program" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Vybrať súbor" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Vybrať adresár pre tento sledovač prípadov" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Vybrať adresár kam sa má exportovať.\nMôžete potrebovať vytvoriť nový adresár pred exportovaním." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Vyberte adresár, pre ktorý sa má vykonať skript" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Vyberte adresár, na uloženie vybraného súboru" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Vybrať súbor skriptu" @@ -8806,20 +8931,20 @@ msgstr "Vybrať súbor skriptu" msgid "Select items automatically" msgstr "Automaticky označiť objekty" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Vyber zlučovací program" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Vyberte cieľ zlúčenia" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8831,15 +8956,19 @@ msgid "" "checker used for commit messages." msgstr "Vzberte jazyk, ktorý sa používa na tento projekt. Toto nastavenie ovplyvňuje kontrolu pravopisu správ denníka pri odovzdávaní." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Vyberte prehliadač súborov porovnania" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Vyberte ktorý súbor chcete uložiť ako" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8849,7 +8978,7 @@ msgstr "Vyberte ktorý súbor chcete uložiť ako\nPoznámka: Niektoré konfklit msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8857,7 +8986,7 @@ msgstr "" msgid "Send" msgstr "Odoslať" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Odoslať e-mail" @@ -8865,11 +8994,11 @@ msgstr "Odoslať e-mail" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Posielanie e-mail-u zlyhalo." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Odoslať e-mail..." @@ -8877,19 +9006,19 @@ msgstr "Odoslať e-mail..." msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Posielam obsah" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Posielanie..." @@ -8909,28 +9038,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Nastavenia vlastností..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Nastavenia" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Nastavenia - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Šel" @@ -8938,19 +9067,19 @@ msgstr "Šel" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Pamäť ikoniek šelu bola prebudované!" #. Resource IDs: (5062) msgid "Shift-JIS" -msgstr "" +msgstr "Shift-JIS" #. Resource IDs: (1105) msgid "Short &date/time format in log messages" msgstr "Krátky formát &dátumu/času v správach denníka" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Skrátený zoznam vlastností" @@ -8962,7 +9091,7 @@ msgstr "Ukázať" msgid "Show &Accelerator for:" msgstr "Zobraziť skratkové &tlačidlo pre:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8970,15 +9099,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Zobraziť &zmeny" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Zobraziť &denník" @@ -8986,15 +9115,19 @@ msgstr "Zobraziť &denník" msgid "Show &log..." msgstr "Zobraziť &denník..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Z&obrazovať prekrytie a kontextovú ponuku len v Explorer-y" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Zobraziť nad lištou" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Zobraziť pod lištou" @@ -9002,35 +9135,35 @@ msgstr "Zobraziť pod lištou" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Zobraziť menej tlačidiel" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Zobraziť hlavnú revíziu" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Zobrazí zmeny v riadku slovo po slove\nRozdiely v riadkoch po slovách" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Zobraziť riadkové rozdiely\nRiadkové rozdiely" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Zobraziť viac tlačidiel" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Zobraziť lištu rýchleho prístupu nad lištou" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Zobraziť lištu rýchleho prístupu pod lištou" @@ -9038,11 +9171,11 @@ msgstr "Zobraziť lištu rýchleho prístupu pod lištou" msgid "Show Screen&Tips on toolbars" msgstr "Zobraziť tipy& na lište" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Zobraziť biele znaky" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Zobrazí náhľad na celý graf" @@ -9050,7 +9183,7 @@ msgstr "Zobrazí náhľad na celý graf" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9058,11 +9191,11 @@ msgstr "" msgid "Show author" msgstr "Zobraziť autora" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Zobraziť zmeny &unifikovaným porovnaním" @@ -9082,15 +9215,15 @@ msgstr "Zobraziť dátum" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Zobraziť zmeny" @@ -9102,11 +9235,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Po chvíľke zobraziť &celú ponuku " -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Zobraziť názov súboru" @@ -9122,7 +9259,7 @@ msgstr "" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9130,90 +9267,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Zobraz &čísla riadkov" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Zobraziť najstarší vrchol na vrchu" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Zobraz/skry riadkové porovnanie\nPrepni riadkové porovnanie" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Zobraz/skry rámček polohy\nPrepni rámček polohy" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Zobraziť, alebo schovať stavový rámček\nPrepni stavový rámček" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Zobraz/skry lištu nástrojov\nPrepni lištu nástrojov" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Zobraziť pôvodné číslo riadka" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Zobraziť vlastnosti revízie" @@ -9221,7 +9358,7 @@ msgstr "Zobraziť vlastnosti revízie" msgid "Show shortcut &keys in ScreenTips" msgstr "Zobraziť &klávesové skratky v tipoch" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9231,7 +9368,7 @@ msgstr "Zobraziť špeciálne znaky pre biele znaky a nové riadky.\nZobraziť b msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9243,45 +9380,43 @@ msgstr "" msgid "Show un&versioned files" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Zobraziť/skryť" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Zobrazí grafické vyjadrenie kópií, značiek a vetiev" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Zobrazí všetky súbory, ktoré boli zmenené od poslednej aktualizácie, miestne a v úložisku." +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Zobrazí súbor denníka úkonov v predvolenom textovom editore" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9293,7 +9428,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Strieborný štýl" @@ -9301,20 +9436,20 @@ msgstr "Strieborný štýl" msgid "Since" msgstr "Od" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Veľkosť" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Preskočiť" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9322,23 +9457,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Preskočené" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Preskočené chýbajúce ciele" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Posunúť" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Inteligentné odsadzovanie" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9346,13 +9481,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9366,7 +9501,7 @@ msgstr "Triediť podľa počtu odovzdaní" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9376,49 +9511,53 @@ msgstr "Určuje koľko záznamov sa ma pamätať v histórií správ denníka." msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Rozdeliť riadky" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Rozdeliť aktívne okno do panelov\nRozdeliť" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Kumulovaný graf" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Zásobníkový čiarový graf" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Štandard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Spustiť odovzdávací skript" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" @@ -9426,7 +9565,7 @@ msgstr "" msgid "Start registry editor" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9438,39 +9577,47 @@ msgstr "Odložené" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Zoznam odložených" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Vybrať posledné z odložených" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Uložiť odložené" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statické" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Štatistiky" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Stav" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Konfigurácia stavového riadku" @@ -9482,32 +9629,32 @@ msgstr "Farby stavu a akcií" msgid "Status cache" msgstr "Pamäť stavov" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Pamäť stavov len pre jeden adresár, bez vnárania" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Stratégia" @@ -9515,15 +9662,15 @@ msgstr "Stratégia" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Štýl" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Predmet" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Predmet:" @@ -9531,7 +9678,7 @@ msgstr "Predmet:" msgid "Submodule" msgstr "Podmodul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "Podmodul &Aktualizovať..." @@ -9539,7 +9686,7 @@ msgstr "Podmodul &Aktualizovať..." msgid "Submodule Add" msgstr "Pridať podmodul" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Pridať podmodul..." @@ -9547,15 +9694,15 @@ msgstr "Pridať podmodul..." msgid "Submodule Diff" msgstr "Rozdiel podmodulu" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Inicializácia podmodulu" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Synchronizácia podmodulu" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Aktualizácia podmodulu" @@ -9563,7 +9710,7 @@ msgstr "Aktualizácia podmodulu" msgid "Submodule Update Options" msgstr "Nastavenia aktualizácie podmodulu" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9578,15 +9725,15 @@ msgstr "" msgid "Submodules" msgstr "Podmoduly" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Úspešné" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Prepnúť" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "" @@ -9595,43 +9742,43 @@ msgstr "" msgid "Switch To" msgstr "Prepnúť do" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Prepnúť do predchádzajúceho okna\nPredchádzajúce okno" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Prepnúť medzi jedno- a dvoj- panelovým zobrazením" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Prepnúť medzi jedno- a dvoj- panelovým zobrazením\nPrepnúť medzi jedno- a dvoj- panelovým zobrazením" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Prepnúť medzi ľavým a pravým panelom" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Prepnúť obsah ľavého a pravého panelu\nPrepnúť ľavý a pravý pohľad" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Prepnúť do ďalšieho okna dokumentu" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Prepnúť na nasledovný panel\nĎalší panel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Prepnúť do predchádzajúceho okna dokumentu" @@ -9639,19 +9786,19 @@ msgstr "Prepnúť do predchádzajúceho okna dokumentu" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Vymení porovnávané strany ľavá<->pravá" @@ -9663,23 +9810,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Synchronizácia..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9689,13 +9836,13 @@ msgstr "Položky systémových registrov boli odstránené a INI súbor (ak exis msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9709,7 +9856,7 @@ msgstr "Miesto pre záložku" msgid "Tab size:" msgstr "Veľkosť tab.:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Značka" @@ -9717,16 +9864,16 @@ msgstr "Značka" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Informácie o značke" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Značky" @@ -9734,11 +9881,11 @@ msgstr "Značky" msgid "Tags:" msgstr "Značky:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Úlohy" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Panel úloh" @@ -9750,11 +9897,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Iba test" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9762,13 +9909,19 @@ msgstr "" msgid "Thai" msgstr "Thajské" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9776,64 +9929,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Veľkosť bloku nezodpovedá počtu pridaných/vymazaných riadkov!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Porovnávanie bolo zrušené z dôvodu chyby:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Súbor %s neexistuje!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Súbor %s nebol nájdený v súbore záplat!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9842,15 +10009,15 @@ msgid "" "Do you want to remove the file?" msgstr "Súbor\n%s\nje prázdny! \nChcete ho odstrániť?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Súbor je príliš veľký" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Súbor je priveľký na otvorenie." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9858,7 +10025,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Súbor\n%s\nuž existuje! Chcete ho prepísať?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9866,14 +10033,14 @@ msgid "" "is not a valid text file!" msgstr "Súbor\n%s\nnie je platný textový súbor!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9882,78 +10049,78 @@ msgid "" "Would you like to create it first?" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Pripnutý skript vrátil chybu:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Obrázok nemôže byť zobrazený." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Poskytovateľa sledovača prípadov sa nepodarilo vytvoriť. Prosím, skontrolujte, či bol správne nainštalovaný." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Sledovač prípadov nemohol overiť textový parameter" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Na riadku %d bolo očakávane určenie nového súboru!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Číslo riadka musí byť medzi %d a %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Maximálny počet riadkov, ktoré sa majú pamätať pre denník úkonov.\nPridanie riadkov nad tento počet spôsobí zmazanie najstaršieho riadku zo súboru." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Úkon zlyhal." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Parametre '/path' a '/pathfile' sú nezlúčitelné.\nMôžete zadať iba jeden z nich." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9963,7 +10130,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9974,7 +10141,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9985,36 +10152,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Vybraný súbor ešte obsahuje značky konfliktov.\nNaozaj ho chcete označiť za vyriešený?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10022,7 +10196,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10031,7 +10205,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10040,26 +10214,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "Text je zhodný, ale súbory sa líšia!\nBoli nájdené nasledovné rozdiely:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Čas v sekundách, po ktorom bude zastavená analýza súborov.\r\nMenšia hodnota umožní zoznam automatického dopĺňania skorej,\r\nale možno nebudú zanalyzované všetky súbory." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Vybrané URL adresy neboli vytvorené z jedného kmeňového adresára.\nNie je možné zobraziť správy denníka medzi nimi!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10069,34 +10243,34 @@ msgstr "" msgid "Their file:" msgstr "Ich súbor:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Ich" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Momentálne je inštalových %d prekrytí okrem toho čo používa Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "Viacero zobrazení je upraviteľných\nKtoré chcete uožiť?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Nie je prístupný žiadny poskytovateľ sledovania prípadov" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10105,85 +10279,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Na riadku %d je ešte stále nevyriešený konflikt!\nPred uložením, by ste mali vyriešiť všetky konflikty.\nChcete uložiť súbor aj s konfliktom?\nKeď vyberiete ANO budete musieť vyriešiť konflikty ručne v inom editore!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Sú neuložené zmeny\nChcete vaše zmeny uložiť?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Tezaurus (slovník)" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Tieto sú neskôr uložené ako práve otvorené dokumenty a obsahujú zmeny, ktoré boli urobené pred zatvorením aplikácie." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Toto nie je platná URL adresa.\nProsím sem zadajte URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Program je prepojený s chýbajúcim exportom %s v súbore %s. Tento počítač pravdepodobne nemá kompatibilnú verziu %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Tento program vyžaduje %s, ktorý nebol v tomto systéme nájdený." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." -msgstr "Táto vlastnosť je povolená len na adresároch, a nie súboroch." +msgstr "Táto vlastnosť je povolená iba pre adresáre, nie pre súbory." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Toto vymaže záznam o použitých príkazoch v aplikácií a obnoví predvolené viditeľné príkazy na lište. Nevráti to žiadne prispôsobenie. Ste si istý, že to chcete?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10199,14 +10373,14 @@ msgstr "Usporiadať &vodorovne" msgid "To" msgstr "Do" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10218,13 +10392,13 @@ msgstr "" msgid "To:" msgstr "Do:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Prepnúť medzi jedno/dvoj stranovým zobrazením\nJedna/dvoj stranové zobrazenie" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Ponechať filtre" @@ -10236,11 +10410,11 @@ msgstr "Lišta nástrojov" msgid "Toolbar Name" msgstr "Meno lišty:" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Nastavenia lišty" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Interná chyba lišty. Prosím kontaktujte Vášho dodávateľa aplikácie." @@ -10256,39 +10430,39 @@ msgstr "Nástroje" msgid "Tools:" msgstr "Nástroje:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" "%s \r\n" -msgstr "" +msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" @@ -10297,18 +10471,18 @@ msgstr "" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10324,7 +10498,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10332,7 +10506,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Nástroj pre rozdiely obrázkov, časť programu TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10346,36 +10520,36 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10414,11 +10588,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Prenosová rýchlosť %s" @@ -10427,39 +10601,35 @@ msgstr "Prenosová rýchlosť %s" msgid "Transparent &color..." msgstr "Priesvitná &farba..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Orezať tabulátory a medzery z konca riadkov" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Skúste \"Vyčistiť\". Keď to nepomôže treba vykonať nové získanie." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Skúsiť znovu" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turecké" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Typ" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Typ:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10483,24 +10653,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Nemožno načítať podporu e-mail-ov." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Nemožno vykonať príkaz, server je zaneprázdnený" -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Nemožno čítať z %1, je už niekým otvorený." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Nemožno čítať vlastnosť určenú len na zápis." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10508,91 +10678,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Nemožno zapísať vlastnosť, ktorá je len na čítanie." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Nemožno zapísať do %1, je len na čítanie, alebo otvorený niekym iným." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Odznačiť" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Vrátiť" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Vrátiť %d akcií" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Vrátiť akciu" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Vrátiť pridanie..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Späť posledná akciu\nSpäť" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Vrátiť poslednú zmenu\nVrátiť" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Neočakávaný formát súboru." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Rozbaliť" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Neformátovaný text\ntext bez formátovania" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Unifikovaný \"&diff\" HEAD (hlavnej) revízie" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Neznáme" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Neznáma hĺba" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Nevyriešené konflikty!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Nepomenované" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Odverziované" @@ -10600,7 +10774,7 @@ msgstr "Odverziované" msgid "Unversioned files mark parent folder as modified" msgstr "Neverziované súbory označia rodičovský adresár za zmenený" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "" @@ -10613,23 +10787,23 @@ msgstr "Hore" msgid "Update" msgstr "Aktualizácia" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Aktualizované" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Aktualizácia objektov ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10641,30 +10815,26 @@ msgstr "Použiť prednastavený &obrázok" msgid "Use &one-pane view as default for 2-file diff" msgstr "Predvoliť &jedno-panelové zobrazenie pre dvojsúborové porovnanie" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Použiť iný bl&ok textu" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Použiť blok \"Moje\"" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Použiť blok \"Moje\" potom \"Ich\"" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Použiť blok \"Ich\"" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Použiť blok \"Ich\" potom \"Moje\"" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10685,15 +10855,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Použiť unifikované porovnanie &schránky" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10703,7 +10873,7 @@ msgstr "Použije celý obsah z ľavého zobrazenia\nPoužije ľavý súbor" msgid "Use block from left before right" msgstr "Použiť ľavý blok pred pravým" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10713,25 +10883,25 @@ msgstr "Použiť blok z ľavého pohľadu pred blokom z pravého pohľadu\nPouž msgid "Use block from right before left" msgstr "Použiť pravý blok pred ľavým" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Použiť blok z pravého pohľadu pred blokom z ľavého pohľadu\nPoužiť blok z prava pred ľavím" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Použiť oba bloky (tento prvý)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Použiť oba bloky (tento posledný)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Použiť ľavý blok" @@ -10747,15 +10917,15 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Pri vracaní použiť odpadkový kôš" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Použiť regulárny výraz" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Použiť blok z prava" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Použiť medzery" @@ -10763,61 +10933,61 @@ msgstr "Použiť medzery" msgid "Use system locale for date/time" msgstr "Použiť systémové nastavenie dátumu/času" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Použiť blok \"&Moje\"" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Použiť blok \"&Ich\"" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Použiť blok \"M&oje\" pred \"Ich\"" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Použiť blok \"Moje\" pred \"Ich\"\n\"Moje\", potom \"Ich\"" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Použiť blok z \"Moje\"\nPoužiť \"Moje\"" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Použiť blok \"I&ch\" pred \"Moje\"" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Použiť blok \"Ich\" pred \"Moje\"\n\"Ich\", potom \"Moje\"" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Použiť blok z \"Ich\"\nPoužiť \"Ich\"" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Použiť blok z ľavého zobrazenia\nPoužije ľavý blok" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Použiť &tento blok" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10825,7 +10995,7 @@ msgid "" "%s" msgstr "Použiť nájdenú cestu.\nPoužiť záplatu na\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10837,19 +11007,19 @@ msgstr "Použiť pôvodnú cestu.\nPoužiť záplatu na\n%s" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Použiť tento &celý súbor" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Použiť blok v ľavo" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Použiť celý druhý &súbor" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10865,11 +11035,11 @@ msgstr "Informácie o používateľovi" msgid "User Name:" msgstr "Používateľské meno:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Zrušené užívateľom" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10879,11 +11049,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Meno užívateľa:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10902,7 +11072,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Hodnota" @@ -10910,24 +11080,24 @@ msgstr "Hodnota" msgid "Version" msgstr "Verzia" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Verzia 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10935,11 +11105,11 @@ msgstr "" msgid "Version Information" msgstr "Informácie o verzií" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Verzia:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Verziované" @@ -10951,23 +11121,27 @@ msgstr "Vietnamské" msgid "View" msgstr "Zobrazenie" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Zobraziť .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Prezrieť revíziu cesty vo &internetovom prehliadači" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Zobraziť revíziu v alternatívnom editore" @@ -10979,11 +11153,11 @@ msgstr "" msgid "Visit our website" msgstr "> Naša stránka <" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10994,7 +11168,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "VAROVANIE:\r\nMente tieto nastavenia len keď ste si úplne istý čo robíte!\r\nPre nastavenie do predvoleného stavu vymažte text hodnoty." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Čakať" @@ -11002,7 +11176,7 @@ msgstr "Čakať" msgid "Wait for the script to finish" msgstr "Čakať na dokončenie skriptu" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11010,15 +11184,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Varovanie" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Varovanie!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11026,7 +11200,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11034,56 +11208,56 @@ msgstr "Web" msgid "Western European" msgstr "Západoeurópske" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Keď je povolené, verziované objekty zobrazené v odovzdávacom dialógu sú automaticky vybrané na odovzdanie" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11093,15 +11267,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Biele znaky (tabulátory, medzery)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Biele znaky" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Pozícia okien" @@ -11109,15 +11283,15 @@ msgstr "Pozícia okien" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11161,11 +11335,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11173,29 +11347,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Zalomiť dlhé riadky" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Zalamovať dlhé riadky na pravom okraji panela\nZalamovať dlhé riadky" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Áno" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Áno pre všetko" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Už máte nainštalovanú aktuálnu verziu." @@ -11205,51 +11375,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Tu možete vypnúť popisovače prekrytých ikon.\nVypnutý popisovač nepoužíva slot a dáva ostatným rozšireniam šelu šancu na zobrazenie ich prekrytých ikon." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Môžete vložiť iba obrázok s rozmermi (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Nemôžete vytvoriť viac ako %d užívateľských líšt!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Túto vlastnosť nie je možné nastaviť na adresáre!\nAk ju chcete použiť na všetky súbory v tom adresári,\nmusíte vybrať zaškrtávacie políčko \"rekurzívne\"." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Zmenili ste vlastnosti bez toho aby ste ich uložili\nChcete ich uložiť teraz?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11257,67 +11427,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Najviac môžete definovať %d nástroj." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Musíte reštartovať počítač, aby sa zmeny prejavili." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Mali by ste zadať text!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Mali by ste vybrať obrázok!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11327,7 +11497,7 @@ msgstr "V minulosti zadané správy denníka boli uložené.\nKliknite sem na ic msgid "Your version is:" msgstr "Inštalovaná verzia:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Vaša verzia: %d.%d.%d.%d" @@ -11337,10 +11507,10 @@ msgid "Zip File" msgstr "Zip súbor" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Vz&dialiť" +msgid "Zoo&m out\t-" +msgstr "Vz&dialiť\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Lupa" @@ -11352,80 +11522,80 @@ msgstr "&Priblížiť" msgid "Zoom &Out" msgstr "&Vzdialiť" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zväčšenie 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Priblížiť\nPriblíži" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Vzdialiť\nVzdiali" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Pri&bížiť" +msgid "Zoom i&n\t+" +msgstr "Pri&bížiť\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Priblížiť" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Vzdialiť" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zobraz všetko" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zobraz celú výšku" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zobraz celú šírku" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Prednastavené]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Nepriradené]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" nie je git repozitár" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11439,7 +11609,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "pridané" @@ -11447,7 +11617,7 @@ msgstr "pridané" msgid "added files" msgstr "pridané súbory" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "nepomenovaný súbor" @@ -11455,14 +11625,19 @@ msgstr "nepomenovaný súbor" msgid "and support the developers" msgstr "> Podpora vývojárov <" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11495,30 +11670,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "odovzdaní" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "konfliktné" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dní" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "vymazané" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11530,7 +11705,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11539,16 +11714,16 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "externé" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorované" @@ -11556,15 +11731,15 @@ msgstr "ignorované" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "nekompletné" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "objekt lokálne zachovaný" @@ -11572,7 +11747,7 @@ msgstr "objekt lokálne zachovaný" msgid "keep the file lists in English" msgstr "udržať zoznam súborov v Angličtine" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11581,7 +11756,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11594,13 +11769,13 @@ msgstr "" #. Resource IDs: (1494) msgid "master" -msgstr "" +msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "zlúčené" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "chýbajúce" @@ -11608,7 +11783,7 @@ msgstr "chýbajúce" msgid "missing/deleted/replaced" msgstr "chýbajúce/zmazané/nahradené" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "zmenené" @@ -11616,7 +11791,7 @@ msgstr "zmenené" msgid "modified/copied" msgstr "zmenené/skopírované" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mesiacov" @@ -11624,40 +11799,44 @@ msgstr "mesiacov" msgid "new branch" msgstr "nová vetva" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nie" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "k tomuto príkazu nie je popis " -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "neverziované" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normálne" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "nenájdené" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "poškodené" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "na %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixely" @@ -11665,11 +11844,11 @@ msgstr "pixely" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "štvrťrokov" @@ -11677,35 +11856,35 @@ msgstr "štvrťrokov" msgid "renamed" msgstr "premenované" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "nahradené" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "hĺbka analýzy:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "prepnuté do\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "do %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "do %s" @@ -11714,35 +11893,35 @@ msgstr "do %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "týždňov" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "rokov" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "áno" diff --git a/Languages/Tortoise_sr@latin.po b/Languages/Tortoise_sr@latin.po index 78653294b..e040d8614 100644 --- a/Languages/Tortoise_sr@latin.po +++ b/Languages/Tortoise_sr@latin.po @@ -14,9 +14,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/tortoisegit/language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "" "Language: sr@latin\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -47,191 +47,191 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# autori prikazani pojedinačno:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "" +msgstr "%.2f MiB preneto" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 je sadržao neočekivani objekat." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 sadrži nepravilnu putanju." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 sadrži nepravilnu šemu." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 ima neispravan format." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 nije pronađen." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "Pre %1!d! Dana" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "Pre %1!d! Dana" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "Pre %1!d! Sata" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "Pre %1!d! Sati" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "Pre %1!d! Minuta" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "Pre %1!d! Mesec" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "Pre %1!d! Meseci" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "Pre %1!d! Sekunde" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "Pre %1!d! Sekundi" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "pre %1!d! Nedelju" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "pre %1!d! Nedelja" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "Pre %1!d! Godinu" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "pre %1!d! Godina" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "Pre %1!d! minuta" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" -msgstr "" +msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" -msgstr "%1: %2⏎\nŽelite li da nastavite da izvršavate skriptu?" +msgstr "%1: %2\nŽelite li da nastavite da izvršavate skriptu?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" "Cannot find this file.\n" "Verify that the correct path and file name are given." -msgstr "%1⏎\nDatoteka nije pronađena.⏎\nProverite da li su putanja i naziv datoteke ispravni." +msgstr "%1\nDatoteka nije pronađena.\nProverite da li su putanja i naziv datoteke ispravni." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Bajtova preneto" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "%I64d KiB preneto" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d datoteka odabrano, %d datoteka ukupno" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d najaktivniji autor(i) sa najmanje %d podnesaka svakih (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -239,78 +239,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alfa\nkliknite da uključite alfa\ndvostruki klik za automtsko uključivanje alfa" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minut(a) i %ld sekund(i)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld od %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - kod revizije: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Vraćeno na staro]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s u %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, kod %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Izvoz (%d) od %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Izvoz od %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" -msgstr "%s⏎\n%s" +msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" -msgstr "%s⏎\nDa li ipak želite da ga uklonite?" +msgstr "%s\nDa li ipak želite da ga uklonite?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -326,6 +326,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "" @@ -348,21 +352,21 @@ msgstr "&Dodaj >>" #. Resource IDs: (1505) msgid "&Add Filter" -msgstr "" +msgstr "Dod&aj filter" #. Resource IDs: (1382) msgid "&Add New/Save" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Dodaj ili Ukloni dugmiće" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Dodaj..." @@ -402,7 +406,7 @@ msgstr "&Dodeli" msgid "&Associate double-click event with:" msgstr "&Pridruži dvostruki klik događaj sa:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Automatski Sakrij" @@ -418,15 +422,15 @@ msgstr "" msgid "&Backup original file" msgstr "&Napravi sigurnosnu kopiju originalnog fajla" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Krivac promena" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Krivac revizija" @@ -436,7 +440,7 @@ msgstr "&Plavi:" #. Resource IDs: (65535) msgid "&Border:" -msgstr "" +msgstr "&Granica:" #. Resource IDs: (1512) msgid "&Branch" @@ -450,7 +454,7 @@ msgstr "" msgid "&Browse Dir" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Pretraži spremište" @@ -486,7 +490,7 @@ msgstr "&Kategorija:" msgid "&Choose commands from:" msgstr "&Odaberi komande od:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Čišćenje..." @@ -510,7 +514,7 @@ msgstr "&Zatvori prozor(e)" msgid "&Command:" msgstr "&Komanda:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "" @@ -518,23 +522,27 @@ msgstr "" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Podnesak..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Uporedi revizije" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopiraj" @@ -554,19 +562,19 @@ msgstr "&Prilagođeno" msgid "&Default" msgstr "&Podrazumevano" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "%Obriši" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Obriši (zadrži lokalno)" #. Resource IDs: (1507) msgid "&Delete Filter" -msgstr "" +msgstr "&Obriši filter" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "" @@ -578,11 +586,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Diff" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Diff sa prethodnom verzijom" @@ -594,7 +602,7 @@ msgstr "" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "" @@ -602,7 +610,7 @@ msgstr "" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Uglavljivanje" @@ -610,11 +618,15 @@ msgstr "&Uglavljivanje" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "" @@ -622,19 +634,19 @@ msgstr "" msgid "&Edit" msgstr "Ur&edi" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "" #. Resource IDs: (1506) msgid "&Edit Filter" -msgstr "" +msgstr "Ur&edi filter" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&izmeni konflikte" @@ -659,10 +671,10 @@ msgid "&Enable edit" msgstr "Omogići ur&eđenje" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "%Izvezi odabir u..." @@ -674,27 +686,27 @@ msgstr "&Spoljnji" msgid "&File" msgstr "&Datoteka" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Nađi" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Ubacite sliku u prozor" +msgid "&Fit images in window\tF" +msgstr "&Ubacite sliku u prozor\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Ugrađeni diskovi" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Plivajući" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -706,7 +718,7 @@ msgstr "&Font za log poruke" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -726,7 +738,7 @@ msgstr "" msgid "&Go to\tCtrl+G" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -738,7 +750,7 @@ msgstr "&Zelena:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Pomoć" @@ -746,7 +758,7 @@ msgstr "&Pomoć" msgid "&Help Topics" msgstr "&Pomoć teme" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Sakrij" @@ -754,11 +766,11 @@ msgstr "&Sakrij" msgid "&Icon Set:" msgstr "&Set ikona:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignoriši %d stavki po imenu" @@ -772,14 +784,14 @@ msgid "&Image" msgstr "&Slika" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Informacije o slici" +msgid "&Image info\tI" +msgstr "&Informacije o slici\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Samo slika" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Uvezi..." @@ -791,7 +803,7 @@ msgstr "&Početni direktorijum:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -803,11 +815,11 @@ msgstr "&Skoči na prvu razliku pri učitavanju" msgid "&Keep CR" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -829,13 +841,13 @@ msgstr "&Ograničeno traženje u izmenjenim linijama" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Granica:" #. Resource IDs: (1078) msgid "&Line number" msgstr "&Brojevi linija" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Brojevi linija (%d - %d)" @@ -852,7 +864,7 @@ msgstr "&Pregled liste" msgid "&Local Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -876,11 +888,11 @@ msgstr "&Animacije menija:" msgid "&Menu contents:" msgstr "&Sadržaj menija:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Stopi" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Spoji..." @@ -930,12 +942,16 @@ msgstr "&Novo..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Sledeći >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Sledeća Stranica" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Nema događaja sa dvostrukim klikom" @@ -952,11 +968,11 @@ msgstr "&Ništa" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&U redu" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Jedna Strana" @@ -964,19 +980,15 @@ msgstr "&Jedna Strana" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Otvori" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -989,18 +1001,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Prekrivač slike" +msgid "&Overlay images\tO" +msgstr "&Prekrivač slike\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Lozinka:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Nalepi" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1008,7 +1020,7 @@ msgstr "" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Pregled pre štampanja" @@ -1016,11 +1028,15 @@ msgstr "&Pregled pre štampanja" msgid "&Print..." msgstr "&Štampaj..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Štampaj...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1028,10 +1044,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Nedavne poruke" @@ -1044,7 +1064,7 @@ msgstr "" msgid "&Red:" msgstr "&Crvena:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Ponovi" @@ -1060,7 +1080,7 @@ msgstr "&Osveži" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1068,7 +1088,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1076,7 +1096,7 @@ msgstr "" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Ukloni" @@ -1086,9 +1106,9 @@ msgstr "" #. Resource IDs: (1511) msgid "&Replace" -msgstr "" +msgstr "&Zameni" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Repo-pretraživač" @@ -1096,7 +1116,7 @@ msgstr "&Repo-pretraživač" msgid "&Reset" msgstr "&Resetuj" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Resetuj traku sa alatima" @@ -1112,23 +1132,27 @@ msgstr "&Resetuj moje podatke o korišćenju" msgid "&Reset to Default" msgstr "&Resetuj na Podrazumevano" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1140,7 +1164,7 @@ msgstr "&SSH Klijent" msgid "&Saturation:" msgstr "Za&sićenje:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Snimi" @@ -1148,15 +1172,19 @@ msgstr "&Snimi" msgid "&Save authentication" msgstr "&Snimi autentifikaciju" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Snimi grafikon kao..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Snimi listu odabranih datoteka u ..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Snimi\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1164,7 +1192,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Podešavanja" @@ -1184,7 +1212,7 @@ msgstr "&Prikaži tekstualne oznake" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "" @@ -1192,7 +1220,7 @@ msgstr "" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1204,7 +1232,7 @@ msgstr "" msgid "&Start Group" msgstr "&Pokreni Grupu" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1224,7 +1252,7 @@ msgstr "&Pogled Simbola" msgid "&Tab size:" msgstr "&Veličina taba:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Dokumet sa tabovima" @@ -1232,9 +1260,9 @@ msgstr "&Dokumet sa tabovima" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" -msgstr "" +msgstr "&Oznake" #. Resource IDs: (65535) msgid "&Tags:" @@ -1268,7 +1296,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Trake sa alatima:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1280,7 +1308,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Dvostrano" @@ -1288,15 +1320,15 @@ msgstr "&Dvostrano" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Poništi" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Objedinjena razlika" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1308,7 +1340,7 @@ msgstr "&Nepoznati diskovi" msgid "&Up" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Uskladi stavku sa revizijom" @@ -1320,11 +1352,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Koristi auto-kompletiranje putanja i ključnih reči" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Korisničko ime: " -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Pogled" @@ -1332,7 +1364,7 @@ msgstr "&Pogled" msgid "&View:" msgstr "&Pogled:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1348,6 +1380,10 @@ msgstr "&Cela reč" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "" @@ -1356,46 +1392,46 @@ msgstr "" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(nema promena)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(nema brojeva linija)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(nema vrednosti)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(nije nađeno)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(nepoznato)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "" @@ -1403,13 +1439,14 @@ msgstr "" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1417,7 +1454,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1433,7 +1470,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1447,101 +1484,101 @@ msgstr "<.....>" #. Resource IDs: (65535) msgid "<<" -msgstr "" +msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" "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 "TortoiseGit je shell ekstenzija.⏎\nTo znači da je integrisana u windows Explorer.⏎\nDa bi ste koristili TortoiseGitmolimo Vas da otvorite explorer i kliknete desnim klikom na bilo koji folder⏎\nda bi se pojavio kontekstni meni gde ćete naći sve TortoiseGit komande.⏎\nI pročitajte uputstvo!" +msgstr "TortoiseGit je shell ekstenzija.\nTo znači da je integrisana u windows Explorer.\nDa bi ste koristili TortoiseGitmolimo Vas da otvorite explorer i kliknete desnim klikom na bilo koji folder\nda bi se pojavio kontekstni meni gde ćete naći sve TortoiseGit komande.\nI pročitajte uputstvo!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1549,7 +1586,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1561,71 +1598,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Lista putanja razdvojenih novim redom za koje nije prikazan kontekstni meni.\nAko dodate '*' karakter na kraj putanje, onda će sve datoteke i poddirektorijumi unutar putanje takođe biti isključeni.\nPrazna lista će dozvoliti kontekstni meni na svim putanjama." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Traženi resurs je nedostupan." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Program za pregled GNU diff fajlova (fajlovi zakrpa)\r\nAko nemate takav, koristite NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "O&" @@ -1641,23 +1678,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Prekini" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "Prekid &Stapanje" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "O" @@ -1677,12 +1714,12 @@ msgstr "" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Pristup ka %1 je zabranjen" -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Akcija" @@ -1690,26 +1727,26 @@ msgstr "Akcija" msgid "Action log" msgstr "Dnevnik akcija" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Akcije" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Aktiviraj listu zadataka" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktivne datoteke" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX objekat ne može biti sačuvan pri izlasku iz Windowsa!\nOdbaci sve promene na %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Dodavanje" @@ -1717,7 +1754,7 @@ msgstr "Dodavanje" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Dodaj '%s' u rečnik" @@ -1730,15 +1767,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Dodaj diff program zavistan od ekstenzija" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Dodaj program za stapanje zavistan od ekstenzije" @@ -1746,15 +1783,15 @@ msgstr "Dodaj program za stapanje zavistan od ekstenzije" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Dodaj u listu za &zanemarivanje" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Dodaj u traku sa alatima za brzi pristup" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Dodaj..." @@ -1762,11 +1799,11 @@ msgstr "Dodaj..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Dodaj/Uredi zavistan od ekstenzije program za razlike/stapanje" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Dodat" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1774,25 +1811,25 @@ msgid "" "to the ignore list." msgstr "Dodat fajl model(i)\n%s\nna listu za zanemarivanje." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Dodavanje" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Dodaje označen(e) fajl(ove) ili masku fajla u listu 'zanemarenih'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Sredi podešavanje\nPodešavanje" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Napredno" @@ -1800,43 +1837,43 @@ msgstr "Napredno" msgid "Advanced Diff/Merge Settings" msgstr "Napredno podešavanje za izradu razlika/spajanja" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Napredno podešavanje razlika" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Napredno podešavanje spajanja" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Sve" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Sve komande" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Svi fajlovi (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Svi fajlovi (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1844,47 +1881,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Sve vaše izmene biće izgubljene! Da li zaista želite izmeniti sve trake sa alatima i menije?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Sve vaše izmene biće izgubljene! Da li zaista želite izmeniti oznake tastature?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Sve vaše izmene biće izgubljene! Da li zaista želite izmeniti meni \"%s\"?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Sve vaše izmene biće izgubljene! Da li zaista želite izmeniti traku sa alatima '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Omogićava uređenje za ovaj pregled\nOmogućava uređenje" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1900,11 +1937,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Uvek koristi sistemska lokalna podešavanja za prikaz vremena i datuma" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1912,12 +1949,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1928,7 +1965,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1941,34 +1978,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Neispravan pokazivač fajla bio je pridružen %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Pojavila se nepoznata greška." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Pojavila se nepoznata greška prilikom pristupa prema %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Nepoznati tip linije je nađen u liniji %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Dodaj desni blok" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Dodaj ovaj blok levo" @@ -1980,11 +2017,11 @@ msgstr "Meni okvira aplikacije" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Primena zakrpe..." @@ -1992,7 +2029,7 @@ msgstr "Primena zakrpe..." msgid "Apply Patches" msgstr "Primeni zakrpe" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -2000,7 +2037,7 @@ msgstr "" msgid "Apply unified diff" msgstr "Primena objedinjenih razl" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Vodeni stil" @@ -2008,39 +2045,39 @@ msgstr "Vodeni stil" msgid "Arabic" msgstr "" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Jeste li sigurni da želite označiti fajl(e) u sukobu kao rešenu(e)?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Da li ste sigurni da želite da povratite %d stavku(e)? Izgubićete sve promene od zadnjeg osvežavanja!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Uređenje &vertikalno" +msgid "Arrange &vertical\tV" +msgstr "Uređenje &vertikalno\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Označeno u listi izmena '%s'" @@ -2049,11 +2086,11 @@ msgstr "Označeno u listi izmena '%s'" msgid "Assigned to:" msgstr "Dodeljeno:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2065,34 +2102,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "U reviziji: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Pokušana je nepodržana operacija." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Pokušaj pristupa %1 nakon njenog kraja." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Pokušaj čitanja iz fajla za pisanje %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Pokušaj pisanja u fajl za čitanja %1." @@ -2109,11 +2146,11 @@ msgstr "Autentifikacija" msgid "Authentication data" msgstr "Autentifikacioni podatak" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Autor" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2121,7 +2158,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Autor:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Autori" @@ -2141,37 +2178,37 @@ msgstr "" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "" +msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Automatsko sakrivanje" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Automatsko skrivanje svega" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Automatsko zatvaranje ako nema sukoba" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Automatsko zatvaranje ako nema grešaka" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Automatsko zatvaranje ako nema spajanja, dodavanja ili brisanja" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2185,7 +2222,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatski" @@ -2195,7 +2232,7 @@ msgstr "Automatski proveri &nadogradnje svake nedelje" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Autotekst tester" #. Resource IDs: (1157) msgid "Average" @@ -2205,19 +2242,19 @@ msgstr "Prosek" msgid "B&rowse..." msgstr "P&retraži..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Nazad" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Pozadina" #. Resource IDs: (65535) msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Stubasti dijagram" @@ -2237,7 +2274,7 @@ msgstr "Osnovni fajl:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2249,45 +2286,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" -msgstr "Bitmapa⏎\nbitmapa" +msgstr "Bitmapa\nbitmapa" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Crni stil" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Krivac" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Prikazuje autore krive za svaku pojedinu liniju fajlova" @@ -2295,26 +2332,30 @@ msgstr "Prikazuje autore krive za svaku pojedinu liniju fajlova" msgid "Blend alpha" msgstr "Mešavina alfa" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Plavi stil" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." -msgstr "I /logmsg i /logmsgfile su navedeni!⏎\nSamo jedno od njih može biti navedeno." +msgstr "I /logmsg i /logmsgfile su navedeni!\nSamo jedno od njih može biti navedeno." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "I putanja ka fajlu zakrpe i ciljna putanja moraju biti apsolutne putanje!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Donji pregled:" @@ -2326,30 +2367,30 @@ msgstr "Pr&etraži..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Grana" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" @@ -2361,11 +2402,11 @@ msgstr "Grana:" msgid "Bro&wse" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Potraži spoljašnjii diff program" @@ -2377,25 +2418,25 @@ msgstr "" msgid "Browse..." msgstr "Pretraži..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "ID baga" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "Bag-ID i&zraz" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "ID-baga" #. Resource IDs: (65535) msgid "BugTraq" -msgstr "" +msgstr "BugTraq" #. Resource IDs: (327) msgid "Bugtraq Regex Tester - TortoiseGit" @@ -2405,7 +2446,7 @@ msgstr "" msgid "Button Appearance" msgstr "Izgled dugmeta" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2421,7 +2462,7 @@ msgstr "P&roveri sada" msgid "C&ommands:" msgstr "K&omande:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "N&apravi granu/oznaku iz revizije" @@ -2429,17 +2470,17 @@ msgstr "N&apravi granu/oznaku iz revizije" msgid "C&urrent Keys:" msgstr "T&ekući tasteri:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "I&seci" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" #. Resource IDs: (65535) msgid "CC:" -msgstr "" +msgstr "CC:" #. Resource IDs: (1741) msgid "Calculate" @@ -2449,93 +2490,93 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Omogući dvostruki klik u listi dnevnika za poređenje s prethodnom revizijom" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Ne može se akitvirati statični ActiveX objekat." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" "%s\n" "to\n" "%s" -msgstr "Nemoguće kopiranje⏎\n%s⏎\nu⏎\n%s" +msgstr "Nemoguće kopiranje\n%s\nu\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Nemogu kopirati bitmapa u klipbord!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Ne može se kreirati nova slika!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Me mogu se pojednostaviti meniji!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Ne mogu zalepiti bitmapu slika iz klipborda!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Odustani" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "" +msgstr "Otkaži\nNe prebacujte na pregled" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "" +msgstr "Otkaži\nDržite prazan fajl." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "" +msgstr "Otkaži\nRešite konflikt najpre." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" -msgstr "" +msgstr "Odustani\nOstani sa tekućim fajlovima" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" -msgstr "" +msgstr "Odustani\nOstani sa tekućim podešavanjem" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Ne može se prikazati diff zbog neusklađenih znakova za novi red u fajlu." @@ -2547,9 +2588,9 @@ msgstr "Kaska&da" msgid "Cascaded context menu" msgstr "Kaskadni kontekstni meni" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Zavisni od veličine slova" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2571,33 +2612,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Promeni stil aplikacije\nPromeni stil" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Promeni položaj prozora" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Promeni veličinu prozora" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2605,38 +2646,38 @@ msgstr "" msgid "Changed Files" msgstr "Izmijenjeni fajlovi" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Izmenjene datoteke između %s, %s i %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Izmenjeni fajlovi: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Popis izmena %s premešten:" @@ -2645,15 +2686,15 @@ msgstr "Popis izmena %s premešten:" msgid "Changes made (double-click on file for diff):" msgstr "Izmenjeno (dvostruki klik na fajl za razl):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Promeni stil aplikacije" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Položaj karaktera gde prikazati granične linije u tekst boksu urezivanja:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Proveri" @@ -2665,31 +2706,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Provera za obnavljanje..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Proveri iz&mene" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Proveri putanju i/ili URL koji ste uneli." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Proverite stavke u meniju koje želite da se pojave u kontekstnom meniju na vrhu umesto u TortoiseGit podmeniju" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Obeležite kako bi ste videli relativna vremena u log porukama" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Označite da koristite sažetiji prikaz datuma i vremena u dnevniku poruka" @@ -2697,31 +2738,31 @@ msgstr "Označite da koristite sažetiji prikaz datuma i vremena u dnevniku poru msgid "Check:" msgstr "Proveri:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Preuzimanje" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2729,11 +2770,11 @@ msgstr "" msgid "Chinese" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2745,78 +2786,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Čišćenje" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Čišćenje" -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Čišćenje nije uspelo na sledećim putanjama:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Čišćenje je uspešno završeno na sledećim putanjama:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Čisti" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Alat za čišćenje\nČisti" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Briše %ld parove korisničkih imena/lozinki, %ld ssl sertifikata i %ld korisničkih imena" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Čisti keš dnevnika iz %ld spremišta" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Čisti uskladištene podatke autentičnosti.\r\nBiće potrebno da ponovo upišete vaše ime korisnika/lozinka za sva spremišta." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Čisti uskladištene veličine i položaje %ld dijaloga" @@ -2825,7 +2866,7 @@ msgstr "Čisti uskladištene veličine i položaje %ld dijaloga" msgid "Click here to go to the website" msgstr "Kliknite ovde za odlazak na web stranicu" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Kliknite ovde za izbor skoro otkucane poruke" @@ -2841,17 +2882,17 @@ msgid "" "extension" msgstr "Kliknite na \"Napredno\" za određivanje dopunskih programa za stapanje baziranih na ekstenziji fajla" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Klikni da vidiš komande za pomeranje bloka teksta\nKoristi tekst blokove" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Klipbord" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2859,7 +2900,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Kloniraj Postojeći Repozitorijum" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "" @@ -2867,49 +2908,49 @@ msgstr "" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Kloniraj..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Zatvori" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Zatvori pun ekran" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Zatvori print pregled\n&Zatvori" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Zatvori ručno" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Zatvara aktivni prozor i upozorava na snimanje dokumenata" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Kolaps" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2935,7 +2976,7 @@ msgstr "Boje:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2943,11 +2984,11 @@ msgstr "" msgid "Comman&ds:" msgstr "Koman&de:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Komanda" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Komandna linija" @@ -2955,7 +2996,7 @@ msgstr "Komandna linija" msgid "Command Line To Execute:" msgstr "Komandna linija za izvršenje:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Naredba pogrešno izvršena." @@ -2963,41 +3004,41 @@ msgstr "Naredba pogrešno izvršena." msgid "Commands" msgstr "Komande" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Urezivanje" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "" @@ -3005,7 +3046,7 @@ msgstr "" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3013,19 +3054,19 @@ msgstr "" msgid "Commit to:" msgstr "Ureži u:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Ureži..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Urezivanje prema autoru" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Urezivanje prema datumu" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Urezuje svaki %s" @@ -3034,15 +3075,15 @@ msgstr "Urezuje svaki %s" msgid "Commits each week:" msgstr "Urezivanje jednom nedeljno:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Urezuje vaše izmene u spremište" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3054,52 +3095,52 @@ msgstr "Urezivanjem novog foldera nećete rekurzivno spremiti i sav njegov sadr msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Uporedi &GLAVNE revizije" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Poredi dva fajla" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Uporedi beline" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Uporedi s o&snovom" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Uporedi sa prethodnom revizijom" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Upoređuje sva beline kada razlikuje\nUpoređuje beline" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Upoređuje fajl sa zadnjom urezanom revizijom kako bi se videle izmene koje ste učinili" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Upoređujem %s sa %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Završeno" @@ -3115,9 +3156,9 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" -msgstr "" +msgstr "Konfiguriši filter regeks" #. Resource IDs: (236) msgid "Configure Hook Scripts" @@ -3149,11 +3190,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "" @@ -3161,15 +3202,15 @@ msgstr "" msgid "Conflict resolved" msgstr "Conflikt razrešen." -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Konfliktan" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Sukobi: %d" @@ -3180,126 +3221,126 @@ msgstr "Sadržaj menija:" #. Resource IDs: (65535) msgid "Context lines for patches" -msgstr "" +msgstr "Linije sadržaja za zakrpe" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Nastavi" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Raširi uglavljen prozor" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Konvertuj razmake u tabove" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Konvertuj tabove u razmake" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Kop&iraj" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Kopirano" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopiraj" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Kopiraj %s u %s, Revizija %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" -msgstr "Alat za kopiranje⏎\nKopiraj" +msgstr "Alat za kopiranje\nKopiraj" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Kopiraj sve informacije u klipbord" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopiraj i preimenuj" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Kopiraj putanje u klipbord" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Kopiraj označeno u &klipbord" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Kopiraj označeno i stavi u klipbord\nKopiraj" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Kopirajte u klipbord" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopija: Novo ime za %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Kopiram %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopiram..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Ispravke" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Nije bilo moguće dodati %s na listu zanemarenih!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Ne bilo moguće proveriti da li postoji novija verzija!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3307,76 +3348,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Nije bilo moguće kreirati %1 zato što je folder pun." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Nije bilo moguće ustanoviti zadnju urezanu reviziju!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Nije bilo moguće dobiti status!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Nije bilo moguće otvoriti %1 zato što je već previše fajlova otvoreno." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Nije bilo moguće otvoriti fajl\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Nije bilo moguće ukloniti %1 zato što je to tekući folder." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Nije bilo moguće ukloniti %s sa liste zanemarenih" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Nije bilo moguće pročitati URL fajla!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3384,7 +3425,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3392,7 +3433,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3400,11 +3441,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Nije bilo moguće pokrenuti posao štampanja." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3412,22 +3453,22 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Nije bilo moguće pokrenuti nit!" #. Resource IDs: (1501) msgid "Coun&t" -msgstr "" +msgstr "B&rojanje" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." -msgstr "" +msgstr "Broj: %u nađeno." #. Resource IDs: (1683) msgid "Create &Library" @@ -3437,15 +3478,15 @@ msgstr "Kreiraj &Biblioteku" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "" @@ -3457,29 +3498,29 @@ msgstr "Napravi listu izmena" msgid "Create New Branch" msgstr "Kreiraj Novu Granu" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3488,49 +3529,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Kreira fajl zakrpe" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Kreira fajl zakrpu iz razlike dva fajla\nKreira fajl zakrpu" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Kreira bazu spremišta na tekućoj lokaciji" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Kreira objedinjeni diff fajl sa svim izmenama koje ste napravili" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3542,7 +3583,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "I&seci" @@ -3550,7 +3591,7 @@ msgstr "I&seci" msgid "Current" msgstr "Tekući" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Trenutna Grana" @@ -3558,7 +3599,7 @@ msgstr "Trenutna Grana" msgid "Current Branch:" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3570,7 +3611,7 @@ msgstr "" msgid "Current version is:" msgstr "Tekuća verzija je:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Tekuća verzija je: %s" @@ -3583,7 +3624,7 @@ msgstr "Prila&godi..." msgid "Custom" msgstr "Prilagođeno" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Prilagodi" @@ -3591,19 +3632,19 @@ msgstr "Prilagodi" msgid "Customize Keyboard" msgstr "Prilagodi tastaturu" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Prilagodi alatni panel za brzi pristup" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Prilagodi alatni panel za brzi pristup..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3617,88 +3658,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Datum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Podrazumevano" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Uobičajeni meni" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Uobičajeni meni aplikacije. Pojavljuje se kad nije otvoren nijedan dokument." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Obično u UTF-8 kodiranje " -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Obriši" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Obrišite i &zanemariti %d stavki po imenu" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Obrišite i zanemariti %d stavki po &ekstenziji" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3706,34 +3751,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "" +msgstr "Briši\nFajl je uklonjen." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Obrisano" @@ -3741,36 +3786,36 @@ msgstr "Obrisano" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Brišu i dodaju označen(e) fajl(ove) ili masku fajla u listu 'zanemarenih'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Briše fajl dnevnika akcija" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Brisanje" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Brisanje nađenih podataka" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Brisanje fajla" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3780,7 +3825,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Dubina" #. Resource IDs: (65535) msgid "Describe" @@ -3790,7 +3835,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Opis" @@ -3798,7 +3843,7 @@ msgstr "Opis" msgid "Description:" msgstr "Opis:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Isključi popis izmena" @@ -3806,33 +3851,33 @@ msgstr "Isključi popis izmena" msgid "Destination" msgstr "Odredište" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Odredišni disk je pun." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Detektuje i podvlači pomerene blokove" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3846,11 +3891,15 @@ msgstr "Dijalog veličina i pozicije" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Dif opcije" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3864,15 +3913,15 @@ msgstr "Dif pregledač::alat stapanja" #. Resource IDs: (65535) msgid "Diff added lines" -msgstr "" +msgstr "Diff dodate linije" #. Resource IDs: (65535) msgid "Diff command" -msgstr "" +msgstr "Diff komanda" #. Resource IDs: (65535) msgid "Diff comment" -msgstr "" +msgstr "Diff komentar" #. Resource IDs: (65535) msgid "Diff file:" @@ -3880,26 +3929,26 @@ msgstr "Diff fajl:" #. Resource IDs: (65535) msgid "Diff header" -msgstr "" +msgstr "Diff zaglavlje" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" -msgstr "" +msgstr "Dif kasnoje" #. Resource IDs: (65535) msgid "Diff position" -msgstr "" +msgstr "Diff položaj" #. Resource IDs: (65535) msgid "Diff removed lines" -msgstr "" +msgstr "Diff uklonjene linije" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3912,19 +3961,19 @@ msgstr "Razlika između" msgid "Diffing" msgstr "Razlikovanje" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3936,26 +3985,26 @@ msgstr "Folder:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disk je pun dok se pristupa %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Pošalji izuzetak: %1" @@ -3964,44 +4013,52 @@ msgstr "Pošalji izuzetak: %1" msgid "Display &buttons in this order" msgstr "Pokaži &dugmiće ovim redom" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Prikaži pomoć na klik na dugme, menije i prozore\nPomoć" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Prikaži pomoć za tekući zadatak ili naredbu\nPomoć" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Prikaži uputstva kako se koristi pomoć\nPomoć" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Prikaz podataka o programu, broj verzije i autorska prava\nO programu" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4014,54 +4071,71 @@ msgstr "Ne prikazuj konetekst meni za sledeće putanje:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Želite li zaista obrisati alatni panel '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Želite li zaista premestiti taj fajl ili folder?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4069,7 +4143,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,21 +4151,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" -msgstr "" +msgstr "Želite li da učitate izmenjene fajlove?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4099,21 +4173,21 @@ msgid "" "as resolved?" msgstr "Da li želite da označite fajl\n%s\nkao rešen?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Želite li da vratite ove auto-sačuvana dokumenta?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Želite li iznova učitati dokumente kako bi odražavali promene podešavanja?\nNapomena: sve učinjene izmene biće izgubljene!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4121,42 +4195,42 @@ msgstr "" msgid "Document :" msgstr "Dokument:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Ne vraćajte auto-sačuvana dokumenta\nKoristite poslednju sačuvanu verziju dokumenata" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" -msgstr "" +msgstr "Ne pamti\nZatvori preglede bez pamćenja izmena" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "" +msgstr "Nemojte sačuvati\nPonovo unesite pregled bez čuvanja izmena" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Ne prikazuj više ovu poruku" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "" @@ -4168,7 +4242,7 @@ msgstr "Dole" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Vuci kako bi meni postao plivajući" @@ -4196,6 +4270,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "I&zostavi putanje:" @@ -4204,7 +4282,7 @@ msgstr "I&zostavi putanje:" msgid "E&xit" msgstr "I&zlaz" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "I&zvezi..." @@ -4224,11 +4302,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Uredi" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4244,23 +4322,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Uredi sliku dugmeta" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Izmeni autora" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Uredi diff program zavistan od ekstenzije" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Uredi program za stapanje zavistan od ekstenzije" @@ -4272,11 +4350,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Upiši poruku dnevnika" @@ -4296,25 +4374,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Ime ili IP proksi servera" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Elipsa alati\nElipsa" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4322,13 +4400,13 @@ msgstr "" msgid "Empty" msgstr "Prazan" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Omogući uređenje" #. Resource IDs: (1510) msgid "Enable EditorConfig" -msgstr "" +msgstr "Omogući EditorConfig" #. Resource IDs: (1766) msgid "Enable Gravatar" @@ -4336,9 +4414,9 @@ msgstr "" #. Resource IDs: (1788) msgid "Enable drag context menu" -msgstr "" +msgstr "Omogući vučenje kontekst menija" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4347,10 +4425,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Omogućeni rukovaoci prekrivača" @@ -4359,35 +4441,35 @@ msgstr "Omogućeni rukovaoci prekrivača" msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Kodiranje" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Primećena je hardverska U/I greška dok se pristupalo %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Primećena se povreda zaključavanja prilikom pristupa %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Primećena je povreda deljenja prilikom pristupa %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Primećen je odgovarajući argument." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Primećena je neočekivana greška prilikom čitanja %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Primećena je neočekivana greška prilikom zapisivanja u %1." @@ -4400,11 +4482,11 @@ msgstr "" msgid "End" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Stil kraja linije" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Povećaj prozor dopune veličine" @@ -4412,23 +4494,23 @@ msgstr "Povećaj prozor dopune veličine" msgid "Enter Log Message" msgstr "Uneti dnevnik poruka" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Unetii URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Uneti GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Uneti valutu." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Uneti datum i/ili vreme." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Uneti datum." @@ -4436,90 +4518,90 @@ msgstr "Uneti datum." msgid "Enter a name for the changelist:" msgstr "unesite ime za listu promena:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Uneti broj između %1 i %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Uneti broj." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Uneti pozitivnu celobrojnu vrednost." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Molim unesite vreme." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Molim unesite celi broj između %1 i %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Molim unesite celi broj između 0 i 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Molim unesite celi broj." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Unesite sadržaj fajla za test dole:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Upiši &poruku dnevnika:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Molim unesite ne više od %1 znaka(ova)." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Unesite regeks tekst dole:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Brisanje svega\nBriši sve" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Briši označeno\nBriši" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Greška" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Greška prilikom izrade keš ikona ljuske!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" -msgstr "greška prilikom čitanja/pisanja ključa registra %s⏎\n%s" +msgstr "greška prilikom čitanja/pisanja ključa registra %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4529,28 +4611,28 @@ msgstr "Izvršna (*.exe)|*.exe|Komanda (*.com)|*.com|Informacija (*.pdf)|*.pdf|B msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Postojeći" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Izlaz" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Proširi (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Raširi usidreni prozor" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Istraži do" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Izvezi" @@ -4558,36 +4640,36 @@ msgstr "Izvezi" msgid "Export Zip File" msgstr "Izvezi u Zip Datoteku" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Folder za izvoz:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Izvezi i fajlove bez verzija" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Izvozim %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Izvozi..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Nastavak" @@ -4603,7 +4685,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Spoljašnji" @@ -4611,101 +4693,101 @@ msgstr "Spoljašnji" msgid "External Program:" msgstr "Spoljašnji program:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Bledo" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Neuspešno vraćanje na staro" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Nije uspelo povezivanje.\nVeza je možda u prekidu." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Nije uspelo pretvaranje AktiveX objekta" -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Neuspešna izrada praznog dokumenta." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Nije uspelo kreiranje objekta. Osigurajte da aplikacija uđe u sistem registar." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Neuspešno pokretanje pomoći." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Neuspešno izvršavanje operacije servera." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Neuspešno otvaranje dokumenta." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Neuspešno izvršavanje operacije servera." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Neuspešno snimanje dokumenta." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Neuspešno postavljanje/uklanjanje skupu izmena '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" -msgstr "Greška u pokretanju tragača za problemima COM objekata '%s'.⏎\n%s" +msgstr "Greška u pokretanju tragača za problemima COM objekata '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Neuspelo!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4713,62 +4795,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Preuzmi" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Dohvatanje fajla..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Dohvatanje revizije %s fajlova:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Fajl" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Kodiranje fajla" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Promene fajla svaki %s" @@ -4777,27 +4859,27 @@ msgstr "Promene fajla svaki %s" msgid "File changes each week:" msgstr "Promene fajla svake nedelje:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Razlike fajla" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" -msgstr "" +msgstr "Fajl nema konflikt" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." -msgstr "" +msgstr "Fajl je prazan." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Fajl lista je prazna" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Zakrpe fajlovi" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4809,7 +4891,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veličina fajlovi:\t\t%s (%s)\nŠirina:\t\t\t%ld tačkica\nVisina:\t\t\t%ld tačkica\nHorizontalna rezolucija:\t%.1f dpi\nVertikalana rezolucija:\t\t%.1f dpi\nDubina:\t\t\t%d bita\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4829,7 +4911,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veličina fajlovi:\t\t%s (%s)\nŠirina:\t\t\t%ld tačkica\nVisina:\t\t\t%ld tačkica\nHorizontalna rezolucija:\t%.1f dpi\nVertikalna rezolucija:\t\t%.1f dpi\nDubina:\t\t\t%d bita\nZoom:\t\t\t%d%%\n\nVeličina fajlovi:\t\t%s (%s)\nŠirina:\t\t\t%ld točkica\nVisina:\t\t\t%ld točkica\nHoriyontalna rezolucija:\t%.1f dpi\nVertikalna rezolucija:\t\t%.1f dpi\nDubina:\t\t\t%d bita\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4841,7 +4923,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veličina fajlovi:\t\t\t%s (%s)\nŠirina:\t\t\t%ld tačkica\nVisina:\t\t\t%ld tačkica\nHorizontalna rezolucija:\t%.1f dpi\nVertikalna rezolucija:\t\t%.1f dpi\nDubina:\t\t\t%d bita\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4861,7 +4943,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Veličina fajlova:\t\t\t%s (%s)\nŠirina:\t\t\t%ld tačkica\nVisina:\t\t\t%ld tačkica\nHorizontalna rezolucija:\t%.1f dpi\nVertikalna rezolucija:\t\t%.1f dpi\nDubina:\t\t\t%d bita\nZoom:\t\t\t%d%%\n\nVeličina fajlova:\t\t\t%s (%s)\nŠirina:\t\t\t%ld točkica\nVisina:\t\t\t%ld točkica\nHoriyontalna rezolucija:\t%.1f dpi\nVertikalna rezolucija:\t\t%.1f dpi\nDubina:\t\t\t%d bita\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Fajlime" @@ -4869,33 +4951,33 @@ msgstr "Fajlime" msgid "Files" msgstr "Fajlovi" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Alat za popunjavanje\nPopuni" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtriranje pomoću" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filter putanja" #. Resource IDs: (1479) msgid "Filter:" -msgstr "" +msgstr "Filter." #. Resource IDs: (20090) msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Pronađi" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4905,41 +4987,41 @@ msgstr "Pronađi označeni tekst\nPronađi" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." -msgstr "" +msgstr "Nađi: Prvo pojavljivanje odozdo nađeno. Početak dokumenta je dostignut." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." -msgstr "" +msgstr "Nađi: Prvo pojavljivanje od početka nađeno. Kraj dokumenta dostignut." #. Resource IDs: (65535) msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Završeno!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Prvi Matični" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Samo Prvi Matični" @@ -4948,18 +5030,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Flopi diskovi (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Folder" @@ -4971,38 +5053,34 @@ msgstr "" msgid "Font" msgstr "Pismo" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Za pomoć pritisni F1. Pomiči vodoravno pomoću točkića miša uz taster Ctrl" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Za cjelokupni dnevnik pomaknite oznaku 'Zaustavi se na kopiraj/preimenuj'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Forsira" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5014,26 +5092,26 @@ msgstr "" #. Resource IDs: (65535) msgid "Foreground" -msgstr "" +msgstr "Prednji plan" #. Resource IDs: (312) msgid "Format Patch" msgstr "Formatiraj Zakrpu" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Napred" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5041,7 +5119,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Nalazi autentične reči:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5063,11 +5141,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5075,7 +5153,7 @@ msgstr "" msgid "From:" msgstr "Od:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Preko celog ekrana" @@ -5083,7 +5161,7 @@ msgstr "Preko celog ekrana" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Potpuno rekurzivan" @@ -5091,7 +5169,7 @@ msgstr "Potpuno rekurzivan" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5099,24 +5177,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ nije mogao biti iniciran!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ nije mogao napraviti objekat bitmapu. Verovatno nema dosta memorije." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Sakupljanje informacija. Molim sačekajte..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5146,43 +5224,43 @@ msgstr "Opšte::Kontekst meni" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Uopšteno::Dijalozi 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Uopšteno::Dijalozi 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Uopšteno::Dijalozi 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Uzmi dnevnike stapanja" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Prijem datoteke %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Prijem datoteke %s, revizija %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Uzimam informaciju..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Uzimam potrebne informacije..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Uzimanje popisa objedinjenih razlika" @@ -5194,23 +5272,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git kopiraj i dodaj fajlove ovom WC-u" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Kopiraj i preimenuj verzionisanu stavku ovde" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Kopiraj verzionisanu stavku(e) ovde" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Izvezi sve stavke ovde" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Izvezi verzionisane stavke here" @@ -5218,35 +5296,35 @@ msgstr "Git Izvezi verzionisane stavke here" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Premesti i preimenuj verzionisanu stavku ovde" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Pomeri verzionisanu satvku(e) ovde" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5258,31 +5336,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5303,7 +5381,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5315,47 +5393,47 @@ msgstr "Idi na liniju" msgid "Go to line" msgstr "Idi na liniju" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Pređi na sledeći sukob\nSledeći sukob" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Pređi na sledeću razliku\nSledeća razlika" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Idi na sledeću razliku u liniji\nSledeća razlika u liniji" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Pređi na prethodni sukob\nPrethodni sukob" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Pređi na prethodnu razliku\nPrethodna razlika" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Idi na prethodnu razliku u liniji\nPrethodna razlika u liniji" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Idi na liniju" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Grafikon" @@ -5371,11 +5449,11 @@ msgstr "Siva" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Grupiši popis izmena" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5391,7 +5469,7 @@ msgstr "GLAVNO" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5403,7 +5481,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Pomoć" @@ -5427,11 +5505,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Krije menije za neverzionisane putanje" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Sakri uglavljeni prozor" @@ -5439,25 +5517,25 @@ msgstr "Sakri uglavljeni prozor" msgid "Hide the script while running" msgstr "Sakri skript dok se izvršava" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Sakri/Prikaži listu fajlova zakrpa" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Sakrij/pokaži popis zakrpa\nSakriva ili pokazuje popis fajl zakrpa" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5467,7 +5545,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Savet: izaberi kontekstni meni, zameni stranu u \"Komande\" i vuci dugmiće alatnog panela u glavni prozor. " -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Dom" @@ -5483,7 +5561,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Zakačive Skripte::Problem tragač integracija" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Tip zakačaljki" @@ -5497,9 +5575,9 @@ msgstr "U&ključi putanje:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5507,55 +5585,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5563,17 +5642,17 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" -msgstr "" +msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" -msgstr "" +msgstr "ID:32818:V +H" #. Accelerator Entry for Menu ID:32822; '' msgid "ID:32822:V C +F" @@ -5595,7 +5674,7 @@ msgstr "" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5603,7 +5682,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5611,7 +5690,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5619,16 +5698,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5639,17 +5718,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5661,7 +5740,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5725,7 +5804,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Prekrivne ikone" @@ -5737,7 +5816,7 @@ msgstr "Prekrivne ikone::Skup ikona" msgid "Icon Overlays::Overlay Handlers" msgstr "Prekrivne ikone::Rukovaoci ikona" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5747,52 +5826,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ikone/Dizajn/Kod:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Ukoliko je uključeno, sprečava da se preklapanja ikona i kontekst meni prikazuju u 'snimi kao..' ili 'otvori' dijalozima" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Ako je označeno, dvostruki klik na reviziji u popisu dnevnika će uporediti fajl s prošlom revizijom" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." -msgstr "Ako je ova stavka obeležena, dijalog za izvršenje će biti ponovo pokrenut automatski posle greške, ↩⏎\nuz čuvanje vaše prethodne selekcije i poruka u log-u" +msgstr "Ako je ova stavka obeležena, dijalog za izvršenje će biti ponovo pokrenut automatski posle greške,\r\nuz čuvanje vaše prethodne selekcije i poruka u log-u" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Ako je stavka obeležena, TortoiseGit će jedanput nedeljno proveravati dostupnost novije verzije" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Ako je postavljeno, prilikom provere statusa pokazaće se i fajlovi\r\nunutar foldera izvan sistema upravljanja verzijama.\r\nProvera statusa se, na primer, koristi u dijalogu za urezivanje." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5805,18 +5884,18 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Zanemari" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Zanemariti %d stavki po &ekstenziji" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" -msgstr "" +msgstr "Ignoriše komentare" #. Resource IDs: (1692) msgid "Ignore File" @@ -5826,15 +5905,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Zanemaruje sve izmene beline" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5842,11 +5921,11 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Zanemari prome&ne velikih i malih slova" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "" +msgstr "Zanemari izmene\nZanemari spoljašnje izmene." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5860,11 +5939,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Zanemari završetke &linija (preporučeno)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5872,29 +5951,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Zanemari promene belina" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Zanemaren" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Zanemaruje sve izmene belina kada razlikuje\nZanemaruje sve izmene belina" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5912,24 +5991,24 @@ msgstr "Slika &i tekst" msgid "Images" msgstr "Slike" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Neposredni potomak, uključujući foldere" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Uvezi" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Uvezi %s u %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5938,16 +6017,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Uvozim datoteku %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5971,24 +6050,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Uključi samo sledeći raspon revizija:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Pogrešno ime fajla." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Početni uvoz" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Dif u liniji" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Dif u liniji prema rečima" @@ -6000,25 +6079,25 @@ msgstr "Razlike unutar liniji" msgid "Input" msgstr "Ulaz" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Umetni sadržaj klipborda\nZalepi" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Nedovoljna memorija za izvršavanje operacije." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Unutrašnja greška aplikacije." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Neispravna valuta." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6026,12 +6105,12 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" "Please consult the documentation for a way to work around this limitation." -msgstr "Nemoguće je preimenovati datoteku samo promenom veličine slova njegovog imena.⏎\nNa primer, datoteka MyFile.txt ne može postati MYFILE.txt.⏎\nMolimo Vas, konsultujte dokumentaciju kako bi ste zaobišli ovo ograničenje." +msgstr "Nemoguće je preimenovati datoteku samo promenom veličine slova njegovog imena.\nNa primer, datoteka MyFile.txt ne može postati MYFILE.txt.\nMolimo Vas, konsultujte dokumentaciju kako bi ste zaobišli ovo ograničenje." #. Resource IDs: (1074) msgid "J&ump to first conflict when loading" @@ -6049,7 +6128,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6057,15 +6136,15 @@ msgstr "" msgid "Keep changelists" msgstr "Sačuvaj liste promena" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" -msgstr "" +msgstr "Čuvajte rešeno\nSkok na prvi nerešen konflikt" #. Resource IDs: (16136) msgid "Keyboard" @@ -6075,7 +6154,7 @@ msgstr "Tastatura" msgid "Keyboard shortcuts:" msgstr "Skraćenice tastature" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Tasteri" @@ -6117,21 +6196,41 @@ msgstr "RED8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Jezik:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "" @@ -6139,7 +6238,11 @@ msgstr "" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6147,17 +6250,17 @@ msgstr "" msgid "Least active author:" msgstr "Najmanje aktivan autor:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" -msgstr "" +msgstr "Ostavi u konfliktu\nKonfliktni status fajla je sačuvan" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Levi pogled:" @@ -6165,11 +6268,11 @@ msgstr "Levi pogled:" msgid "Left image" msgstr "Leva slika" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Linijski graf revizija" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6183,12 +6286,12 @@ msgstr "Linije dif panel" msgid "Line differences" msgstr "Razlike u linijama" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Linija pomereno od linije %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Linija pomereno ka liniji %ld" @@ -6201,26 +6304,26 @@ msgstr "" msgid "Line:" msgstr "Linija:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Linija: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Prikaži sadržaj pomoći\nSadržaj pomoći" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6238,23 +6341,23 @@ msgstr "Učitaj slike" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "" +msgstr "Učitaj izmene\nPregledi su usklađeni novim sadržajem." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6262,13 +6365,13 @@ msgstr "" msgid "Local Branch" msgstr "Lokalna Grana" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Lokalni status" @@ -6276,7 +6379,7 @@ msgstr "Lokalni status" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6286,7 +6389,7 @@ msgstr "" msgid "Locator Bar" msgstr "Lokator panel" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Dnevnik" @@ -6326,12 +6429,12 @@ msgstr "Poruke dnevnika (Prikaži dijalog dnevnika)" msgid "Login:" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Najniža prikazana revizija: %ld - Najviša prikazana revizija: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6342,26 +6445,22 @@ msgstr "Najniža prikazana revizija: %ld - Najviša prikazana revizija: %ld - HE msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" -msgstr "" +msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Neispravan DLL sistema elektronske pošte." -#. Resource IDs: (156) -msgid "Main" -msgstr "Glavni" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6374,47 +6473,47 @@ msgstr "" msgid "Manage" msgstr "" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Označi kao rešeno" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" -msgstr "" +msgstr "Označi kao rešen\nStatus fajla je promenjen u izmenjen" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Označi za poređenje" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" -msgstr "" +msgstr "Označeni blokovi" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Pazi na &velika/mala slova" @@ -6438,7 +6537,7 @@ msgstr "Me&niji pokazuju prvo komande skoro korišćene" msgid "Menu" msgstr "Meni" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Meni pult" @@ -6446,7 +6545,7 @@ msgstr "Meni pult" msgid "Menu s&hadows" msgstr "&Senčanje menija" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Stopi" @@ -6454,34 +6553,34 @@ msgstr "Stopi" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Stopi Reintegriraj (!?)" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Stopljeno" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6489,22 +6588,22 @@ msgstr "" msgid "Merging" msgstr "Spajanje" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Spajam od %s, revizija %s do %s, reviziju %s u %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Stapanje zahteva različite revizije ili različite URL-ove u 'Od:' i 'Do:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Spajam revizije %s od %s u %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Poruka" @@ -6514,9 +6613,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "Izraz d&ela poruke:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Poruke" @@ -6524,23 +6623,27 @@ msgstr "Poruke" msgid "Min" msgstr "Minimum" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Moj" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimizirati traku" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Minimalni broj karktera poruke urezivanja:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Razno" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Mešano" @@ -6548,35 +6651,35 @@ msgstr "Mešano" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Datum promene" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Izmenjen" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Više" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Više dugmeta" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Više naredbi..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Više boja..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Više..." @@ -6596,41 +6699,41 @@ msgstr "Pomakni &dole" msgid "Move &Up" msgstr "Premesti &gore" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Premesti Stavku Dole" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Premesti Stavku Gore" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Premesti i preimenuj" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Premesti na skup izmena" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Premesti/Preimenuj" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Premeštanje: novo ime za %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Pomera izmenjene fajlove u korpu pre vraćanja" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Premeštam %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Premeštam..." @@ -6638,23 +6741,23 @@ msgstr "Premeštam..." msgid "My file:" msgstr "Moj fajl:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Ime" #. Resource IDs: (65535) msgid "Name:" -msgstr "" +msgstr "Ime:" #. Resource IDs: (156) msgid "Navigate" msgstr "Upravljanje" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6664,11 +6767,11 @@ msgstr "Upravi se u specifičnu liniju u pregledu\nIdi na liniju" msgid "Navigation Pane Options" msgstr "Opcije Navigacionog Panela" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Opcije Navigacionog Panela..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Ugneždeno" @@ -6680,7 +6783,7 @@ msgstr "Mreža" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Novo" @@ -6689,77 +6792,73 @@ msgid "New &name:" msgstr "Novo &ime:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nova Grana\\Tag" +msgid "New Branch/Tag" +msgstr "Nova Grana/Tag" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Novi meni" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Novo ime za %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" -msgstr "" +msgstr "Novo ime ne može biti prazno ili isto kao originalno ime!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Novo ime:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" -msgstr "" +msgstr "Nova linija" #. Resource IDs: (20308) msgid "Next" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Sledeća Strana\nSledeća Strana" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Sledeći konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Sledeća razlika" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Sledeća razlika u liniji" -#. Resource IDs: (73) -msgid "No" -msgstr "Ne" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6771,102 +6870,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Vrednost naredbe nije određena!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Razlike nisu nađene!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Nije dostupna nijedna poruka o grešci." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Greška se nije pojavila." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Nema izmenjenih datoteka ili fascikli. Nema ničega što bi TortoiseGit povratio!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Nema fajoval za prikazivanje sa tekućim podešavanjem.\nOznači neku ili više postavki kako bi se prikazale fajlovi bez verzija, zanemareni i/ili neizmenjeni fajlovi.\nAko želite pogledati izmene u spremištu, kliknite na 'Proveri spremište'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Ni jedna datoteka nije promenjena ili dodata od⏎\nposlednjeg slanja. Nema ničega⏎\nšto bi TortoiseGit ovde radio..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Ni jedna datoteka nije promenjena ili dodata od⏎\nposlednjeg slanja. Nema ničega⏎\nšto bi TortoiseGit ovde radio...⏎\nDa li želite da pogledate neverzionisane datoteke?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Graf nije dostupan" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Program za kodiranje slika nije nađen za %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Nema korekcija pravopisa" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Nema keš statusa. Samo imenici pod sistemom upravljanja verzijama dobijaju prekrivače, ne i fajlovi" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Nema predloga iz rečnika sinonima" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6874,11 +6978,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Ništa" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normalan" @@ -6890,30 +6994,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Nisu uklonjene sve stavke iz sistemskog registra (ili INI fajlovi)." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Nedovoljno memorije za izvršenje operacije." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Nema dovoljno memorije!\nPokušajte smanjivanjem veličine revizionog grafa ili\nspajajući čvorove ili smanjujući faktor uvećanja." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6921,7 +7025,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6940,26 +7044,26 @@ msgstr "Primedba: folder sadrži neverzionisane stavke" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Beleška" @@ -6967,7 +7071,7 @@ msgstr "Beleška" msgid "Number Commits" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Broj %s" @@ -6980,7 +7084,7 @@ msgstr "Broj autora:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7052,41 +7156,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "U redu" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Ofice 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Ofice 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Ofice 2007 boje" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Ofice HP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7094,15 +7198,15 @@ msgstr "" msgid "Older lines" msgstr "starije linije" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Jedan ili više auto-sačuvanih dokumenata je nađeno." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Jedna ili više fajl su u stanju sukoba." @@ -7114,29 +7218,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Samo fajlovi potomci" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Samo brojevi (mogu biti odvojeni zarezom)\nsu dozvoljeni!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Samo ova stavka" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Otvori" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7146,51 +7250,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Otvori fajlove za dif ili da se primeni zakrpa\nOtvori fajlove" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Otvori iz klipborda" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Otvori fajl slike..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Otvori predački folder" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Otvori sa..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Otvara pomoć\nTeme pomoći" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Opcije" @@ -7199,30 +7304,30 @@ msgid "Options" msgstr "Opcije" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "&Originalna veličina" +msgid "Ori&ginal size\tS" +msgstr "&Originalna veličina\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Drugi Panel Zadataka" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Ostali" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Program je ostao bez memorije." @@ -7230,7 +7335,7 @@ msgstr "Program je ostao bez memorije." msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7238,20 +7343,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Stranica %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7262,15 +7371,15 @@ msgstr "Stranica %u\nStranice %u-%u\n" msgid "Page :" msgstr "Stranica :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametri:" @@ -7278,25 +7387,25 @@ msgstr "Parametri:" msgid "Parameters:" msgstr "Parametri:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7306,41 +7415,41 @@ msgstr "" #. Resource IDs: (4585) msgid "Password" -msgstr "" +msgstr "Lozinka" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Lozinka:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Nalepi" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Alat za lepljenje\nZalepi" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Zalepi listu imena fajoval" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Nalepi svn putanju iz klipborda, rezultat je pomeranje (presek) ili kopi operacija" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7356,54 +7465,54 @@ msgstr "Krpi izabrane &stavke" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Krpi sve fajlove" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Krpi izabrane fajlove" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Krpljenje" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Putanja" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." -msgstr "" +msgstr "Nađena putanja bolje upoređuje zakrpu" #. Resource IDs: (1580, 65535) msgid "Path:" msgstr "Putanja:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Putanje" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Alat čišćenja\nOčisti" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Procenat ispisa" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Procenti" @@ -7411,24 +7520,24 @@ msgstr "Procenti" msgid "Personalized Menus and Toolbars" msgstr "Prilagodljivi meniji i alatni paneli" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7438,56 +7547,56 @@ msgstr "Slika (Metafajl)\nslika" msgid "Picture:" msgstr "Slika:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Dijagram (pita)" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Molimo upišite ime zakačivog skripta koji će se izvršiti." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Odaberite putanju na koju će se primeniti zakačiv skript." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Molim odaberite tip zakačaljke" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Molim pričekajte dok odustajem..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Molim pričekajte dok se dobiju razlike..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Molim pričekajte..." @@ -7503,11 +7612,11 @@ msgstr "Port:" msgid "Port:" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Post urezivanja zakačaljka" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7515,23 +7624,23 @@ msgstr "" msgid "Pre&v Page" msgstr "&Prethodna strana" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Pre urezivanja zakačaljka" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Priprema desni blok" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Priprema ovaj blok levo" @@ -7543,11 +7652,11 @@ msgstr "Pritisni &Novi Taster Skraćenica:" msgid "Press &new shortcut key:" msgstr "Pritisni &novi taster skraćenica:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Pregled" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Pregled fajlova zakrpa" @@ -7559,51 +7668,51 @@ msgstr "Pregled:" msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Prethodna strana\nPrethodna strana" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Prethodni konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Prethodne razlike" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Prethodne razlike u liniji" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Štampaj" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Štampaj dokument\nŠtam&paj" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Štampaj u fajl" @@ -7611,7 +7720,7 @@ msgstr "Štampaj u fajl" msgid "Printer :" msgstr "Pisač :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Programi (*.exe)|*.exe|All Files (*.*)|*.*||" @@ -7619,11 +7728,11 @@ msgstr "Programi (*.exe)|*.exe|All Files (*.*)|*.*||" msgid "Printing" msgstr "Ispisivanje" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programi (*.exe)|*.exe|Svi fajlovi (*.*)|*.*||" @@ -7631,11 +7740,11 @@ msgstr "Programi (*.exe)|*.exe|Svi fajlovi (*.*)|*.*||" msgid "Progress" msgstr "Napredak" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" -msgstr "" +msgstr "Projekat" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Svojstvo" @@ -7643,17 +7752,17 @@ msgstr "Svojstvo" msgid "Property Page" msgstr "Stranica sa svojstvima" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Dobavljač" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Snabdevač para&metara:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Dobavljač uuid vin&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7675,15 +7784,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Povuci" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7691,19 +7800,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "" @@ -7719,11 +7828,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7731,22 +7840,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Prekid rada aplikacije; upozori da se snime dokumenti\nIzlaz" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7764,11 +7873,15 @@ msgstr "R&AM diskovi" msgid "R&eset" msgstr "&Reset" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "V&rati na ovu reviziju" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7776,7 +7889,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7798,7 +7911,7 @@ msgstr "" msgid "Re&movable drives" msgstr "Diskovi koji se mogu u&kloniti" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Pre&imenuj..." @@ -7814,15 +7927,15 @@ msgstr "&Resetuj sve" msgid "Re&store defaults" msgstr "Vrati podrazumevane vredno&sti" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Vra&ti na staro..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Pročitajte 'Vodič za dnevnu uporabu' pre no što zaglavite..." @@ -7830,21 +7943,21 @@ msgstr "Pročitajte 'Vodič za dnevnu uporabu' pre no što zaglavite..." msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Nedavno" @@ -7856,21 +7969,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Nedavno izmenjene linije" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Samo snimanje" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Vraća auto-sačuvana dokumenta\nOtvori auto-sačuvane verzije umesto eksplicitno sačuvanih verzija" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7884,17 +7997,21 @@ msgstr "" msgid "Recursive" msgstr "Rekurzivno" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Ponovi prethodno poništenu akciju\nPonovi" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Smanji prozor u ikonu" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7902,43 +8019,43 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Osveži" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" -msgstr "" +msgstr "Regeks filter" #. Resource IDs: (164) msgid "Regex Filters" -msgstr "" +msgstr "Regeks filteri" #. Resource IDs: (65535) msgid "Regex:" -msgstr "" +msgstr "Regeks:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7957,7 +8074,7 @@ msgid "" "\\s : whitespaces" msgstr "Filter regularnih izraza:\r\n. : bilo koji znak\r\nc+ : pronađi slovo s jednom ili više puta\r\nc* : pronađi slovo s nula ili više puta\r\n^ : početak reda\r\n$ : završetak reda\r\n(string){n} : string n puta\r\n(abcd) : podizraz\r\n[aei0-9] : nađi a,e,i i 0..9\r\n[^aei0-9] : sve osim a,e,i i 0..9\r\n\r\n\\w : pronalazi a-z,A-Z,0-9 i _\r\n\\W : pronalazi bilo koji znak koji nije slovo ili broj (a-z,A-Z,0-9 i _)\r\n\\d : cifre 0-9\r\n\\s : beline" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Odbačen deo zakrpe za '%s'" @@ -7970,7 +8087,7 @@ msgstr "" msgid "Reload" msgstr "Ponovo učitaj" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8004,19 +8121,19 @@ msgstr "" msgid "Remote Branch" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Udaljeni status" @@ -8028,12 +8145,12 @@ msgstr "" msgid "Remove" msgstr "Ukloni" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Ukloni %ld stavki" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Ukloni %s" @@ -8042,7 +8159,7 @@ msgstr "Ukloni %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8050,21 +8167,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" -msgstr "" +msgstr "Ukloni sve komentare pre nego je urađen dif tako da izmene unutar komentara nisu prikazane kao različite" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Ukloni s popisa &zanemarenih" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Ukloni iz alatnih panela za brzi pristup" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Ukloni s popisa izmena" @@ -8076,7 +8193,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8084,11 +8201,11 @@ msgstr "" msgid "Removed" msgstr "Uklonjen" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Uklonjeno s popisa izmena" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8096,7 +8213,7 @@ msgid "" "from the ignore list." msgstr "Uklonjen fajl uzorak(ci)\n%s\ns popisa zanemarenih." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Uklanja fajl ili masku fajl s popisa zanemarenih stavki" @@ -8104,11 +8221,11 @@ msgstr "Uklanja fajl ili masku fajl s popisa zanemarenih stavki" msgid "Rena&me..." msgstr "Prei&menuj..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Preimenuj" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Preimenuj %s" @@ -8117,20 +8234,20 @@ msgstr "Preimenuj %s" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Preimenuj/pomeri" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8138,9 +8255,9 @@ msgstr "Ponovi zadnju akciju\nPonovi" #. Resource IDs: (1512) msgid "Replace &All" -msgstr "" +msgstr "Zameni &Sve" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8148,18 +8265,18 @@ msgstr "Zameni označeni tekst nekim drugim tekstom\nZameni" #. Resource IDs: (65535) msgid "Replace with:" -msgstr "" +msgstr "Zameni sa:" #. Resource IDs: (65535) msgid "Replace:" -msgstr "" +msgstr "Zameni:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" -msgstr "" +msgstr "Zamenjeno %d nađenih" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Menjam" @@ -8183,11 +8300,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Traži ime korisnika i lozinku" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Raz&reši..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "" @@ -8199,25 +8316,25 @@ msgstr "&Resetuj sve" msgid "Reset Type" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Resetuj kolone" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Reši" @@ -8225,126 +8342,122 @@ msgstr "Reši" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Reši spor koristeći 'moj'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Reši spor koristeći 'njihov'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Rešeno" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Rešeno:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Razrešuje sukobljene fajlove" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Vratiti" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Vrati početne postavke" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Vratiti posle urezivanja" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Vraća prozor na normalnu veličinu" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Obnovljeno" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Pokušaj ponovo" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Vrati na staro" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Vraćeno na staro" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Poništava sve izmene koje su učinjene nakon zadnjeg obnavljanja" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Poništava dodavanje fajlovi(a) pod naqor kontrole veryija" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revizija" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Revizioni &graf" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8360,31 +8473,31 @@ msgstr "Filter revizionog grafa" msgid "Revision graph" msgstr "Revizioni graf" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rič text (RTF)\ntekst sa pismom i formatiranjem paragrafa" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Desni pogled:" @@ -8392,21 +8505,21 @@ msgstr "Desni pogled:" msgid "Right image" msgstr "Desna slika" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Red %d od %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Red %d-%d od %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Red dole" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Red gore" @@ -8414,11 +8527,11 @@ msgstr "Red gore" msgid "S&elect..." msgstr "I&zabrati..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "P&rikaži dugmiće u jednom redu" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "P&rikaži dugmiće u dva reda" @@ -8426,25 +8539,33 @@ msgstr "P&rikaži dugmiće u dva reda" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "P&rikaži alatni panel za brzi pristup ispod trake" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "S&tatistika" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8454,7 +8575,7 @@ msgstr "" msgid "SMTP Server:" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8462,31 +8583,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8498,15 +8619,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8522,37 +8643,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Probni tekst:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Sačuvaj" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Sačuvaj &kao..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Sačuvaj &kao...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Sačuvaj kao" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" -msgstr "" +msgstr "Čuva donje fajlove kao\nBićete pitani gde da sačuvate donje falove" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" -msgstr "" +msgstr "Sačuvaj fajl" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" -msgstr "" +msgstr "Sačuvaj levi fajl kao\nPitani ste gde sačuvati levi fajl" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8560,13 +8685,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" -msgstr "" +msgstr "Sačuvaj desni fajl kao\nPitani ste gde da sačuvate desni fajl" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8574,74 +8699,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" -msgstr "" +msgstr "Sačuvaj sve\nOba fajla su sačuvana" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" -msgstr "" +msgstr "Sačuvaj i odstrani\nVaše izmene su sačuvane i iskoršćen je osriginalni sadržaj" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Sačuvaj i zanemari označene blokove\nSamo vaša ručna uređenja su sačuvana, markirani blokovi su odbačeni onakvi kakvi su" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "" +msgstr "Sačuvaj i uključi\nVaše izmene su sačuvane i označeni blokovi su uključeni" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Sačuvaj kao" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Sačuvaj kao..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "" +msgstr "Sačuvaj kao\nPitani ste gde sačuvati fajl" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Sačuvaj izmene u %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." -msgstr "" +msgstr "Sačuvajte izmene." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Sačuvaj reviziju &u..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8663,13 +8788,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "" +msgstr "Sačuvaj\nSačuvaj fajl sa konfliktnim markerima." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8681,28 +8806,28 @@ msgstr "" msgid "Saved Data" msgstr "Sačuvani podaci" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Skenira" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Mrva" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Premotaj ulevo" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Premotaj udesno" @@ -8710,32 +8835,32 @@ msgstr "Premotaj udesno" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Pretraži &dnevnik poruka..." #. Resource IDs: (1074) msgid "Search &up" -msgstr "" +msgstr "Traži &gore" #. Resource IDs: (65535) msgid "Search for:" msgstr "Potraži:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Traženje bolje putanje da se primeni zakrpa..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Traženje je prekinuto na %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Izaberi" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Izaberi &sve" @@ -8751,59 +8876,59 @@ msgstr "Izaberite &kontekstni meni" msgid "Select &window:" msgstr "Izaberi &prozor:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Izaberi Alat Boja\nIzaberi Boju" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Izaberi fajl..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Izaberi SSH klijent" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Izaberi dugme." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Odaberi objekt za koji želite dobiti pomoć" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Izaberte listu izmena" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Izaberite aplikaciju za pregled razlika" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Izaberite folder da se pridruži ovom problem tragaču" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Odaberite folder za izvoz.\nMožda bi trebalo napraviti novi folder pre no što se napravi izvoz." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Odaberite radni folder za skript" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Odaberite radni folder za snimanje odabranih fajlova" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Izaberite fajl zakačivog skripta" @@ -8811,20 +8936,20 @@ msgstr "Izaberite fajl zakačivog skripta" msgid "Select items automatically" msgstr "Odaberi stavke automatski" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Izabertei aplikaciju za spajanja" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Izaberite odredište spajanja" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8834,27 +8959,31 @@ msgstr "Označite celi dokument\nOznači sve" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Bira jezik koji koristi projekat. Podešavanje se odnosi na proveru pravopisa korišćenog za poruke urezivanja." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Izaberite pregledač za razl-fajl" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" -msgstr "" +msgstr "Izaberite koji fajl želite da sačuvate kao" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" -msgstr "" +msgstr "Izaberite koji fajl želte da sačuvate kao\nPrimedba: Postoji nerešen konflikt!" #. Resource IDs: (1067) msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8862,7 +8991,7 @@ msgstr "" msgid "Send" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "" @@ -8870,11 +8999,11 @@ msgstr "" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Send Mail nije uspeo poslati poruku." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "" @@ -8882,19 +9011,19 @@ msgstr "" msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Slanje sadržaja" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "" @@ -8914,28 +9043,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Postavljanje svojstava..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Postavke" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Školjka" @@ -8943,7 +9072,7 @@ msgstr "Školjka" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Keš ikona školjke je ponovo izgrađena!" @@ -8955,7 +9084,7 @@ msgstr "" msgid "Short &date/time format in log messages" msgstr "Kratak oblik &datuma/vremena u dnevniku poruka" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Aktiviraj listu zadataka" @@ -8967,7 +9096,7 @@ msgstr "Prikaži" msgid "Show &Accelerator for:" msgstr "&Prikaži menije za:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8975,15 +9104,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Prikaži &izmene" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Prikaži &dnevnik" @@ -8991,15 +9120,19 @@ msgstr "Prikaži &dnevnik" msgid "Show &log..." msgstr "Prikaži &dnevnik..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Prikaži p&reklapanja i kontekst meni samo u exploreru" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Prikaži Iznad Trake" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Prikaži Ispod Trake" @@ -9007,35 +9140,35 @@ msgstr "Prikaži Ispod Trake" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Prikaži manje dugmića" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Prikaži čvorove glavne revizije" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Prikaži razlike u redu reč po reč\nRazlike po rečima unutar linije" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Prikaži Inlajn-dif\nInlajn dif" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Prikaži više dugmića" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Prikaži alatni panel za brzi pristup iznad trake" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Prikaži alatni panel za brzi pristup ispod trake" @@ -9043,11 +9176,11 @@ msgstr "Prikaži alatni panel za brzi pristup ispod trake" msgid "Show Screen&Tips on toolbars" msgstr "Pokaži ekran&Vrh na alatnom panelu" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Prikaži beline" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Prikaži pregled celog grafa" @@ -9055,7 +9188,7 @@ msgstr "Prikaži pregled celog grafa" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9063,11 +9196,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Prikaži izmene kao &objedinjene razlike" @@ -9087,15 +9220,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9107,11 +9240,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Prikaži p&un meni posle kratkog kašnjenja" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9127,7 +9264,7 @@ msgstr "" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9135,90 +9272,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Prikaži brojeve lini&ja" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Prikaži počevši od najstarijeg čvora" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Prikaži ili sakri linije razlika pult\nPromeni LinRazlPult" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Prikaži ili sakri statusnu tablu\nMenjaj prikaz LokatorPult" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Prikaži ili sakri statusni panel\nMijenjaj prikaz StatusPult" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Prikaži ili sakri alatni panel\nMenjanje prikaza AlatPulta" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Prikaži osobine revizije" @@ -9226,7 +9363,7 @@ msgstr "Prikaži osobine revizije" msgid "Show shortcut &keys in ScreenTips" msgstr "Prikaži &tastere skraćenice u EkranObjašnjenju" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9236,7 +9373,7 @@ msgstr "Prikaži specijalne karaktere za beline i nove linije\nPrikaži beline" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9248,45 +9385,43 @@ msgstr "" msgid "Show un&versioned files" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Pokaži/Sakri" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Grafički prikaz kopije/oznake/grane" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Prikazuje sve fajlovi promenjene od zadnjeg obnavljanja, lokalno i u spremištu" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Prikazuje dnevnik u postavljenom editoru teksta" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9298,7 +9433,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Srebrni stil" @@ -9306,20 +9441,20 @@ msgstr "Srebrni stil" msgid "Since" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Veličina" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Preskoći" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9327,23 +9462,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Preskočeno" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Preskočena je meta koja nedostaje" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Slajd" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" -msgstr "" +msgstr "Pametan tab karakter" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9351,13 +9486,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9371,7 +9506,7 @@ msgstr "Poređaj po broju urezivanja" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9381,57 +9516,61 @@ msgstr "Određuje koliko poruka želite držati u priručnoj memoriji nedavno up msgid "Spin1" msgstr "Rotacija1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Podeli redove" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Rastavi aktivni prozor na ploče\nRastavi" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Naslagani stubasti dijagram" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Naslagani linijski dijagram" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Start Urezivanja zakačaljka " -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Pokreni uređivač registra" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9443,39 +9582,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statički" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistika" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Status" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Postavke statusne linije" @@ -9487,32 +9634,32 @@ msgstr "Boje statusa i akcija" msgid "Status cache" msgstr "Status keša" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Status keš je samo za jedan folder, nema rekurzivnog prekrivanja" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." -msgstr "" +msgstr "Čuva putanju fajla da se koristi za dif pri kasnijem desnim klikom, Držite Ctrl taster da uklonite zadnju sačuvanu putanju." -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9520,15 +9667,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Stil" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "" @@ -9536,7 +9683,7 @@ msgstr "" msgid "Submodule" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9544,7 +9691,7 @@ msgstr "" msgid "Submodule Add" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9552,15 +9699,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9568,7 +9715,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9583,15 +9730,15 @@ msgstr "" msgid "Submodules" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" -msgstr "" +msgstr "Uspeh" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Prebaci" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "" @@ -9600,43 +9747,43 @@ msgstr "" msgid "Switch To" msgstr "" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Vrati se na prethodnu ploču prozora\nPrethodna ploča" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Prebaci između pojedinačnog i dvostrukog panel pregleda" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Prebaci se između pogleda s jednom ili dve ploče\nPrebaci se između pogleda s jednom ili dve ploče" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Prebaci llevi i desni pregled" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Zameni sadržaj levog i desnog pogleda\nZameni levi i desni pogled" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Prebaci na prozor sa sledećim dokumentom" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Prebaci se na sledeću ploču prozora\nSledeća ploča" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Prebaci na prozor s prethodnim dokumentom" @@ -9644,21 +9791,21 @@ msgstr "Prebaci na prozor s prethodnim dokumentom" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Zamenjuje poređenje levo<->desno" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9668,23 +9815,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9694,13 +9841,13 @@ msgstr "Stavke iz sistemskog registra su uklonjene i INI fajl (ako je postojao) msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9714,7 +9861,7 @@ msgstr "Tab znak" msgid "Tab size:" msgstr "Veličina taba:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "" @@ -9722,16 +9869,16 @@ msgstr "" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "" @@ -9739,11 +9886,11 @@ msgstr "" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Zadaci" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Ploča zadataka" @@ -9755,11 +9902,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Samo za test" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9767,13 +9914,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9781,64 +9934,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Veličina bloka se nije poklapala s brojem dodatih/uklonjenih linija!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Rad mehanizma za izradu razlika je zaustavljen zbog greške:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "fajl %s ne postoji!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "fajl %s nije nađena u fajlu sa zakrpom!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9847,15 +10014,15 @@ msgid "" "Do you want to remove the file?" msgstr "fajl\n%s\nje prazan.\nDa li ga želite ukloniti?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "fajl je prevelik" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "fajl je prevelik da bi se otvorio." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9863,7 +10030,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "fajl\n%s\nveć postoji! Želite li ga prepisati?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9871,14 +10038,14 @@ msgid "" "is not a valid text file!" msgstr "Fajl\n%s\nnije valjani teks fajl!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Folder %s\nsadrži izmenjene fajlove ili fajlove izvan sistem. Da li ga ipak želite ukloniti?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9887,78 +10054,78 @@ msgid "" "Would you like to create it first?" msgstr "Folder\n%s\nne postoji.\nŽelite li ga prvo napraviti?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Zakačiv Skript je vratio grešku:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Slika ne može biti prikazana." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Nabavljač problem-tragača nije kreiran. Molim proverite da je instaliran korektno." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Nabavljač problem-tragača ne može da vrednuje parametarski string" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Red koji ukazuje na novi fajl se očekivao u liniji br. %d!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Brojevi linija moraju biti između %d i %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Najveći broj redova koji se čuvaju u fajlu dnevnika.\nSvaka linija koja se doda iza ovog broja ukloniće najstariju liniju iz fajla." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Naredba nije uspešno završena." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Parameteri '/path' i '/pathfile' se međusobno isključuju.\nMorate se odlučiti za jedan od njih." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9968,7 +10135,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9979,7 +10146,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9990,36 +10157,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "Regularni izraz je neispravan!\nMolimunesite ispravan regularni izraz." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Izabrana fajl izgleda da još uvek sadrži oznake jednog ili više sukoba.\nJeste li sigurni da želite označiti fajl kao rešen?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10027,7 +10201,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10036,7 +10210,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10045,26 +10219,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" -msgstr "" +msgstr "Tekst je identičanali ali fajlovi nisu prepoznati!\r\nSledeće razlike su nađene:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Vreme u sekundama nakon kojeg se zaustavlja analiza odabranih fajlova.\r\nManja vrednost uzrokovaće bržu pojavu popisa automatskih dopuna,\r\nali tada svi fajlovi možda neće biti pretraženi." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Dva odabrana URL-a ne potiču od istog izvora.\nNije moguće prikazati njihove poruke dnevnika!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10074,34 +10248,34 @@ msgstr "" msgid "Their file:" msgstr "NJihov fajl:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "NJihov" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Postoji tekućih %d rukovaoca prekrivača instaliranih po Tortoise korisniku" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" -msgstr "" +msgstr "Postoji više pregleda za uređivanje.\nKoji pregled želite da sačuvate?" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Nema nabavljača problem-tragača." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10110,85 +10284,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Postoji još nerešenih sukoba u liniji %d!\nPotrebno je rešiti te sukobe pre snimanja.\nŽelite li snimiti fajl sa i dalje prisutnim sukobima?\nAko kliknete DA, tada ćete morati da ručno rešite sukobe koristeći neki drugi alat za obradu!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Postoje izmene koje nisu spremljene!\nŽelite li snimiti vaše izmene?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Sinonimi" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Ovo su skorašnje sačuvani zatim tekuće otvoreni dokumenti i sadrže izmene pre nego se aplikacija zatvori." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Ovo nije ispravan URL.\nMolim unesite URL." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Ovaj program je povezan s nedostajućim izvozom %s u fajl %s. Ovaj uređaj možda ima nekompatibilnu verziju od %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Ovaj program zahteva fajl %s koja nije nađen na ovom sistemu." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Ovo svojstvo je dozvoljeno samo za foldere, ne i fajlove." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Ovo će izbrisati zapis komandi koje ste koristili u ovoj aplikaciji i vratiće uobičajen skup komandi u menijima i alatnom panelu. To neće poništiti bilo koje izričito prilagođenje. Da li ste sigurni da želite da uradite to?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10204,14 +10378,14 @@ msgstr "Složi hori&zontalno" msgid "To" msgstr "" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10223,13 +10397,13 @@ msgstr "" msgid "To:" msgstr "Prema:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Promeni Jedna/Dve stranice displeja\nPromeni Jedna/Dve stranice displeja" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10241,11 +10415,11 @@ msgstr "Alatni panel" msgid "Toolbar Name" msgstr "Ime alatnog panela" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Opcije alatnog panela" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Interna greška alatnog panela. Molim kontaktirajte prodavca aplikacije." @@ -10261,16 +10435,16 @@ msgstr "Alati" msgid "Tools:" msgstr "Alati" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10280,40 +10454,40 @@ msgstr "" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" -msgstr "" +msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10329,7 +10503,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10337,7 +10511,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10351,36 +10525,36 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10419,11 +10593,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Prenos (%s)" @@ -10432,39 +10606,35 @@ msgstr "Prenos (%s)" msgid "Transparent &color..." msgstr "&Boja za prozirnost..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Podešen desno" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Pokušajte sa 'Počisti'. Ukoliko to ne pomogne, potrebno je napraviti novo preuzimanje." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Pokušaj ponovo" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tip" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10478,34 +10648,34 @@ msgstr "URL:" #. Resource IDs: (5071) msgid "UTF-16 BE" -msgstr "" +msgstr "UTF-16 BE" #. Resource IDs: (5070) msgid "UTF-16 LE" -msgstr "" +msgstr "UTF-16 LE" #. Resource IDs: (5069) msgid "UTF-8" -msgstr "" +msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Ne mogu učitati podršku za sistem elektronske pošte." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Nesposoban da procesira komandu, server u radu." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Nisam u mogućnosti pročitati %1, neko drugi to drži otvorenim." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Ne mogu pročitati svojstvo u koje je dozvoljeno samo zapisivanje." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10513,91 +10683,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Ne mogu pisati po svojstvu za koje je dozvoljeno samo čitanje." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Nisam u mogućnosti zapisivati u %1, moguće je samo čitati ili to neko drugi drži otvorenim" -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Skloni oznaku" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Poništi" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Poništi %d Akcije" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Poništi 1 Akciju" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." -msgstr "" +msgstr "Poništi Dodaj..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Poništi poslednju modifikaciju\nPoništi" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Neočekivani format fajlovi." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Razviti" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Neformatiran tekst\ntekst bez bilo kakvog formatiranja" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Objedinjene &razlike glavnih (HEAD) revizija" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Nepoznata dubina" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" +msgstr "Nerešen sadžaj!" + +#. Resource IDs: (1558) +msgid "Unset tracked branch" msgstr "" -#. Resource IDs: (3841) +#. Resource IDs: (61443) msgid "Untitled" msgstr "Bez naslova" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Neverzionisan" @@ -10605,7 +10779,7 @@ msgstr "Neverzionisan" msgid "Unversioned files mark parent folder as modified" msgstr "Fajlovi izvan sistema verzija označavaju folder kao izmenjenu" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "" @@ -10618,23 +10792,23 @@ msgstr "" msgid "Update" msgstr "Obnavljanje" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Obnovljeno" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Uskladi AktiveX objekte" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10646,30 +10820,26 @@ msgstr "Koristi &uobičajenu sliku" msgid "Use &one-pane view as default for 2-file diff" msgstr "Koristi &jedan-panel pregled kao uobičajeni za pregled razlika 2 fajla" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Koristi &drugi blok teksta" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Koristi 'moj' tekst boks" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Koristi 'moj' tekst boks zatim 'njihov ' " -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Koristi 'njihov' tekst boks" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Koristi 'njihov' tekst boks zatim 'moj ' " -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Koristi blokove" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10690,15 +10860,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Koristi ujedinjenu razliku sa &klipborda" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10708,7 +10878,7 @@ msgstr "Koristi ceo sadržaj sa levog pregleda\nKoristi levi fajl" msgid "Use block from left before right" msgstr "Koristi blok iz levog pre nego iz desnog" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10718,25 +10888,25 @@ msgstr "Koristi blok sa levog pregleda pre bloka sa desnog pregleda\nKoristi blo msgid "Use block from right before left" msgstr "Koristi blok iz desnog pre levog" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Koristi blok sa desnog pregleda pre bloka sa levog pregleda\nKoristi blok sa desnog pre levog" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Koristi oba bloka teksta (prvo ovaj)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Koristi oba bloka teksta (ovaj na kraju)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Koristi levi blok" @@ -10752,77 +10922,77 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Koristite korpu za otpatke kada vraćate" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Koristi regularne izraze" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Koristi desni blok" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" -msgstr "" +msgstr "Koristi razmak" #. Resource IDs: (1426) msgid "Use system locale for date/time" msgstr "Koristi sistemske postavke datuma/vremena" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Koristi blok teksta iz '&moj'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Koristi blok teksta iz '&njihov'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Koristi blok teksta iz 'm&oj' pre 'njihov'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Koristi blok teksta iz 'moj' pre 'njihov'\nKoristi 'moj' blok tekst, pa onda 'njihov'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Koristi blok teksta iz 'moj'\nKoristi 'moj' tekst blok" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Koristi blok teksta iz 'nji&hov' pre 'moj'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Koristi blok teksta iz 'njihov' pre 'moj'\n'NJihov' tekst blok pre 'moj'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Koristi blok teksta iz 'njihov'\nKoristi 'njihov' tekst blok" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Koristi blok teksta iz levog pregleda\nKoristi levi blok" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Koristi o&vaj blok teksta" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10830,7 +11000,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10842,19 +11012,19 @@ msgstr "" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Koristi ovaj &celi fajl" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Koristi ovaj blok levo" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Koristi celi drugi &fajl" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10870,11 +11040,11 @@ msgstr "" msgid "User Name:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Korisnik je odustao" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10884,11 +11054,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Ime korisnika:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10905,9 +11075,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "" +msgstr "Valjane opcije komandne linije su:\n/base:\n/basename:\n/theirs:\n/theirsname:\n/mine:\n/minename:\n/merged:\n/mergedname:\n/diff:\n/patchpath:\n/saverequired\n/saverequiredonconflicts\n/oneway \n/line:" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Vrednost" @@ -10915,24 +11085,24 @@ msgstr "Vrednost" msgid "Version" msgstr "Verzija" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Verzija %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10940,11 +11110,11 @@ msgstr "" msgid "Version Information" msgstr "Informaciji o verziji" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Upravljano verzijama" @@ -10956,23 +11126,27 @@ msgstr "" msgid "View" msgstr "Pregled" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Pogledaj reviziju za putanju u &web pregledaču" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "" @@ -10984,11 +11158,11 @@ msgstr "" msgid "Visit our website" msgstr "Posetite naše web stranice" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Vižual studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Vižual studio 2008" @@ -10999,7 +11173,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "PAŽNJA:\r\nMenjajte ova podešavanja samo ako ste apsolutno sigurni šta radite!\r\nDa postavite vrednosti na njihove podrazumevane vrednosti, obrišite tekst vrednosti." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Čekaj" @@ -11007,7 +11181,7 @@ msgstr "Čekaj" msgid "Wait for the script to finish" msgstr "Čekaj da skript završi" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11015,15 +11189,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Upozorenje" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Upozorenje!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11031,7 +11205,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "" @@ -11039,56 +11213,56 @@ msgstr "" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Kad je omogućeno, stavke s verzijama u popisu dijaloga urezivanja se automatski biraju" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11098,15 +11272,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" -msgstr "" +msgstr "Beline su izmenjene (tabovi, razmaci)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Beline" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Pozicija prozora" @@ -11114,15 +11288,15 @@ msgstr "Pozicija prozora" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Vindous 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Vindous 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Vindous HP" @@ -11166,11 +11340,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11178,29 +11352,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Zavi dugačke linije" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Zavi dugačke linije na desnoj ivici pregleda\nZavi dugačke linije" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Da" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Da za sve" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Vi već imate instaliranu najsvježiju verziju." @@ -11210,51 +11380,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Ovde možete onemogućiti specifične rukovaoce prekrivačima.\nOnemogućeni rukovaoci nemogu koristiti slot prekrivača i dati šansu drugim proširenjima školjke da prikažu svoje prekrivače." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Možete nalepiti bitmapu samo veličine (%d x %d) !" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Možete kreirati više od %d alatnih panela koje je definisao korisnik!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Ne možete postaviti to svojstvo na imenicima nego samo na fajlovima!\nAko ga želite postaviti na svim fajlovima unutar foldera,\nmorate uključiti kvadratić 'rekurzivani'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" -msgstr "" +msgstr "Imate markirane izmenjene blokove. Kako će ovi blokovi biti sačuvani?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Izmenili ste svojstva ali ih još niste snimili.\nŽelite li to sada učiniti?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11262,67 +11432,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Izabrali ste %d stavki da prikažete dif za njih\nZa svaku od tih stavki nova jedinica dif pregledača će se pokrenuti.\nDa li zaista želite da prikažete dif za toliko mnogo stavki odjednom?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Niste uneli broj spornog pitanja!\nJeste li sigurni da želite urezati bez tog broja?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Možete definisati do %d alata." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Morate ponovo pokrenuti računar kako bi aktivirali izmene." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Odabrali ste fajl bez verzije.\nFajl će biti dodat u kontrolu verzija u toku urezivanja." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Treba da upišete tekst!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Treba da odabarete sliku!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11332,7 +11502,7 @@ msgstr "Poruke dnevnika koje ste ranije uneli su snimljene.\nKliknite ovde kako msgid "Your version is:" msgstr "Vaša verzija je:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Vaša verzija je : %d.%d.%d.%d" @@ -11342,10 +11512,10 @@ msgid "Zip File" msgstr "" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Uda&lji" +msgid "Zoo&m out\t-" +msgstr "Uda&lji\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zumiraj" @@ -11357,80 +11527,80 @@ msgstr "&Približi" msgid "Zoom &Out" msgstr "&Udalji" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zumiraj 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Povećaj\nPovećaj" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Oqumiraj\nOqumiraj" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Pri&bliži" +msgid "Zoom i&n\t+" +msgstr "Pri&bliži\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Približi" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Udalji" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Zumiraj da se uklopi" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Zumiraj da se uklopi po visini" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Zumiraj da se uklopi po širini" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Uobičajeno]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Neoznačen]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11444,7 +11614,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "dodato" @@ -11452,7 +11622,7 @@ msgstr "dodato" msgid "added files" msgstr "dodati fajlovi" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "fajl bez imena" @@ -11460,14 +11630,19 @@ msgstr "fajl bez imena" msgid "and support the developers" msgstr "i podržite TortoiseSVN programere" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "autor" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11500,30 +11675,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "urezivanja" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "u sukobu" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dan" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "obrisano" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11535,7 +11710,7 @@ msgstr "veštačko" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11544,16 +11719,16 @@ msgid "" "%s" msgstr "izvezeno\n%s\nu\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "spoljno" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "zanemareno" @@ -11561,23 +11736,23 @@ msgstr "zanemareno" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "nedovršeno" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "stavka sačuvana lokalno" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "čuvajte listu fajlova na engleskom" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11586,7 +11761,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11599,13 +11774,13 @@ msgstr "" #. Resource IDs: (1494) msgid "master" -msgstr "" +msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "spojen" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "nedostaje" @@ -11613,7 +11788,7 @@ msgstr "nedostaje" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "izmenjeno" @@ -11621,7 +11796,7 @@ msgstr "izmenjeno" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "mesec" @@ -11629,40 +11804,44 @@ msgstr "mesec" msgid "new branch" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "ne" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "opis ove naredbe nije dostupan" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "bez verzije" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normalno" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "preprečen" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "prema %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pikseli" @@ -11670,11 +11849,11 @@ msgstr "pikseli" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "tromesečje" @@ -11682,35 +11861,35 @@ msgstr "tromesečje" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "zamenjeno" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "traži putanju:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "prebačeno na\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "ka %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "ka %s" @@ -11719,35 +11898,35 @@ msgstr "ka %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "nedelja" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "godina" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "da" @@ -11757,4 +11936,4 @@ msgstr "{BagTrek}" #. Resource IDs: (65535) msgid "|" -msgstr "" +msgstr "|" diff --git a/Languages/Tortoise_sv.po b/Languages/Tortoise_sv.po index 0866dedab..092d98ada 100644 --- a/Languages/Tortoise_sv.po +++ b/Languages/Tortoise_sv.po @@ -4,24 +4,27 @@ # This file is distributed under the same license as TortoiseGit # # Translators: +# Fredrik Velin , 2014 # Johan Foglemark , 2011,2013 # Johan Jacobsson , 2014-2015 # LordDaimos , 2011 # Kim Svensson , 2011 # Kim Svensson , 2011 # LordDaimos , 2011 +# Magnus Österlund, 2013 # Pär , 2013 # Pär , 2013 # , 2011 # xt00r , 2012 -# Sven Strickroth , 2013 +# Stig Nordlander , 2013 +# Sven Strickroth , 2013,2015 # xt00r , 2012 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/tortoisegit/language/sv/)\n" "MIME-Version: 1.0\n" @@ -30,7 +33,7 @@ msgstr "" "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -52,138 +55,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "Antal användare som visas separat:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MiB överfört" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 innehåller ett oväntat objekt." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 innehåller en felaktiv sökväg. " -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 innehåller ett felaktigt schema." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "Felaktigt format: %1." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 kunde inte hittas." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! Dag sedan" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! Dagar sedan" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! Timme sedan" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! Timmar sedan" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! Minut sedan" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! Månad sedan" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! Månader sedan" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! Sekund sedan" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! Sekunder sedan" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! Vecka sendan" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! Veckor sedan" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! År sedan" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! År sedan" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! objekt valda" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! minuter sedan" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nVisar %2!d! filer, %3!d! sub-moduler och %4!d! mappar, %5!d! objekt totalt" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nStorlek %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nFortsätt att köra script?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -191,52 +194,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nHittar inte den här filen.\nKontrollera att sökvägen och filnamnet är korrekta. " -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig eller %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d bytes överförda" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d KiB överförda" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d arkiveringar före \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d filer ändrade" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d filer borttagna." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d filer återställda till %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d fil(er) markerade, %d fil(er) totalt" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d mest aktiva användarna med minst %d arkiveringar var (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -244,78 +247,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nklicka för att växla alpha\ndubbelklicka för att automatiskt växla alpha" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld minut(er) och %ld sekund(er)" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld av %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - i revision: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Återställd]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s i %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s kräver Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, i %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Arbetsträd" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Export (%d) av %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Export av %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nKunde inte patchas." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nVill du ta bort den i alla fall?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -331,6 +334,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-vägsförena" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "&Avbryt" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Om TortoiseGitBlame..." @@ -359,15 +366,15 @@ msgstr "&Lägg till Filter" msgid "&Add New/Save" msgstr "&Ny/Spara" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Lägg till" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Lägg till eller ta bort knappar" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Lägg till..." @@ -407,7 +414,7 @@ msgstr "&Tilldela" msgid "&Associate double-click event with:" msgstr "&Associera dubbelklick med:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Dölj automatiskt" @@ -423,15 +430,15 @@ msgstr "&Auto-laddning av Putty-nyckel" msgid "&Backup original file" msgstr "Skapa &backup på originalfilen" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Annotera" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Annotera ändringar" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Annotera revisioner" @@ -455,7 +462,7 @@ msgstr "&Gren:" msgid "&Browse Dir" msgstr "&Bläddra i Mapp" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Utforska arkivet" @@ -491,7 +498,7 @@ msgstr "&Kategori:" msgid "&Choose commands from:" msgstr "&Välj kommandon från:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Städa..." @@ -515,7 +522,7 @@ msgstr "&Stäng fönster" msgid "&Command:" msgstr "&Kommando:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Arkivera" @@ -523,23 +530,27 @@ msgstr "&Arkivera" msgid "&Commit submodule..." msgstr "&Arkivera sub-modul..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Arkivera..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Jämför revisioner" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Komprimerat diagram" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "&Fortsätt" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "K&opiera" @@ -559,11 +570,11 @@ msgstr "&Egen" msgid "&Default" msgstr "&Standard" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Ta bort" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Ta bort (behåll lokalt)" @@ -571,7 +582,7 @@ msgstr "&Ta bort (behåll lokalt)" msgid "&Delete Filter" msgstr "&Ta bort Filter" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Ta bort fjärr && lokal" @@ -583,11 +594,11 @@ msgstr "&Upptäck flyttade eller kopierade rader" msgid "&Detect moved or copied lines:" msgstr "&Upptäck flyttade/kopierade rader:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Jämför" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Jämför med föregående revision" @@ -599,7 +610,7 @@ msgstr "&Mapp:" msgid "&Disabled" msgstr "&Inaktiv" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Kasta" @@ -607,7 +618,7 @@ msgstr "&Kasta" msgid "&Do the same for the rest" msgstr "&Upprepa för resten" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Dockning" @@ -615,11 +626,15 @@ msgstr "&Dockning" msgid "&Don't ask me again" msgstr "&Fråga mig inte igen" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "&Visa inte detta meddelande igen" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Ner" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "Ladda &ner" @@ -627,11 +642,11 @@ msgstr "Ladda &ner" msgid "&Edit" msgstr "&Redigera" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Redigera .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Redigera ALLA" @@ -639,7 +654,7 @@ msgstr "&Redigera ALLA" msgid "&Edit Filter" msgstr "&Redigera Filter" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Editera konflikt" @@ -664,10 +679,10 @@ msgid "&Enable edit" msgstr "&Tillåt redigering" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "&Avsluta" +msgid "&Exit\tCtrl+W" +msgstr "&Avsluta\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Exportera markering till..." @@ -679,27 +694,27 @@ msgstr "&Egen" msgid "&File" msgstr "&Fil" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Sök" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Sök\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Passa bilder i fönster" +msgid "&Fit images in window\tF" +msgstr "Passa bilder i &fönster\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Fasta enheter" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Flytande" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Följ namnändringar" @@ -711,7 +726,7 @@ msgstr "&Font för loggmeddelanden:" msgid "&Font:" msgstr "&Font:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Tvinga" @@ -731,7 +746,7 @@ msgstr "&Git-stil Arkivering (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Gå till\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "&Gråmarkera orelaterade ändrade sökvägar" @@ -743,7 +758,7 @@ msgstr "&Grön:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Hjälp" @@ -751,7 +766,7 @@ msgstr "&Hjälp" msgid "&Help Topics" msgstr "&Hjälpavsnitt" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Dölj" @@ -759,11 +774,11 @@ msgstr "&Dölj" msgid "&Icon Set:" msgstr "&Ikonuppsättning:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ignorera" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ignorera %d objekt efter namn" @@ -777,14 +792,14 @@ msgid "&Image" msgstr "&Bild" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Bildinformation" +msgid "&Image info\tI" +msgstr "Bild&information\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Endast bild" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Importera..." @@ -796,7 +811,7 @@ msgstr "&Initial mapp" msgid "&Initialize submodules (--init)" msgstr "&Initiera sub-moduler (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Installera" @@ -808,11 +823,11 @@ msgstr "&Gå till första skillnaden när programmet startas" msgid "&Keep CR" msgstr "&Behåll CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Behåll nuvarande läge" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "Visa Märkes- o Gren-etiketter" @@ -840,7 +855,7 @@ msgstr "&Måste minst vara:" msgid "&Line number" msgstr "&Rad" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Rad (%d - %d)" @@ -857,7 +872,7 @@ msgstr "&Listvy" msgid "&Local Branch:" msgstr "&Lokal gren:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Lokala grenar" @@ -881,11 +896,11 @@ msgstr "&Menyanimationer:" msgid "&Menu contents:" msgstr "&Menyinnehåll:" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Förena" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Förena..." @@ -941,6 +956,10 @@ msgstr "&Nästa >" msgid "&Next Page" msgstr "&Nästa sida" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "&Nej" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Inga dubbelklick händelser" @@ -957,11 +976,11 @@ msgstr "&Ingen" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&En sida" @@ -969,19 +988,15 @@ msgstr "&En sida" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Öppna" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&Öppna 'Git för Windows'-hemsidan" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Öppna..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Öppna...\tCtrl+O" @@ -994,18 +1009,18 @@ msgid "&Overlay Icon:" msgstr "&Statusikon:" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Överlappa bilderna" +msgid "&Overlay images\tO" +msgstr "&Överlappa bilderna\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Lösenord:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "K&listra in" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Välj ALLA" @@ -1013,7 +1028,7 @@ msgstr "&Välj ALLA" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Förhandsgranskning" @@ -1021,11 +1036,15 @@ msgstr "&Förhandsgranskning" msgid "&Print..." msgstr "&Skriv ut..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Skriv ut...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "&Fortsätt" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Pull" @@ -1033,10 +1052,14 @@ msgstr "&Pull" msgid "&Push all branches" msgstr "&Pusha alla Grenar" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&Omarkivera" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Senaste meddelanden" @@ -1049,7 +1072,7 @@ msgstr "&Rekursiv" msgid "&Red:" msgstr "&Röd:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "G&ör om" @@ -1065,7 +1088,7 @@ msgstr "&Uppdatera" msgid "&Regular Expression" msgstr "&Reguljärt uttryck" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Påminn mig senare" @@ -1073,7 +1096,7 @@ msgstr "&Påminn mig senare" msgid "&Remote Branch:" msgstr "&Fjärrgren" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "Fjä&rrgrenar" @@ -1081,7 +1104,7 @@ msgstr "Fjä&rrgrenar" msgid "&Remote:" msgstr "Fjä&rr:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Ta bort" @@ -1093,7 +1116,7 @@ msgstr "&Ta bort filen från indexet" msgid "&Replace" msgstr "&Ersätt" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Arkivutforskaren" @@ -1101,7 +1124,7 @@ msgstr "&Arkivutforskaren" msgid "&Reset" msgstr "Åte&rställ" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "Åte&rställ verktygsrad" @@ -1117,23 +1140,27 @@ msgstr "&Nollställ användningsdata" msgid "&Reset to Default" msgstr "Åte&rställ default" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Löst" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "Åte&rställ" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "Åte&rställ till gamla läget" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "Åte&rta ändring gjord i denna arkivering" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "Åte&rta ändringar gjorda i dessa arkiveringar" @@ -1145,7 +1172,7 @@ msgstr "&SSH klient:" msgid "&Saturation:" msgstr "&Färgmättnad:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Spara" @@ -1153,15 +1180,19 @@ msgstr "&Spara" msgid "&Save authentication" msgstr "&Spara autentisering" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Spara diagram som..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Spara listan av valda filer som..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Spara\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Sätt Git-sökväg" @@ -1169,7 +1200,7 @@ msgstr "&Sätt Git-sökväg" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Inställningar" @@ -1189,7 +1220,7 @@ msgstr "&Visa textetiketter" msgid "&Signing key ID:" msgstr "&Signeringsnyckel-ID:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Hoppa över" @@ -1197,7 +1228,7 @@ msgstr "&Hoppa över" msgid "&Squash" msgstr "&Squasha" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Squasha ALLA" @@ -1209,7 +1240,7 @@ msgstr "&Starta" msgid "&Start Group" msgstr "&Start grupp" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Stasha" @@ -1229,7 +1260,7 @@ msgstr "&Symbol vy" msgid "&Tab size:" msgstr "&Tabbstorlek:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Tabbat dokument" @@ -1237,7 +1268,7 @@ msgstr "&Tabbat dokument" msgid "&Tag" msgstr "&Märke" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Märken" @@ -1273,7 +1304,7 @@ msgstr "&Verktygsrad och Dockning" msgid "&Toolbars:" msgstr "&Verktygsrader:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1285,7 +1316,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Två sidor" @@ -1293,15 +1328,15 @@ msgstr "&Två sidor" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Ångra" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "\"&Unified Diff\"" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "\"&Unified Diff\" med" @@ -1313,7 +1348,7 @@ msgstr "&Okända enheter" msgid "&Up" msgstr "&Upp" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Uppdatera objekt till revision" @@ -1325,11 +1360,11 @@ msgstr "&Uppström:" msgid "&Use auto-completion of file paths and keywords" msgstr "&Använd automatisk ifyllning av filsökvägar och nyckelord" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "Användar&namn: " -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Visa" @@ -1337,7 +1372,7 @@ msgstr "&Visa" msgid "&View:" msgstr "&Vy:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Varna om \"Signed-Off-By\" saknas" @@ -1353,6 +1388,10 @@ msgstr "&Helt ord" msgid "&Within file" msgstr "&Inom fil" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "&Ja" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Ignorera ändrat tomrum" @@ -1361,46 +1400,46 @@ msgstr "&Ignorera ändrat tomrum" msgid "&known changes" msgstr "&kända ändringar" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit standard)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(från %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(ingen ändringslista)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(inget radnummer)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(inget värde)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(inte hittad)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(okänd)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- alla -" @@ -1408,13 +1447,14 @@ msgstr "- alla -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1422,7 +1462,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr ".git/config i roten på arkivet" @@ -1438,7 +1478,7 @@ msgstr ".gitignore i mappen som innehåller objekten" msgid ".gitignore in the repository root" msgstr ".gitignore i roten på arkivet" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr ".tgitconfig i roten på arkivet" @@ -1454,31 +1494,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1487,66 +1527,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit är en skalprogramsutbyggnad.\nDet betyder att det är integrerat i Windows utforskaren.\nFör att använda TortoiseGit, öppna utforskaren och högerklicka på en valfri mapp.\nDetta öppnar en meny där alla TortoiseGit-kommandon finns tillgängliga.\nOch läs manualen!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "Varning: Det är inte kontrollerat att dessa grenar har blivit fullt förenade med HEAD." -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "Varning: Detta kommer att ta bort fjärrgrenar." -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "Varning: Denna gren är inte helt förenad med HEAD." -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "Nuvarande HEAD är avskuret, du jobbar nu i (ingen gren).\nVill du skapa en gren nu?" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "Vill du verkligen ta bort ALL stash?" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Stash hämtning (Apply) misslyckades!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Stash hämtning (POP) misslyckades!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Stash misslyckades!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "föregående rebase mapp rebase-apply finns fortfarande men mbox är angiven\n\nVill du" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Stash hämtning (Apply) misslyckades, det finns konflikter" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Stash hämtning (POP) misslyckades, det finns konflikter" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Stash hämtning (Apply) lyckades" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Stash hämtning (POP) lyckades" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Stash lyckades" @@ -1554,7 +1594,7 @@ msgstr "Stash lyckades" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1566,71 +1606,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "En gren med samma namn som ditt angivna märkesnamn finns redan (så dess kortref skulle inte bli unik).\nDetta kan komma att ställa till problem så du bör undvika det." -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "En gren med det namnet finns redan." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "En förening är pågående så denna arkivering kommer bli en föreningsarkivering. För att avbryta föreningen måste du utföra en återställning eller tvingad utcheckning." -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "En nyare version finns tillgänglig. Vänligen ladda ner den senaste versionen!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "En lista med sökvägar (en per rad), för vilka statusikoner ska visas.\nOm du avslutar en sökväg med en asterisk (\"*\"), inkluderas även alla filer och undermappar." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "En lista med sökvägar (en per rad), för vilka inga statusikoner ska visas.\r\nOm du avslutar en sökväg med en asterisk ('*'), exkluderas även alla filer och undermappar.\r\nEn tom lista tillåter visning av statussymboler för alla sökvägar." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "En lista med sökvägar (en per rad), för vilka inga statusikoner ska visas.\r\nOm du avslutar en sökväg med en asterisk (\"*\"), exkluderas även alla filer och undermappar.\r\nEn tom lista tillåter visning av statussymboler för alla sökvägar." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "En resurs som krävs är inte tillgänglig." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "Ett märke med samma namn som ditt angivna grennamn finns redan (så dess kortref skulle inte bli unik).\nDetta kan komma att ställa till problem så du bör undvika det." -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Ett märke med det namnet finns redan." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "En applikation för att visa GNU skillnadsfiler (patchfiler).\r\nAnvänd tex Notepad om du inte har någon." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "Av&bryt" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "&Om" @@ -1646,11 +1686,11 @@ msgstr "Förkorta namnändringar" msgid "Abbreviated size" msgstr "Förkortad storlek" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Avbryt" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Avbryt &Förening" @@ -1658,11 +1698,11 @@ msgstr "Avbryt &Förening" msgid "Abort Merge" msgstr "Avbryt Förening" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "Avbryter en pågående förening." -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Om" @@ -1682,12 +1722,12 @@ msgstr "Om TortoiseGitMerge" msgid "Accept certificate" msgstr "Acceptera certifikat" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Åtkomst till %1 nekades." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Åtgärd" @@ -1695,26 +1735,26 @@ msgstr "Åtgärd" msgid "Action log" msgstr "Händelselogg" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Åtgärder" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Aktivera uppgiftslistan" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Aktiva filer" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX objekt kan inte sparas när Windows avslutas!\nKasta bort alla ändringar av %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Lägg till" @@ -1722,7 +1762,7 @@ msgstr "Lägg till" msgid "Add &Signed-off-by" msgstr "Lägg till \"&Signed-Off-By\"" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Lägg till '%s' till ordlistan" @@ -1735,15 +1775,15 @@ msgstr "Lägg till Fjärrarkiv" msgid "Add \"&Signed-off-by\"" msgstr "Lägg till \"&Signed-Off-By\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Lägg till filändelsespecifikt program för att visa skillnader" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Lägg till föreningsprogram för filändelse" @@ -1751,15 +1791,15 @@ msgstr "Lägg till föreningsprogram för filändelse" msgid "Add new files automatically to Git" msgstr "Lägg till nya filer automatiskt till Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Lägg till i &ignoreringslistan" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Lägg till snabbåtkomstfältet" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Lägg till..." @@ -1767,11 +1807,11 @@ msgstr "Lägg till..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Lägg till/ändra filändelsebaserat skillnads-/föreningsprogram" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Tillagd" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1779,25 +1819,25 @@ msgid "" "to the ignore list." msgstr "Lagt till filmönstren\n%s\ni ignoreringslistan." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Lägger till" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Lägger till fil(er) till Git versionskontroll" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Lägger till vald(a) fil(er) eller filmönster i ignoreringslistan" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ändra inställningar\nInställningar" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Avancerat" @@ -1805,43 +1845,43 @@ msgstr "Avancerat" msgid "Advanced Diff/Merge Settings" msgstr "Avancerade skillnads-/föreningsinställningar" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Avancerade skillnadsinställningar" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Avancerade föreningsinställningar" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Alla" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Alla kommandon" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Alla filer (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Alla filer (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Alla föräldrar" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "Alla lokala Grenar" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "Alla refs" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "Alla märken" @@ -1849,47 +1889,47 @@ msgstr "Alla märken" msgid "All tags only" msgstr "Enbart alla märken" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Alla dina ändringar kommer att försvinna! Vill du verkligen återställa alla fält och menyer?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Alla dina ändringar kommer att försvinna! Vill du verkligen återställa alla snabbknappar?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Alla dina ändringar kommer att försvinna! Vill du verkligen återställa menyn '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Alla dina ändringar kommer att försvinna! Vill du verkligen återställa fältet '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "Tillåt Redigering för denna vy\nTillåt Redigering" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "Tillåt användande av egen Gravatar URL" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "Tillåter skapande av en tom arkivering som bara har ett arkiveringsmeddelande utan några filer (git commit --allow-empty)." -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Redan uppdaterad." @@ -1905,11 +1945,11 @@ msgstr "Pusha alltid till den valda fjärrgrenen för denna lokala gren" msgid "Always show long format" msgstr "Visa alltid i långt format" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Använd alltid datorns inställning för visning av datum och tid" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "Rätta till" @@ -1917,12 +1957,12 @@ msgstr "Rätta till" msgid "Amend &Last Commit" msgstr "Rätta till (Amend) senaste arkiveringen" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "En alternativ editor. Den ska helst kunna hantera *nix-radslut." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1933,7 +1973,7 @@ msgid "" "%mine: the modified file" msgstr "Använd ett eget jämförelseprogram\nför att jämföra olika revisioner på filer\n\nDu kan använda följande parametrar till programmet:\n%base: basfilen\n%mine: den ändrade filen" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1946,34 +1986,34 @@ msgid "" "%base: the original file without your changes" msgstr "Ett eget sammanfogningsprogram\natt använda för att lösa konfilkter i filer.\n\nDu kan ange följande parametrar till programmet:\n%merged: filen med konflikter, var resultatet sparas\n%theirs: filen som den ser ut i arkivet\n%mine: din egen fil med dina ändringar\n%base: orginalfilen utan dina ändringar" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Felaktigt filhandtag associerades med %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Ett okänt fel har inträffat." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Ett okänt fel inträffade vid åtkomst av %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Okänd radtyp hittades på rad %d!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "Annoterade märken" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "Lägg till högra blocket i slutet" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "Lägg till detta block till vänster i slutet" @@ -1985,11 +2025,11 @@ msgstr "Program menyer:" msgid "Apply &Patch..." msgstr "Applicera &Patch..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Applicera en Patch-serie..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Applicera Patch..." @@ -1997,7 +2037,7 @@ msgstr "Applicera Patch..." msgid "Apply Patches" msgstr "Applicera Patchar" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Applicera en serie av patchar från en mailbox" @@ -2005,7 +2045,7 @@ msgstr "Applicera en serie av patchar från en mailbox" msgid "Apply unified diff" msgstr "Applicera patch (\"Unified Diff\")" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Vatten tema" @@ -2013,39 +2053,39 @@ msgstr "Vatten tema" msgid "Arabic" msgstr "Arabisk" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "Är du säker du vill återställa kolumnerna?" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "Är du säker på att du vill avbryta Ombaseringen (Rebase)?" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Är du säker på att du vill markera konflikterna i filen/filerna som lösta?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Vill du verkligen återställa %d objekt? Du kommer att förlora alla ändringar sen förra uppdateringen!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "Vill du verkligen spara som \"%s\"?" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Arrangera &vertikalt" +msgid "Arrange &vertical\tV" +msgstr "Arrangera &vertikalt\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Lades till i ändringslistan \"%s\"" @@ -2054,11 +2094,11 @@ msgstr "Lades till i ändringslistan \"%s\"" msgid "Assigned to:" msgstr "Tilldelad:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Anta objektet oförändrat" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Anta giltig/oförändrad" @@ -2070,34 +2110,34 @@ msgstr "Anta giltig/oförändrad (\"Needs-lock\" i TortoiseSVN)" msgid "At file &creation" msgstr "Vid filens &skapande" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "Vid filens skapande" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "I revision: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "För tillfället kan du bara byta namn på grenar." -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Försökte utföra en otillåten åtgärd." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Försöke läsa förbi slutet av %1." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Försökte läsa från skrivningen till %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Försökte skriva till läsningen från %1." @@ -2114,11 +2154,11 @@ msgstr "Autentisering" msgid "Authentication data" msgstr "Autentiseringsdata" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Användarnamn" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "Användarens email" @@ -2126,7 +2166,7 @@ msgstr "Användarens email" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Upphovsman:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Användarnamn" @@ -2148,11 +2188,11 @@ msgstr "Automatisk CrLf konvertering" msgid "Auto Crlf:" msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Göm automatiskt" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Göm allt automatiskt" @@ -2160,23 +2200,23 @@ msgstr "Göm allt automatiskt" msgid "Auto&Crlf" msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Automatiskt om inga konflikter" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Automatiskt om inga fel uppstod" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "Stäng automatiskt om inga fler val är möjliga" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Automatiskt om inga föreningar, tillläggningar eller borttagningar" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2190,7 +2230,7 @@ msgstr "Auto-laddning av Putty-&nyckel" msgid "Autoload Putty &Key" msgstr "Auto-laddning av Putty-nyckel" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Automatisk" @@ -2210,7 +2250,7 @@ msgstr "Medel" msgid "B&rowse..." msgstr "B&läddra..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Tillbaka" @@ -2222,7 +2262,7 @@ msgstr "Bakgrund" msgid "Baltic" msgstr "Baltisk" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Stapeldiagram" @@ -2242,7 +2282,7 @@ msgstr "Basfil:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "Baserad på TortoiseIDiff från TortoiseSVN" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Grundläggande info" @@ -2254,45 +2294,45 @@ msgstr "Mellan filer:" msgid "Big5 (Traditional)" msgstr "Big5 (Traditionell)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Bisect dålig" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Bisect bra" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Bisect börja om" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Starta Bisect..." -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bitmap\nEn bitmap" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Svart tema" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Annotera" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "Annoteringsfel" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Annotera föregående revision" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Visar ändringar per rad i en fil, med revision och av vem" @@ -2300,26 +2340,30 @@ msgstr "Visar ändringar per rad i en fil, med revision och av vem" msgid "Blend alpha" msgstr "Blend alpha" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Blått tema" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "Ämne" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Både /logmsg och /logmsgfile angavs!\nEndast en av dem kan användas åt gången." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Både sökvägen till patch-filen och målsökvägen måste vara absoluta sökvägar!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "Nedre vy:" @@ -2331,30 +2375,30 @@ msgstr "Bl&äddra..." msgid "Branc&h:" msgstr "Gren:" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Gren" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Grenen %s är bakom %s\n%s kan snabbspolas (fastforward) till %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "Gren (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "Grennamn" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Namn på gren/märke är ogiltigt" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Namnet på gren/märke får inte vara tomt eller ogiltilgt." @@ -2366,11 +2410,11 @@ msgstr "Gren:" msgid "Bro&wse" msgstr "&Bläddra" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "Bläddra referenser" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Välj applikation för skillnadshantering" @@ -2382,7 +2426,7 @@ msgstr "Bläddra referenser" msgid "Browse..." msgstr "Bläddra..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bugg-ID" @@ -2394,7 +2438,7 @@ msgstr "Bug-ID e&xpression:" msgid "Bug-ID/Issue-Nr:" msgstr "Bugg-ID/Ärende-nr:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bugg-IDn" @@ -2410,7 +2454,7 @@ msgstr "Bugtraq Regex Testare - TortoiseGit" msgid "Button Appearance" msgstr "Knapputseende" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2426,7 +2470,7 @@ msgstr "&Kontrollera nu" msgid "C&ommands:" msgstr "K&ommandon:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "&Skapa gren/märke från revision" @@ -2434,11 +2478,11 @@ msgstr "&Skapa gren/märke från revision" msgid "C&urrent Keys:" msgstr "N&uvarande knappar:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Klipp ut" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2454,11 +2498,11 @@ msgstr "Beräkna" msgid "Can double-click in log list to compare with previous revision" msgstr "Kan dubbelklicka i logglistan för att jämföra med föregående revision" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Det gick inte att aktivera ett statiskt ActiveX objekt." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2467,80 +2511,80 @@ msgid "" "%s" msgstr "Kan inte kopiera \n%s\ntill\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Kunde inte koipera bitmap bilden till urklipp!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Kan inte skapa en ny bild!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Kan inte anpassa menyerna!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Kan inte klistra in en bitmap bild från urklipp!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Avbryt" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "Avbryt\nAvsluta inte TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Avbryt\nVäxla inte vyerna" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Avbryt\nBehåll den tomma filen." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Avbryt\nLös konflikten först." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "Avbryt\nBehåll nuvarande filer" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "Avbryt\nBehåll nuvarande inställningar" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "Kan inte sammanfoga arkiveringar nu:\nKontrollera att du visar loggen från din nuvarande gren och att inga filter används." -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "Kan inte tvinga uppdatering av nuvarande gren. Använd \"Återställ\" om du ändå vill göra detta." -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "Kan inte annotera. \"%s\" är inte versionskontrollerad av Git." -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Kan inte visa skillnader eftersom nyradstecknen är inkonsistenta i filen" @@ -2552,7 +2596,7 @@ msgstr "&Fäll ner" msgid "Cascaded context menu" msgstr "Snabbmeny" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Skiftlägeskänsligt" @@ -2576,33 +2620,33 @@ msgstr "Certifikatsvalideringen misslyckades!" msgid "Change log" msgstr "Ändringslogg" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "Ändra skrivare och skrivarinställningar\nSkrivarinställningar" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "Ändra skrivarinställningarna\nSkrivarinställningar" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Ändra temat som används i programmet\nÄndra tema" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Ändra position på fönstret" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Ändra storlek på fönstret" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "Ändra typ" @@ -2610,38 +2654,38 @@ msgstr "Ändra typ" msgid "Changed Files" msgstr "Ändrade filer" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "Ändrade filer mellan %s och %s" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Ändrade filer mellan %s, %s och %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Ändrade filer: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "Ändrade rader inklusive nya/borttagna filer" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "Ändrade rader inklusive tillagda/borttagna filer ordnat efter datum" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "Ändrade rader exklusive tillagda/borttagna filer" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "Ändrade rader exklusive tillagda/borttagna filer ordnade efter datum" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Flyttade ändringslistan %s" @@ -2650,7 +2694,7 @@ msgstr "Flyttade ändringslistan %s" msgid "Changes made (double-click on file for diff):" msgstr "Gjorda ändringar (dubbelklicka på en fil för se ändringarna):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Ändra temat i programmet" @@ -2658,7 +2702,7 @@ msgstr "Ändra temat i programmet" msgid "Char position where to show a border line in commit text boxes:" msgstr "Teckenposition där en linje visas i meddelandefältet:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Markera" @@ -2670,31 +2714,31 @@ msgstr "Leta efter uppdateringar - TortoiseGit" msgid "Check For Updates..." msgstr "Leta efter uppdateringar..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Le&ta efter ändringar" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Kontrollera sökvägen och/eller URL:en som du angivit." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Markera de menyobjekt som du vill ska finnas tillgängliga i huvudmenyn istället för TortoiseGit-menyn" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Välj det menyinnehåll som du bara vill ska visas i den utökade kontext-menyn (SHIFT + vänsterklick)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Kryssa i för att visa relativa tider i loggmeddelanden" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Kryssa i för att använda ett mindre utförligt format för datum och tid i loggmeddelanden" @@ -2702,31 +2746,31 @@ msgstr "Kryssa i för att använda ett mindre utförligt format för datum och t msgid "Check:" msgstr "Markera:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Hämta" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "Checka ut med förening" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "Cherry Pick" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "Cherry Pick misslyckades" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "Cherry Pick markerade arkiveringar..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "Cherry Pick denna arkivering..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "Cherry-pick misslyckades! Hoppa över denna arkivering?" @@ -2734,11 +2778,11 @@ msgstr "Cherry-pick misslyckades! Hoppa över denna arkivering?" msgid "Chinese" msgstr "Kinesiska" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Välj Arkiv" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "Omvänd kronologisk (git standard)" @@ -2750,78 +2794,78 @@ msgstr "Rensa" msgid "Clean Type" msgstr "Typ av rensning" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "Rensa permanent" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "Rensa till papperskorgen" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "Rensa bort förlegade fjärrgrenar" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Rensar" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Rensar. " -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Upprensning misslyckades för följande sökvägar:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Upprensning lyckades för följande sökvägar:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Rensa" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Rensa verktyg\nRensa" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "Rensar %ld URLer sparade för %ld arbetsträd" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "Rensar %ld loggmeddelanden sparade för %ld arbetsträd" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Rensar %ld användarnamn/lösenords par, %ld ssl certifikat och %ld användarnamn" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Rensar cachade loggmeddelanden för %ld arkiv" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Raderar lagrad behörighetsinformation.\r\nDu kommer att behöva ange användarnamn/lösenord för alla arkiv igen." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Rensar sparade storlekar och positioner för %ld dialoger" @@ -2830,7 +2874,7 @@ msgstr "Rensar sparade storlekar och positioner för %ld dialoger" msgid "Click here to go to the website" msgstr "Klicka här för att gå till webbsidan" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Klicka här för att välja ett gammalt loggmeddelande" @@ -2846,17 +2890,17 @@ msgid "" "extension" msgstr "Klicka på \"Avancerat...\" för att ange olika föreningsprogram baserat på filändelse" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Klicka för att se kommandon för att flytta textblock\nAnvänd textblock" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Urklipp" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "Klona" @@ -2864,7 +2908,7 @@ msgstr "Klona" msgid "Clone Existing Repository" msgstr "Klona existerande arkiv" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Klona ett arkiv" @@ -2872,49 +2916,49 @@ msgstr "Klona ett arkiv" msgid "Clone into Bare Repo" msgstr "Klona till ett bart arkiv" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Klona..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Stäng" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Avsluta fullskärmsläge" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Stäng förhandsgranskning\n&Stäng" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Stäng manuellt" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "Stäng förhandsgranskning\nAvbryt förhandsgranskning" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "Stäng det aktiva dokumentet" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Stäng aktivt fönster och fråga om spara dokument" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Fäll ihop" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2940,7 +2984,7 @@ msgstr "Färger:" msgid "Combine One Mail" msgstr "Sammanfoga till ett mail" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "Sammanfoga till en arkivering" @@ -2948,11 +2992,11 @@ msgstr "Sammanfoga till en arkivering" msgid "Comman&ds:" msgstr "Komman&don:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Kommando" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Kommandorad" @@ -2960,7 +3004,7 @@ msgstr "Kommandorad" msgid "Command Line To Execute:" msgstr "Kommandoraden som skall exekveras:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Kommandot misslyckades." @@ -2968,41 +3012,41 @@ msgstr "Kommandot misslyckades." msgid "Commands" msgstr "Kommandon" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Arkivering" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "Arkiveringen %s är INTE synlig just nu." -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "Arkivering %s hittades inte i \"%s\". Uppdatera sub-moduler nu?" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Arkiveringsdatum" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Arkiverings-email" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Arkiveringsslut" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Arkiveringsinfo" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "Arkiveringsmeddelande" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Arkiveringsnamn" @@ -3010,7 +3054,7 @@ msgstr "Arkiveringsnamn" msgid "Commit Ordering:" msgstr "Arkiveringsordning:" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "Arkivera super-projekt" @@ -3018,19 +3062,19 @@ msgstr "Arkivera super-projekt" msgid "Commit to:" msgstr "Arkivera i:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Arkivera..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Arkiveringar per användarnamn" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Arkiveringar per datum" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Arkiveringar varje %s" @@ -3039,15 +3083,15 @@ msgstr "Arkiveringar varje %s" msgid "Commits each week:" msgstr "Arkiveringar varje vecka:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Sparar dina ändringar i arkivet" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "Arkiverarens email" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3059,52 +3103,52 @@ msgstr "Om en mapp som inte är versionshanterad arkiveras så läggs dess barn msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Jämför &HEAD revisioner" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "Jämför valda refs" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Jämför två filer" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Jämför tomrum" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "Jämför med &arbetsträdet" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Jämför med &basrevision" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Jämför med föregående revision" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Visa tomrumsskillnader vid jämförelse\nJämför tomrum" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Jämför filen med den senaste arkiverade revisionen och visar de ändringar du gjort" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Jämför %s med %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Klar" @@ -3120,7 +3164,7 @@ msgstr "Konfigurationskälla" msgid "Config type:" msgstr "Konfigurationstyp:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "Konfigurera filteruttryck (Regexp)" @@ -3154,11 +3198,11 @@ msgstr "Konfigurera program för att visa GNU diff-filer (Patch-filer)" msgid "Confirm to kill running git process" msgstr "Bekräfta att du vill stänga ner körande Git-process" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Konflikt" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Konfliktande filer" @@ -3166,15 +3210,15 @@ msgstr "Konfliktande filer" msgid "Conflict resolved" msgstr "Konflikt löst" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "I konflikt" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Konflikter" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Konflikter: %d" @@ -3187,98 +3231,98 @@ msgstr "Snabbmenyer:" msgid "Context lines for patches" msgstr "Omgivande rader för patchar" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Fortsätt" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Förminska det dockade fönstret" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "Konvertera mellanslag till tabbar" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "Konvertera tabbar till mellanslag" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "K&opiera" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Kopierad" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopiera" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Kopiera %s till %s, Revision %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "Kopiera SHA-1 till urklipp" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Kopieringsverktyg\nKopiera" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Kopiera all information till urklipp" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopiera och byt namn" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Kopiera loggmeddelande till urklipp" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "Kopiera logg till urklipp" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Kopiera sökvägar till urklipp" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "Kopiera ref-namn" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Kopiera till urkli&pp" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Kopiera markeringen till urklipp\nKopiera" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Kopiera till urklipp" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopiera: Nytt namn för %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Kopierar %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopierar..." @@ -3286,25 +3330,25 @@ msgstr "Kopierar..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Korrigeringar" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Kunde inte lägga till %s i ignoreringslistan!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Kunde inte leta efter nyare version!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "Kunde inte leta efter nyare version! %s (Fel kod: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3312,76 +3356,76 @@ msgid "" "%s" msgstr "Kunde inte kopiera filerna!\n \n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Kunde inte skapa %1 eftersom mappen är full. " -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Det gick inte att ta reda på den senaste arkiverade revisionen!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "Kunde inte hitta super-projektet" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Kunde inte hämta status!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Kunde inte öppna %1 eftersom för många filer är öppna." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Kunde inte öppna filen %s!" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Kunde inte flytta %1 eftersom det är den aktiva mappen." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Kunde inte ta bort %s från ignoreringslistan" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "Kunde inte återställa till första arkiveringen (första steget). Avbryter..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "Kunde inte återställa till sista arkiveringen (andra steget). Avbryter..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "Kunde inte återställa till urspringligt HEAD" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Kunde inte hämta URL för filen!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Kunde inte hämta revision %s av filen %s.\nPatchning kan inte genomföras!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "Kunde inte starta TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3389,7 +3433,7 @@ msgid "" "%s" msgstr "Kunde inte starta visare för skillnader!\n \n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3397,7 +3441,7 @@ msgid "" "%s" msgstr "Kunde inte starta extern applikation för skillnader!\n \n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3405,11 +3449,11 @@ msgid "" "%s" msgstr "Kunde inte starta extern applikation för konfliktlösning!\n \n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Kunde inte starta utskrift." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3417,11 +3461,11 @@ msgid "" "%s" msgstr "Kunde inte starta textvisare!\n \n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "Kunde inte starta Putty Agent (pageant)." -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Kunde inte starta tråd!" @@ -3429,7 +3473,7 @@ msgstr "Kunde inte starta tråd!" msgid "Coun&t" msgstr "An&tal" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "An&tal: %u träffar." @@ -3442,15 +3486,15 @@ msgstr "Skapa Bib&liotek" msgid "Create .gitignore file" msgstr "Skapa .gitignore-fil" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "Skapa Gren" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Skapa Gren vid denna revision..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Skapa Gren..." @@ -3462,29 +3506,29 @@ msgstr "Skapa ändringslista" msgid "Create New Branch" msgstr "Skapa ny Gren" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Skapa en Patch-serie..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "Skapa Märke" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Skapa Märke vid denna revision..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Skapa Märke..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Skapa ett nytt dokument\nNy" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3493,49 +3537,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "Skapa en grund klon som har historiken trunkerad efter ett visst antal revisioner. Ett grunt arkiv har ett antal begränsningar (du kan inte klona eller hämta från det, inte heller pusha till eller från det), men är fullt användbart om du bara är intresserad av den senaste historiken för ett stort projekt med lång historik och du bara vill kunna skicka in rättningar som patchar." -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Skapa patch-fil" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "Skapa en Pull-begäran" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Skapa Arkiv här..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Skapad" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "Skapar en Gren eller ett Märke" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "Skapar en mapp med speciella inställningar för Git-arbetsträd" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Skapa en patch-fil från skillnaderna mellan två filer\nSkapa patch-fil" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Skapar ett nytt arkiv på vald plats" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Skapar en patchfil med dina ändringar i \"Unified Diff\"-format" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "Skapar Pull-begäran" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "Inloggningshanterare får inte lämnas tom." @@ -3547,7 +3591,7 @@ msgstr "Inloggningshanterare:" msgid "Credentials" msgstr "Inloggningsuppgifter" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Klipp ut" @@ -3555,7 +3599,7 @@ msgstr "&Klipp ut" msgid "Current" msgstr "Aktiv" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Nuvarande gren" @@ -3563,7 +3607,7 @@ msgstr "Nuvarande gren" msgid "Current Branch:" msgstr "Nuvarande gren:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3575,7 +3619,7 @@ msgstr "Nuvarande gren %s är uppdaterad\n\nOm du vill tvinga fram en ombasering msgid "Current version is:" msgstr "Nuvarande version är:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Nuvarande version är: %s" @@ -3588,7 +3632,7 @@ msgstr "An&passa..." msgid "Custom" msgstr "Egen" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Anpassa" @@ -3596,19 +3640,19 @@ msgstr "Anpassa" msgid "Customize Keyboard" msgstr "Anpassa tangentbord" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Anpassa snabbåtkomstfältet" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Anpassa snabbåtkomstfältet..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Anpassa..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3622,88 +3666,92 @@ msgstr "Kyrilliska" msgid "DCommit Type" msgstr "DCommit Typ" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "Daemon" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Datum" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "Datum för senaste arkivering" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Standard" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Standardmeny" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Standard programmeny. Visas när inga dokument är öppna. " +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Använd UTF-8 som standard" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Ta bort" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "Ta bort %d grenar" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "Ta bort %d fjärrgrenar" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "Ta bort %d märken" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "Ta bort &lokal" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "Ta bort Ref..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "Ta bort alla märken" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Radera och &Ignorera %d objekt efter namn" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Radera och lägg till i &ignoreringslistan" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Radera och ignorera %d objekt efter filänd&else" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "Ta bort gren" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Ta bort gren/märke" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "Ta bort fjärrgren" @@ -3711,34 +3759,34 @@ msgstr "Ta bort fjärrgren" msgid "Delete remote tag - TortoiseGit" msgstr "Ta bort fjärrmärke - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "Ta bort fjärrmärken på \"%s\"..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "Ta bort fjärrmärken..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Ta bort sub-modul" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "Ta bort märke" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "Ta bort den existerande grenen eller välj ett annat namn." -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Ta bort\n Filen är borttagen." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Borttagen" @@ -3746,36 +3794,36 @@ msgstr "Borttagen" msgid "Deleted merge conflict" msgstr "Tog bort föreningskonflikten" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Raderar och lägger till vald(a) fil(er) eller filmönster i ignoreringslistan" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "Tar bort filer/mappar från versionkontroll" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "Tar bort filer/mappar från versionskontroll men behåller filen/mappen" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Tar bort händelseloggen" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Tar bort" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Tar bort cachad data" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Tar bort fil" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "Tar bort fjärr-refs..." @@ -3795,7 +3843,7 @@ msgstr "Beskriv" msgid "Describe Strategy" msgstr "Beskrivningsstrategi" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Beskrivning" @@ -3803,7 +3851,7 @@ msgstr "Beskrivning" msgid "Description:" msgstr "Beskrivning:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Avmarkera ändringslista" @@ -3811,33 +3859,33 @@ msgstr "Avmarkera ändringslista" msgid "Destination" msgstr "Destination" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Otillräckligt diskutrymme på målenheten." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Upptäck och markera flyttade block" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "Upptäck flyttade och kopierade rader från filer oavsett arkivering" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "Upptäck flyttade och kopierade rader i filer från arkiveringen där destinationsfilen har blivit skapad" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "Upptäck flyttade och kopierade rader i filer som ändrades i samma arkivering" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "Upptäck flyttade eller kopierade rader i filer" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3851,11 +3899,15 @@ msgstr "Storlek och positioner för dialoger" msgid "Dialogs" msgstr "Dialoger" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Inställningar för jämförelser" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "Jämför två arkiveringar" @@ -3887,7 +3939,7 @@ msgstr "Patchfil:" msgid "Diff header" msgstr "Diff rubrik" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "Jämför senare" @@ -3899,12 +3951,12 @@ msgstr "Diff position" msgid "Diff removed lines" msgstr "Diff borttagna rader" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "Jämför med \"%s\"" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "Jämför med förälder %d" @@ -3917,19 +3969,19 @@ msgstr "Skillnader mellan" msgid "Diffing" msgstr "Jämför" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "Jämför arkiveringar" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "Jämför filen i arbetsträdet med samma fil från nästsista arkiveringen" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "Jämför två valfria arkiveringar" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Mapp..." @@ -3941,26 +3993,26 @@ msgstr "Mapp:" msgid "Disable sounds" msgstr "Inaktivera ljud" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "Avaktivera denna om du använder riktigt stora arbetsträd och du upplever\natt hårddisken accessas för mycket när du utforskar arbetsträdet." -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "Inaktivera uppdateringskoll" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "Inaktiv" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Disken full vid åtkomst av %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Sändningsfel: %1" @@ -3969,44 +4021,52 @@ msgstr "Sändningsfel: %1" msgid "Display &buttons in this order" msgstr "Visa &knapparna i den här ordningen" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "Visa hela sidor\nFörhandsgranska" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Visar hjälp för knappar, menyer och dialoger\nHjälp" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Visar hjälp för aktuellt kommando\nHjälp" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Visa instruktioner för hjälpen\nHjälp" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Visa programinformation, versionsnummer och copyright\nOm" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "Visa i&nte denna varning igen (om Fortsätt väljs)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "Visa i&nte denna varning igen (om Ignorera väljs)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Välj inte sub-module automatiskt" @@ -4019,54 +4079,71 @@ msgstr "Visa inte snabbmenyn för följande sökvägar" msgid "Do not use recycle bin" msgstr "Använd inte Papperskorgen" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "Vill du verkligen ta bort %s?" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Vill du verkligen ta bort verktygsraden '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "Vill du verkligen inaktivera den automatiska uppdateringskontrollen för TortoiseGit?\n\nAutomatiska uppdateringskontrollen kan aktiveras igen i TortoiseGit-inställningarna under fliken Generellt." -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "Vill du verkligen markera de valda filen/filerna som \"assume-vaild\"?" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "Vill du verkligen markera filen/filerna som \"skip-worktree\"?" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Vill du verkligen flytta den här filen eller mappen?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "Vill du verkligen permanent ta bort dom %d valda referenserna? Det kan INTE ångras!" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "Vill du verkligen ta bort \"%s\"?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "Vill du verkligen återställa kopian? Du kommer att förlora alla ändringar som du har gjort efter att du skapade kopian." -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4074,7 +4151,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "Vill du verkligen återställa/ångra alla ändringar i\n%s\noch gå tillbaka till denna revision? Ändringarna kommer att återställas genom en omvänd förening av revisionerna in i ditt arbetsträd." -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4082,21 +4159,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "Vill du verkilgen återställa/ångra alla ändringar gjorda i\n%s? Ändringarna kommer att återställas genom en omvänd förening av revisionen in i ditt arbetsträd." -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "Vill du verkligen avmarkera filen/filerna som \"skip-worktree\" eller \"assume-unchanged\"?" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Vill du hämta fjärrgrenar från det nyligen tillagda fjärrarkivet?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Vill du läsa om de ändrade filerna?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4104,21 +4181,21 @@ msgid "" "as resolved?" msgstr "Vill du markera filen\n%s\nsom alla konflikter lösta?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Vill du återställa dessa automatiskt sparade dokument?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Vill du ladda om filerna för att se de ändrade inställningarna?\nOBS! Ändringar som inte sparats kommer att gå förlorade!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Vill du se ändringarna?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Vill du hämta (pop) från stashen nu?" @@ -4126,28 +4203,28 @@ msgstr "Vill du hämta (pop) från stashen nu?" msgid "Document :" msgstr "Dokument :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "Okänt vad som kommer pushas eftersom grenen \"%s\" är okänd" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "Okänt vad som kommer pushas eftersom du angav en URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Återställ inte de automatiskt sparade dokumenten\nAnvänd den senaste uttryckligen sparade versionen av dokumenten" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "Spara inte\nStäng fönstren utan att spara ändringarna" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4157,11 +4234,11 @@ msgstr "Spara inte\nLäs om vyerna utan att spara ändringarna" msgid "Don't show the selected items: (press shift key to show them)" msgstr "Visa inte de valda objekten: (tryck på Shift för att via dom)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Visa inte detta meddelande igen" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Klar" @@ -4173,7 +4250,7 @@ msgstr "Ner" msgid "Download" msgstr "Ladda ner" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Dra för att koppla loss den här menyn" @@ -4201,6 +4278,10 @@ msgstr "Dummy Button Form " msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Uteslut sökvägar:" @@ -4209,7 +4290,7 @@ msgstr "&Uteslut sökvägar:" msgid "E&xit" msgstr "&Avsluta" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "E&xportera..." @@ -4229,11 +4310,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Öst-europeiska" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Redigera" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "Redigera &global .gitconfig" @@ -4249,23 +4330,23 @@ msgstr "Redigera .tgitconfig" msgid "Edit Button Image" msgstr "Ändra knappbild" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Ändringsnoteringar" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Ändra användarnamn..." -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "Ändra beskrivning" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Ändra filändelsespecifikt program för att visa skillnader" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Ändra föreningsprogram för filändelse" @@ -4277,11 +4358,11 @@ msgstr "Redigera gl&obala .gitconfig" msgid "Edit global &XDG git/config" msgstr "Editera global &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "Redigera lokal git config" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Skriv loggmeddelande" @@ -4301,25 +4382,25 @@ msgstr "" msgid "Effective" msgstr "Effektiv" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Ange antingen namnet på eller IP-adressen till proxyservern." -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Ellipsverktyg\nEllips" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "Emailets Till- och Kopia-adress kan inte båda vara tomma." -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "Emails" @@ -4327,7 +4408,7 @@ msgstr "Emails" msgid "Empty" msgstr "Tom" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "Tillåt Redigering" @@ -4343,7 +4424,7 @@ msgstr "Aktivera Gravatar" msgid "Enable drag context menu" msgstr "Visa kontextmenyn när objekt flyttas" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "Aktivera laddning/sparande av logg-cachefiler (tortoisegit.data, tortoisegit.index)" @@ -4352,10 +4433,14 @@ msgstr "Aktivera laddning/sparande av logg-cachefiler (tortoisegit.data, tortois msgid "Enable log cache" msgstr "Aktivera cachning av loggar" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "Aktivera visning av Gravatar i loggfönstret" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Aktivera statusikonhanterare" @@ -4364,35 +4449,35 @@ msgstr "Aktivera statusikonhanterare" msgid "Encode" msgstr "Koda" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Kodning" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Ett hårdvaruläs- eller skrivfel inträffade vid åtkomst av %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Ett låsningsfel inträffade vid åtkomst av %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Ett delningsfel inträffade vid åtkomst av %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Felaktiga argument. " -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Ett oväntat fel inträffade vid läsning från %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Ett oväntat fel inträffade vid skrivning till %1." @@ -4405,11 +4490,11 @@ msgstr "Kryptering" msgid "End" msgstr "Slut" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "Radslutsstil" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Maximera fönstret till full storlek" @@ -4417,23 +4502,23 @@ msgstr "Maximera fönstret till full storlek" msgid "Enter Log Message" msgstr "Skriv loggmeddelande" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Skriv in URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Ange en GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Ange en valuta." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Ange ett datum och / eller en tidpunkt." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Ange ett datum." @@ -4441,33 +4526,33 @@ msgstr "Ange ett datum." msgid "Enter a name for the changelist:" msgstr "Ange namn för ändringslistan:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Ange ett numeriskt värde mellan %1 och %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Ange ett numeriskt värde." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Ange ett positivt heltal." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Ange en tidpunkt." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Ange ett heltal mellan %1 och %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Ange ett heltal mellan 0 och 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Ange ett heltal. " @@ -4479,7 +4564,7 @@ msgstr "Ange filinnehåll att testa här under:" msgid "Enter log &message:" msgstr "Skriv logg&meddelande:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Ange inte fler än %1 tecken." @@ -4488,43 +4573,43 @@ msgstr "Ange inte fler än %1 tecken." msgid "Enter the regex string below:" msgstr "Ange reguljäruttrycket här under:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Radera allt\nRadera allt" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Radera markeringen\nRadera" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Fel" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Ett fel upspstod när ikoncachen reparerades!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "Valideringsfel för server-certifikat \"%s\":" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Fel vid läsning/skrivning av register nyckeln %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "Allt är uppdaterat." -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4534,28 +4619,28 @@ msgstr "Exekverbar (*.exe)|*.exe|Kommando (*.com)|*.com|Information (*.pdf)|*.pd msgid "Executable (+x)" msgstr "Exekverbar (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Existerar" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Avsluta" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Expandera (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Expandera det dockade fönstret" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Utforska till" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Exportera" @@ -4563,36 +4648,36 @@ msgstr "Exportera" msgid "Export Zip File" msgstr "Exportera zip-fil" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Exportera mapp:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "Exportera markering till..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Exportera denna revision..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Exportera även icke versionshanterade filer" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Exporterar %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Exporterar..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "Exporterar en revision till en zip-fil" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Filändelse" @@ -4608,7 +4693,7 @@ msgstr "Filändelse:" msgid "Extern DLL Path:" msgstr "Extern DLL sökväg:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Extern" @@ -4616,101 +4701,101 @@ msgstr "Extern" msgid "External Program:" msgstr "Externa program:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Tona bort" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "Misslyckades" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Återställning misslyckades" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "Misslyckades att checka ut filen \"%s\"" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "Misslyckades att checka ut \"%s\" för revision %s till \"%s\"." -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Misslyckades med att ansluta.\nLänken kan vara trasig." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Misslyckades med att konvertera ActiveX objekt. " -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Kunde inte skapa en tom fil." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Misslyckades med att skapa objekt. Kontrollera att programmet är registrerat i registret. " -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "Misslyckades att skapa Pull-begäran." -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "Misslyckades att hämta basfil." -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "Misslyckades att hämta föreningsfil." -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Kan inte visa hjälpen." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Misslyckades med att starta server programmet. " -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Kunde inte öppna filen." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Misslyckades med att utföra server operation. " -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Kunde inte spara filen." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Misslyckades med att ändra/ta bort ändringslistan \"%s\"" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Misslyckadse med att starta ärendespårning COM provider \"%s\".\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "Väntade förgäves på att pageant skulle ladda nyckel." -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Misslyckades!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "Fast Forward" @@ -4718,62 +4803,62 @@ msgstr "Fast Forward" msgid "Fast Forward o&nly" msgstr "E&nbart Fast Forward" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "Fast Forward till %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "&Hämta" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Hämta" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "Hämta && Om&basera" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "Hämta från SVN-arkiv" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "Hämta från \"%s\"" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "Hämta&&Om&basera" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Hämta..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "Hämtar status..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "Hämtar ändrade filer..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Hämtar fil..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Hämtar revision %s av filen:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Filnamn" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Filkodning" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Filändringar varje: %s" @@ -4782,27 +4867,27 @@ msgstr "Filändringar varje: %s" msgid "File changes each week:" msgstr "Filändringar varje vecka:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Filskillnader" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Filen har inga konflikter" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Filen är tom." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Fillistan är tom" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Fil-patchar" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4814,7 +4899,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Filstorlek:\t\t%s (%s)\nBredd:\t\t\t%ld pixlar\nHöjd:\t\t\t%ld pixlar\nHorisontell upplösning:\t%.1f dpi\nVertikal upplösning:\t%.1f dpi\nDjup:\t\t\t%d bitar\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4834,7 +4919,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Filstorlek:\t\t%s (%s)\nBredd:\t\t\t%ld pixlar\nHöjd:\t\t\t%ld pixlar\nHorisontell upplösning:\t%.1f dpi\nVertikal upplösning:\t%.1f dpi\nDjup:\t\t\t%d bitar\nZoom:\t\t\t%d%%\n\nFilstorlek:\t\t%s (%s)\nBredd:\t\t\t%ld pixlar\nHöjd:\t\t\t%ld pixlar\nHorisontell upplösning:\t%.1f dpi\nVertikal upplösning:\t%.1f dpi\nDjup:\t\t\t%d bitar\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4846,7 +4931,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Filstorlek:\t\t%s (%s)\nBredd:\t\t\t%ld pixlar\nHöjd:\t\t\t%ld pixlar\nHorisontell upplösning:\t%.1f dpi\nVertikal upplösning:\t%.1f dpi\nDjup:\t\t\t%d bitar\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4866,7 +4951,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Filstorlek:\t\t%s (%s)\nBredd:\t\t\t%ld pixlar\nHöjd:\t\t\t%ld pixlar\nHorisontell upplösning:\t%.1f dpi\nVertikal upplösning:\t%.1f dpi\nDjup:\t\t\t%d bitar\nZoom:\t\t\t%d%%\n\nFilstorlek:\t\t%s (%s)\nBredd:\t\t\t%ld pixlar\nHöjd:\t\t\t%ld pixlar\nHorisontell upplösning:\t%.1f dpi\nVertikal upplösning:\t%.1f dpi\nDjup:\t\t\t%d bitar\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Filnamn" @@ -4874,17 +4959,17 @@ msgstr "Filnamn" msgid "Files" msgstr "Filer" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Fyllverktyg\nFyll" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrera efter" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtrera sökvägar" @@ -4896,11 +4981,11 @@ msgstr "Filter:" msgid "Filter: " msgstr "Filter: " -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Sök" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4910,17 +4995,17 @@ msgstr "Sök efter text\nSök" msgid "Find:" msgstr "Sök:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "Sök: Kan inte hitta texten \"%s\"" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "Sök: Första förekomsten nerifrån hittad. Har kommit till början av dokumentet." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "Sök: Första förekomsten uppifrån hittad. Har kommit till slutet av dokumentet." @@ -4928,23 +5013,23 @@ msgstr "Sök: Första förekomsten uppifrån hittad. Har kommit till slutet av d msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Avsluta" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "Ombasering klar." -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Klar!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Första förälder" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Enbart första förälder" @@ -4953,18 +5038,18 @@ msgid "First known &bad:" msgstr "Första kända \"&dålig\"" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "Passa bild&höjd" +msgid "Fit image &heights\tH" +msgstr "Passa bild&höjd\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "Passa bild&bredd" +msgid "Fit image &widths\tW" +msgstr "Passa bild&bredd\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Diskenheter (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Mappar" @@ -4976,38 +5061,34 @@ msgstr "Följ namnbyten" msgid "Font" msgstr "Font" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Tryck F1 för hjälp. Rulla horisontellt med Ctrl+mushjul" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Avmarkera \"Följ inte kopieringshistorik\" för att se all historik" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Tvinga" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "Tvinga skapande av gren/märke - även om det redan finns en med samma namn." -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "Tvinga endast Push om fjärreferensen pekar på samma arkivering som fjärrgrenen som följs.\nDetta kan resultera i att fjärrarkivet förlorar arkiveringar; använd med försiktighet.\nDetta motsvarar git-optionen \"--force-with-lease\"." -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "Tvinga Push till den valda fjärreferensen och skriv över den utan några säkerhetkollar.\nDetta kan resultera i att fjärrarkivet förlorar icke synliga arkiveringar; använd med försiktighet.\nDetta motsvarar git-optionen \"--force\"." -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5025,20 +5106,20 @@ msgstr "Förgrund" msgid "Format Patch" msgstr "Skapa Patch" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Skapa Patch..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Framåt" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "Framåt %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5068,11 +5149,11 @@ msgstr "Från &modifierade filer" msgid "From SVN Repository" msgstr "Från SVN-arkiv" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "Från existerande filer" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "Från modifierade filer" @@ -5080,7 +5161,7 @@ msgstr "Från modifierade filer" msgid "From:" msgstr "Från:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Fullskärm" @@ -5088,7 +5169,7 @@ msgstr "Fullskärm" msgid "Full text search" msgstr "Fullständig textsökning" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Fullt rekursivt" @@ -5096,7 +5177,7 @@ msgstr "Fullt rekursivt" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "Ytterligare inställningar för arkiveringar finns under 'Dialog 3'." -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5104,24 +5185,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (förenklad)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Det gick inte att initiera GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ kunde inte skapa ett bitmap objekt. Du har antagligen inte tillräckligt med ledigt minne." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "GPG signerar märket, se manualen för mer detaljer" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Hämtar information. Var god vänta..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "Sammanställer statistik" @@ -5165,29 +5246,29 @@ msgstr "Allmänt::Dialoger 3" msgid "General::Set Extend Menu Item" msgstr "Allmänt::Anpassa utökade kontextmenyn" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Hämta föreningsloggar" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Hämtar fil %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Hämtar fil %s, revision %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Hämtar information..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Hämtar nödvändig information..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Hämtar \"Unified Diff\"" @@ -5199,23 +5280,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git Kommandoförlopp" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Kopiera och lägg till filerna till denna WC" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git Kopiera och döp om versionshanterade objekt här" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git Kopiera versionshanterade objekt här" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git Exportera alla objekt här" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git Exportera versionshanterade objekt här" @@ -5223,35 +5304,35 @@ msgstr "Git Exportera versionshanterade objekt här" msgid "Git Init" msgstr "Git Initiera" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Git Installationssökväg" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Logg" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git Flytta och döp om versionshanterade objekt här" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git Flytta versionshanterade objekt här" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git Fjärrinställningar" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Git Revisionslista" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5263,7 +5344,7 @@ msgstr "Git Synkronisera" msgid "Git clone - TortoiseGit" msgstr "Git kloning - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Git-biblioteket inte satt (se \"Generella inställningar\")." @@ -5271,23 +5352,23 @@ msgstr "Git-biblioteket inte satt (se \"Generella inställningar\")." msgid "Git for Windows" msgstr "Git för Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "Git för Windows (https://msysgit.github.io/) hittades inte." -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "Git rapporterade ett fel när ett arkiv skapades!\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Git's revisionslista innehåller den kompletta filhistoriken" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Git's revisionslista följer omdöpningar av filer" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5308,7 +5389,7 @@ msgstr "Git::Inloggningshanterare" msgid "Git::Remote" msgstr "Git::Fjärrarkiv" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "Global" @@ -5320,47 +5401,47 @@ msgstr "Gå till rad" msgid "Go to line" msgstr "Gå till rad" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Gå till nästa konflikt\nNästa konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Gå till nästa skillnad\nNästa skillnad" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Gå till nästa skillnad på samma rad\nNästa radskillnad" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Gå till föregående konflikt\nFöregående konflikt" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Gå till förra skillnaden\nFöregående skillnad" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Gå till föregående skillnad på samma rad\nFöregående radskillnad" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Gå till rad" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Graf" @@ -5376,11 +5457,11 @@ msgstr "Grå" msgid "Greek" msgstr "Grekisk" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Gruppera ändringslistor" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "Göm orelaterade ändrade sökvägar" @@ -5396,7 +5477,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Hårt" @@ -5408,7 +5489,7 @@ msgstr "Hårt: Återställ arbetsträdet och indexet (kasta alla lokala ändring msgid "Hebrew" msgstr "Hebreiska" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Hjälp" @@ -5432,11 +5513,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Dölj menyer för icke versionshanterade sökvägar" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "Göm Patch<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Göm det dockade fönstret" @@ -5444,25 +5525,25 @@ msgstr "Göm det dockade fönstret" msgid "Hide the script while running" msgstr "Dölj skriptet medans det körs" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "Dölj oförändrade" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "Göm oförändrade refs i Ref Compare List" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Visa/dölj listan med patch-filer" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Visa/Göm listan med patch-filer\nVisar eller gömmer listan med patch-filer" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "Tips" @@ -5472,7 +5553,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Tips: välj snabbmenyn, ändra sidan till \"Kommandon\" och dra knappar till menyfönstret." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Hem" @@ -5488,7 +5569,7 @@ msgstr "Krokskript::Konfiguration av ärendespårning" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Krokskript::Integration av Ärendespårning" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Kroktyp" @@ -5504,7 +5585,7 @@ msgstr "&Inkludera sökvägar:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5512,55 +5593,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5568,15 +5650,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5600,7 +5682,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5608,7 +5690,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5616,7 +5698,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5624,16 +5706,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5644,17 +5726,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5666,7 +5748,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5730,7 +5812,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Statusikoner" @@ -5742,7 +5824,7 @@ msgstr "Statusikoner::Ikonuppsättning" msgid "Icon Overlays::Overlay Handlers" msgstr "Statusikoner::Hanterare för statusikoner" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5752,52 +5834,52 @@ msgstr "Ikoner (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bm msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Ikoner/Design/Kodning: \t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "Identisk" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Förhindra att statusikoner och snabbmenyn visas i \"spara som...\" och \"öppna\" dialoger" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "Om vald så skickas optionen \"--track\" till git, om inte vald så skickas optionen \"--no-track\" till git, annars skickas vare sig \"--track\" eller \"--no-track\" till git (se hjälpen)." -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Dubbelklicka på en revision i logglistan för att jämföra med föregående revision" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Öppna arkiveringsdialogen igen automatiskt efter fel med samma markeringar och loggmeddelande. " -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Om markerad: TortoiseGit kontrollerar en gång per vecka om en nyare version finns tillgänglig" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Visa filer inuti mappar som inte är versionshanterade i status kontrollen.\r\nStatus kontrollen används tex i arkivera dialogen. " -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5810,16 +5892,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "Om du planerar att arbeta i den här mappen så lämna denna avaktiverad. Ett bart arkiv kan typiskt bara få ändringar \"pushade\" till sig. (Konventionen säger att arkivmappar som är bara bör ha ett namn som slutar med '.git')" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ignorera" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ignorera %d objekt efter &extension" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "Ignorera kommentarer" @@ -5831,15 +5913,15 @@ msgstr "Ignorera fil" msgid "Ignore Type" msgstr "Ignorera typ" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "Ignorera alla tomrum" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ignorera ändringar av tomrum" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "Ignorera tomma rader" @@ -5847,7 +5929,7 @@ msgstr "Ignorera tomma rader" msgid "Ignore case cha&nges" msgstr "Ig&norera ändringar mellan gemener/versaler" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5865,11 +5947,11 @@ msgstr "Ignorera objekt rekursivt" msgid "Ignore line &endings (recommended)" msgstr "Ignorera &radslut (rekommenderas)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "Ignorera mellanslag vid radslut" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "Ignorera ändringar av mellanslag" @@ -5877,29 +5959,29 @@ msgstr "Ignorera ändringar av mellanslag" msgid "Ignore whitespace" msgstr "Ignorera tomrum" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ignorera ändringar av tomrum" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "Ignorera tomrumsändringar vid jämförelse av förälderns och barnets version" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Ignorerad" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "Ignorerade filer" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ignorera tomrumsskillnader vid jämförelse\nIgnorera tomrum" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5917,24 +5999,24 @@ msgstr "Bilder &och text" msgid "Images" msgstr "Bilder" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Direkta barn, inklusive mappar" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Importera" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Importera %s till %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "Importera SVN Ignore" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "Importera SVN Ignore ..." @@ -5943,16 +6025,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "Importera svn ignore fil till .git/info/exclude fil (filen kommer skrivas över)" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Importerar fil %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "Inkommande ändringslista" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "Inkommande arkiveringar" @@ -5976,24 +6058,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Inkludera endast följande revisionsintervall:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Felaktigt filnamn." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Första importen" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "Initierade ett tomt Git-arkiv i %s" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Radjämförelse" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Radjämförelse ord för ord" @@ -6005,25 +6087,25 @@ msgstr "Skillnader inom rad" msgid "Input" msgstr "Inmatning" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Infoga innehåll från urklipp\nKlista in" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Otillräckligt minne för att utföra åtgärden." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Internt fel." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Ogiltig valuta. " -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "Ogiltigt revisionsnummer!" @@ -6031,7 +6113,7 @@ msgstr "Ogiltigt revisionsnummer!" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6054,7 +6136,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "Behåll" @@ -6062,11 +6144,11 @@ msgstr "Behåll" msgid "Keep changelists" msgstr "Behåll ändringslistor" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "Behåll filen lokalt?" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6080,7 +6162,7 @@ msgstr "Tangentbord" msgid "Keyboard shortcuts:" msgstr "Tangentbordsgenvägar:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Nycklar" @@ -6124,19 +6206,39 @@ msgstr "RAD8" msgid "Language:" msgstr "Språk:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "Senaste författare" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "Senaste arkivering" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Senaste modifiering" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Senaste modifiering:" @@ -6144,7 +6246,11 @@ msgstr "Senaste modifiering:" msgid "Last known &good:" msgstr "Senast kända \"bra\":" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "Startar det egna jämförelse-/förenings-programmet för att lösa konflikterna" @@ -6152,17 +6258,17 @@ msgstr "Startar det egna jämförelse-/förenings-programmet för att lösa konf msgid "Least active author:" msgstr "Minst aktiv:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Lämna som konflikt\nKonfliktstatus för filen behålls" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "Lämna endast markerade block" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Vänster vy:" @@ -6170,11 +6276,11 @@ msgstr "Vänster vy:" msgid "Left image" msgstr "Vänster bild" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Linjediagram" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6188,12 +6294,12 @@ msgstr "Visa avvikelsefält" msgid "Line differences" msgstr "Radskillnader" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Raden flyttad från rad %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Raden flyttad till rad %ld" @@ -6206,26 +6312,26 @@ msgstr "Radlängd" msgid "Line:" msgstr "Rad:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Rad: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Tillagda rader" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Borttagna rader" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Lista hjälpavsnitt\nHjälpavsnitt" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6243,23 +6349,23 @@ msgstr "Ladda bilder" msgid "Load Putty &Key" msgstr "Ladda Putty-nyckel" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "Ladda in ändringar\nÄndringar gjorda i TortoiseGitMerge kommer att förloras och ersätts med det nya innehållet." -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Ladda ändringar\nVyerna kommer att uppdateras med det nya innehållet." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "Laddar..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "Lokal" @@ -6267,13 +6373,13 @@ msgstr "Lokal" msgid "Local Branch" msgstr "Lokal Gren" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Lokal status" @@ -6281,7 +6387,7 @@ msgstr "Lokal status" msgid "Local:" msgstr "Lokal:" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6291,7 +6397,7 @@ msgstr "Plats där innehållet för den valda revisionen av arkivet kommer att s msgid "Locator Bar" msgstr "Addressfält" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Historik" @@ -6331,12 +6437,12 @@ msgstr "Loggmeddelanden ('Visa logg'-dialogen)" msgid "Login:" msgstr "Login:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Lägsta visade revision: %ld - Högsta visade revision: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6347,7 +6453,7 @@ msgstr "Lägsta visade revision: %ld - Högsta visade revision: %ld - HEAD revis msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6359,14 +6465,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "Mail" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Felaktig DLL för e-post systemet." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "Gör arkivet bart (Inget arbetsträd)" @@ -6379,47 +6481,47 @@ msgstr "Hantera" msgid "Manage" msgstr "Hantera" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "Hantera Fjärrarkiv" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Markera som löst" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Markera som löst\nFilens status ändras till \"modifierad\"" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "Markera för jämförelse" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "Markera blocket" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "Markerade block" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Markerar filen som löst i Git\nMarkera som löst" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "Markerar revisionen som \"dålig\"" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "Markerar revisionen som \"bra\"" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Matcha &gemener/versaler" @@ -6443,7 +6545,7 @@ msgstr "Me&nyer visar senaste använda kommandon först" msgid "Menu" msgstr "Meny" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Menyrad" @@ -6451,7 +6553,7 @@ msgstr "Menyrad" msgid "Menu s&hadows" msgstr "Menys&kuggor" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Förena" @@ -6459,34 +6561,34 @@ msgstr "Förena" msgid "Merge &Message" msgstr "Förenings&meddelande" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "Punkt för förening" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Återintegrera" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "Förening mellan ursprunglig grenen, innehållet i arbetsträdet och grenen du växlar till" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "Förena till \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Förenade" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "Förenade filer" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "Förenar en annan gren" @@ -6494,22 +6596,22 @@ msgstr "Förenar en annan gren" msgid "Merging" msgstr "Förenar" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Förenar från %s, revision %s till %s, revision %s till %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Förening kräver olika revisioner eller olika URLer i 'Från:' och 'Till:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Förenar revision %s av %s till %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Loggmeddelande" @@ -6519,9 +6621,9 @@ msgstr "Endast meddelande" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "Meddelande d&el uttryck:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Meddelanden" @@ -6529,11 +6631,11 @@ msgstr "Meddelanden" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Min" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Minimera menyfliksområdet" @@ -6545,7 +6647,11 @@ msgstr "Minsta antal tecken för ett arkiveringsmeddelande" msgid "Misc" msgstr "Övrigt" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "Saknas" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Blandad" @@ -6553,35 +6659,35 @@ msgstr "Blandad" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixat: Lämna arbetsträdet orört, återställ indexet" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Senast ändrad" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Ändrad" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "Modifierade filer" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Mer" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Fler knappar" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Fler kommandon..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Fler färger..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Flytta..." @@ -6601,41 +6707,41 @@ msgstr "Flytta &ner" msgid "Move &Up" msgstr "Flytta &upp" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Flytta objekt upp" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Flytta objekt ner" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Flytta och byt namn" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Flytta till ändringslista" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Flytta/Byt namn" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Flytta: Nytt namn för %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Flytta de ändrade filerna till papperskorgen innan återställning" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Flyttar %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Flyttar..." @@ -6643,11 +6749,11 @@ msgstr "Flyttar..." msgid "My file:" msgstr "Min fil:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Namn" @@ -6659,7 +6765,7 @@ msgstr "Namn:" msgid "Navigate" msgstr "Navigera" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6669,11 +6775,11 @@ msgstr "Navigera till en viss rad i fönstret\nGå till rad" msgid "Navigation Pane Options" msgstr "Alternativ för navigeringspanelen" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Alternativ för navigeringspanelen..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Nestlad" @@ -6685,7 +6791,7 @@ msgstr "Nätverk" msgid "Network::Email" msgstr "Nätverk::Email" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Ny" @@ -6694,43 +6800,43 @@ msgid "New &name:" msgstr "Nytt &namn:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Ny gren\\nytt märke" +msgid "New Branch/Tag" +msgstr "Ny gren/nytt märke" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Ny meny" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "Ny hash" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "Nytt meddelande" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Nytt namn för %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "Nya namnet får inte vara tomt eller samma som ursprungsnamnet!" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Nytt namn:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "Ny sub-modul" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "Nyare arkiveringstid" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "Radbrytningar" @@ -6738,33 +6844,29 @@ msgstr "Radbrytningar" msgid "Next" msgstr "Nästa" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Nästa sida\nNästa sida" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Nästa konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Nästa skillnad" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Nästa radskillnad" -#. Resource IDs: (73) -msgid "No" -msgstr "Nej" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "Ingen Fast Forward" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "Inga &föreningar" @@ -6776,102 +6878,107 @@ msgstr "Ingen utcheckning" msgid "No Co&mmit" msgstr "Ingen &arkivering" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "Ingen HEAD hittad" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "Inget kommando specifierat!\n\nTortoiseGitProc.exe används av Windowsskalet och är inte avsett att anropas direkt!" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Parameter till åtgärd saknas!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Inga skillnader funna!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "Inga skillnader funna! Sub-modulen är kanske inte uppdaterad. Uppdatera sub-modulen nu?" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Felmeddelande saknas." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Inga fel inträffade." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Inga filer eller mappar var modifierade. Det finns ingenting som TortoiseGIt kan återställa!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Det finns inga filer att visa med de nuvarande inställningarna.\nKryssa i en eller flera inställningar nedan för att se icke versionshanterade, ignorerade och/eller omodifierade filer.\nFör att se ändringar i arkivet, klicka på \"Kontrollera arkiv\"" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Inga filer har blivit ändrade eller tillagda\nsedan senaste arkiveringen. Det finns\ningenting för TortoiseGit att göra här..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Inga filer har blivit ändrade eller\ntillagda sedan senaste arkiverinen. Det\nfinns ingenting som TortoiseGit kan göra här...\nVill du se icke arkiverade filer?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Inget diagram tillgänglig" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Ingen bildkodare hittad för %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "Inga fler revisioner hittade." -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "Ingen föregående version." -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "Ingen referens hittad" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Inga stavningskorrigeringar" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Ingen status cache. Endast versionshanterade mappar har statusikoner, inga filer" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Inga förslag" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "Inget arbetsbibliotek funnet." @@ -6879,11 +6986,11 @@ msgstr "Inget arbetsbibliotek funnet." msgid "Node size" msgstr "Nodstorlek" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Inga" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6895,30 +7002,30 @@ msgstr "Normal &SVN Commit" msgid "North European" msgstr "Nord-europeiska" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "Inte versionshanterade filer" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Alla filer kunde inte laddas ner och verifieras." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Alla registerinställningar (eller .ini-fil) togs inte bort." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Otillräckligt minne för att utföra åtgärden." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Otillräckligt med minne!\nFörsök att reducera storleken på revisionsgrafen genom\natt antingen fälla ihop noder eller reducera zoomen." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "Inga patchar skapade." @@ -6926,7 +7033,7 @@ msgstr "Inga patchar skapade." msgid "Note node" msgstr "Noteringsnod" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6945,26 +7052,26 @@ msgstr "Notera: Katalogen innehåller icke versionshanterade objekt" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "Notera: Detta kommer att påverka alla Tortoise-program, inte bara TortoiseGit!" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Noteringar" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "Inget behöver ombaseras\n%s är samma som %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "Inget att Ombasera" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Inget att arkivera" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Notera" @@ -6972,7 +7079,7 @@ msgstr "Notera" msgid "Number Commits" msgstr "Antal arkiveringar" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Antal %s" @@ -6985,7 +7092,7 @@ msgstr "Antal användare:" msgid "Number of characters required for moved or copied line detection:" msgstr "Antal tecken som krävs för att upptäcka flyttad/kopierad rad:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "Antal tecken som visas av en förkortad hash" @@ -7057,41 +7164,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "Misslyckad OLE-initiering. Se till att OLE-biblioteken har rätt version." -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007 färger" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "Gammal hash" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "Gammalt meddelande" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "Äldre arkiveringstid" @@ -7099,15 +7206,15 @@ msgstr "Äldre arkiveringstid" msgid "Older lines" msgstr "Äldre rader" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Ett eller flera automatiskt sparade dokument hittades." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "En eller flera filer innehåller konflikter." @@ -7119,29 +7226,29 @@ msgstr "Bara nuvarande Gren" msgid "Only Local Branches" msgstr "Bara lokala Grenar" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "Bara sammanfogade filer" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Endast filer" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Endast siffror (med möjlig separering med komman)\när tillåtna!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Endast det här objektet" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Öppna" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7151,51 +7258,52 @@ msgstr "Öppna ett befintligt dokument\nÖppna" msgid "Open certificate" msgstr "Öppna certifikat" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Öppnar filer för jämförelse eller för att applicare en patch\nÖppna filer" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Öppna från urklipp" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Öppna bildfil..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Öppna mappens förälder" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "Öppna patch-fil" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "Öppna detta dokument" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Öppna med..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Öppnar hjälp\nHjälpavsnitt" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "Öppnar Referens-utforskaren" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "Öppnar arkivutforskaren" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Inställning" @@ -7204,30 +7312,30 @@ msgid "Options" msgstr "Inställningar" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Ursprungli&g storlek" +msgid "Ori&ginal size\tS" +msgstr "Ursprungli&g storlek\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "Origin Namn" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Andra paneler" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Andras" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "Utåtgående ändringslista" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "Utåtgående arkiveringar" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Slut på tillgängligt minne." @@ -7235,7 +7343,7 @@ msgstr "Slut på tillgängligt minne." msgid "Output Directory" msgstr "Destination" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7243,20 +7351,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "Skriver över om grenen finns" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Skriv över" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Sida %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7267,15 +7379,15 @@ msgstr "Sida %u\nSidor %u-%u\n" msgid "Page :" msgstr "Sida:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "Panel 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "Panel 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametrar" @@ -7283,25 +7395,25 @@ msgstr "Parametrar" msgid "Parameters:" msgstr "Parametrar:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "Förälder %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "Förälder %d existerar inte" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Förälder 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Förälder 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "Föräld(er/rar)" @@ -7313,39 +7425,39 @@ msgstr "Delar av koden kom från TortoiseSVN Blame" msgid "Password" msgstr "Lösenord" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Lösenord:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Klistra in" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Klistra in nyligen skrivet meddelande..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Klistra-in verktyg\nKlistra-in" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Klistra in namn på ändrade filer" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "Klistra in senaste arkiveringsmeddelande" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Klistrar in SVN-sökvägen från urklippshanteraren, resulterar i en flytt (klipp ut) eller en kopierings operation" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Patcha" @@ -7361,32 +7473,32 @@ msgstr "&Patcha markerade" msgid "Patch As Attachment" msgstr "Patchen som en bilaga" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Patcha alla filer" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Patcha markerade filer" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "Patch-filer (*.diff, *.patch)|*.diff;*.patch|Alla filer (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Patchar" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "Patchar fil '%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Sökväg" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Hittade en sökväg som bättre matchar patchen." @@ -7394,21 +7506,21 @@ msgstr "Hittade en sökväg som bättre matchar patchen." msgid "Path:" msgstr "Sökväg:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Sökvägar" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Pennverktyg\nPenna" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Procent av författarskap" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Procent" @@ -7416,24 +7528,24 @@ msgstr "Procent" msgid "Personalized Menus and Toolbars" msgstr "Anpassade menyer och verktygsfält" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "Välj" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "Välj arkiveringshash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "Välj arkiveringsmeddelande" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7443,56 +7555,56 @@ msgstr "Bild (Metafil)\nen bild" msgid "Picture:" msgstr "Bild:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "Bilder (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Grafer (*.gv)|*.gv|Alla filer (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "Bilder (*.wmf, *.jpg, *.png, *.bmp, *.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Alla filer (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Cirkeldiagram" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Fyll i ett krokskript som skall exekveras. " -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Fyll i sökvägen som krokskriptet skall appliceras på. " -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Välj typ av krokskript" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "Välj Gren" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "Välj Uppström" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "Kontrollera de överhoppade arkiveringarna" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Vänta medan operationen avbryts..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Vänta medan skillnader hämtas..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Vänta..." @@ -7508,11 +7620,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "\"Efter arkivering\" krok" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "\"Efter push\" krok" @@ -7520,23 +7632,23 @@ msgstr "\"Efter push\" krok" msgid "Pre&v Page" msgstr "Fö®ående sida" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "\"Innan arkivering\" krok" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "\"Innan push\" krok" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "Förbereder arkivering..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "Addera högra blocket till början" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "Addera detta block till början av vänstra" @@ -7548,11 +7660,11 @@ msgstr "Välj &ny genvägsknapp:" msgid "Press &new shortcut key:" msgstr "Välj &ny genvägsknapp" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Förhandsgranska" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Förhandsgrandska den patchade filen" @@ -7564,51 +7676,51 @@ msgstr "Förhandsgranskning:" msgid "Previous" msgstr "Föregående" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Föregående sida\nFöregående sida" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "Föregående version" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Föregående konflikt" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Föregående skillnad" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Föregående radskillnad" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Skriv ut" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Skriv ut dokument\n&Skriv ut" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "Skriv ut aktiva dokumentet med nuvarande inställningar\nSkriv ut direkt" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "Skriv ut det aktiva dokumentet\nSkriv ut" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Skriv ut till fil" @@ -7616,7 +7728,7 @@ msgstr "Skriv ut till fil" msgid "Printer :" msgstr "Skrivare:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Utskriftsfiler (*.prn)|*.prn|Alla filer (*.*)|*.*||" @@ -7624,11 +7736,11 @@ msgstr "Utskriftsfiler (*.prn)|*.prn|Alla filer (*.*)|*.*||" msgid "Printing" msgstr "Skriver ut" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Program (*.exe)|*.exe|Alla filer (*.*)|*.*||" @@ -7636,11 +7748,11 @@ msgstr "Program (*.exe)|*.exe|Alla filer (*.*)|*.*||" msgid "Progress" msgstr "Förlopp" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "Projekt" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Egenskap" @@ -7648,7 +7760,7 @@ msgstr "Egenskap" msgid "Property Page" msgstr "Egenskaper" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Provider" @@ -7680,15 +7792,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "Prune (Alla fjärrarkiv)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Pull" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "Pull kräver att den valda lokala grenen också är den aktiva." -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Pull..." @@ -7696,19 +7808,19 @@ msgstr "Pull..." msgid "Pull/Fetch" msgstr "Pull/Hämta" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "Pus&ha" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Pusha" @@ -7724,11 +7836,11 @@ msgstr "Push URL:" msgid "Push notes" msgstr "Pusha noteringar" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "Pusha &märken" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Pusha..." @@ -7736,22 +7848,22 @@ msgstr "Pusha..." msgid "Putty Key:" msgstr "Putty nyckel:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty privat nyckel (*.ppk)|*.ppk|Alla filer (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Avsluta programmet\nAvsluta" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7769,11 +7881,15 @@ msgstr "R&AM enheter" msgid "R&eset" msgstr "N&ollställ" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "&Återställ till denna revisionen" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "OMBASERA" @@ -7781,7 +7897,7 @@ msgstr "OMBASERA" msgid "Randomize Sync Dialog startup position" msgstr "Slumpa startposition för Synkningsdialogen" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7803,7 +7919,7 @@ msgstr "Fjärrarkiv:" msgid "Re&movable drives" msgstr "&Flyttbara enheter" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Byt &namn..." @@ -7819,15 +7935,15 @@ msgstr "Noll&ställ alla" msgid "Re&store defaults" msgstr "Åter&ställ default" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Åt&erställ..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "Åtkomliga" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Läs i lathunden om du kört fast..." @@ -7835,21 +7951,21 @@ msgstr "Läs i lathunden om du kört fast..." msgid "Rebase" msgstr "Ombasera" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "Ombasera (Rebase) \"%s\" till denna..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Ombasera (Rebase)..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "Ombaserar... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Nyligen" @@ -7861,21 +7977,21 @@ msgstr "Nyligen använd fil" msgid "Recently modified lines" msgstr "Nyligen ändrade rader" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Spela endast in" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Återställ de automatiskt sparade dokumenten\nÖppna de automatiskt sparade versionerna istället för dom uttryckligen sparade versionerna" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "Återställ till läget innan ombaseringen" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7889,17 +8005,21 @@ msgstr "Sub-moduler rekursivt" msgid "Recursive" msgstr "Rekursivt" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Gör om det föregående ångrakommandot\nGör om" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Minimera fönstret till en ikon" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "Ref" @@ -7907,31 +8027,31 @@ msgstr "Ref" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "Ref List" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "RefBrowse" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "RefLog" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "Ref-namn" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Uppdatera" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Uppdaterar..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "Regex Filter" @@ -7943,7 +8063,7 @@ msgstr "Regex Filters" msgid "Regex:" msgstr "Regex:" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7962,7 +8082,7 @@ msgid "" "\\s : whitespaces" msgstr "Reguljära uttrycksfilter:\r\n. : alla tecken\r\nc+ : bokstaven c en eller flera gånger\r\nc* : bokstaven c noll eller flera gånger\r\n^ : början på raden\r\n$ : slutet på raden\r\n(sträng){n} : sträng n gånger\r\n(abcd) : subuttryck\r\n[aei0-9] : a,e,i och 0..9\r\n[^aei0-9] : allt förutom a,e,i och 0..9\r\n\r\n\\w : a-z,A-Z,0-9 and _\r\n\\W : alla tecken som inte är alfanumeriska\r\n\\d : siffrorna 0-9\r\n\\s : tomrum" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Misslyckade patch-delar för \"%s\"" @@ -7975,7 +8095,7 @@ msgstr "Relativa tider i logg" msgid "Reload" msgstr "Ladda om" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8009,19 +8129,19 @@ msgstr "" msgid "Remote Branch" msgstr "Fjärrgren" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "Fjärr-URL får inte vara tom." -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "Fjärruppdatering" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "Fjärrnamnet får inte vara tomt." -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Status i arkivet" @@ -8033,12 +8153,12 @@ msgstr "Fjärrarkiv:" msgid "Remove" msgstr "Ta bort" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Ta bort %ld objekt" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Ta bort %s" @@ -8047,7 +8167,7 @@ msgstr "Ta bort %s" msgid "Remove &all untracked files (-fx)" msgstr "Ta bort &alla oföljda filer (-fx)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "Ta bort gren" @@ -8055,21 +8175,21 @@ msgstr "Ta bort gren" msgid "Remove &non-ignored untracked files (-f)" msgstr "Ta bort icke-ig&norerade, oföljda filer (-f)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "Tar bort alla kommentarer innan jämförelsen utförs så att ändringar i kommentarer inte visas som en ändring" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Ta bort från &ignoreringslistan" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Ta bort från snabbåtkomstfältet" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Ta bort från ändringslista" @@ -8081,7 +8201,7 @@ msgstr "Ta bort ignorerade filer (-fX)" msgid "Remove untracked directories (-d)" msgstr "Ta bort oföljda bibliotek (-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "Ta bort oföljda filer från arbetsträdet, ..." @@ -8089,11 +8209,11 @@ msgstr "Ta bort oföljda filer från arbetsträdet, ..." msgid "Removed" msgstr "Borttagen" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Togs bort från ändringslista" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8101,7 +8221,7 @@ msgid "" "from the ignore list." msgstr "Tog bort filmönstren\n%s\nfrån ignoreringslistan." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Tar bort filen eller filmönstret från ignoreringslistan" @@ -8109,11 +8229,11 @@ msgstr "Tar bort filen eller filmönstret från ignoreringslistan" msgid "Rena&me..." msgstr "Byt na&mn..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Omdöpt" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Döp om %s" @@ -8122,20 +8242,20 @@ msgstr "Döp om %s" msgid "Rename - TortoiseGit" msgstr "Byt namn - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "Byt namn på \"%s\":" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Byt namn/Flytta" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "Byt namn på filer/mappar inom versionskontrollen" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8145,7 +8265,7 @@ msgstr "Upprepa senaste kommandot\nUpprepa" msgid "Replace &All" msgstr "Ersätt &alla" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8159,12 +8279,12 @@ msgstr "Ersätt med:" msgid "Replace:" msgstr "Ersätt:" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "Ersatte %d träffar" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Ersätter" @@ -8188,11 +8308,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Begär ett användarnamn och ett lösenord" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "Lös k&onflikter..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Återställ" @@ -8204,25 +8324,25 @@ msgstr "Nollställ &alla" msgid "Reset Type" msgstr "Typ av Återställning" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "Återställ \"%s\" till denna..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "Återställ nuvarande gren" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Återställ kolumner" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "Återställ nuvarande gren \"%s\" till" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Markera konflikt som löst" @@ -8230,126 +8350,122 @@ msgstr "Markera konflikt som löst" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Använd \"min\" för att lösa konflikten" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Använd \"deras\" för att lösa konflikten" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Markera konflikt som löst" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Löste:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Markerar konflikten i filen som löst" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "Starta om ombaseringen" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Återställ" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Återställ till standard" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Återställ fönstret till normal storlek" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Återställd" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Försök igen" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "Försöker igen om 2 sekunder..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Återställ" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "Återställ arkivering" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "Återställ arkivering %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "Återställ till föräldrarevisionen" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "Återställ till revision %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Återställd" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Återställer alla ändringar sedan senaste uppdateringen" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Återställer en tilläggning till versionshantering" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "Granska Patchen med TortoiseGitMerge" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "Granska/applicera en fil i \"Unified Diff\"-format med hjälp av TortoiseGitMerge" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "Granska/applicera en &patch..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revision" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revision %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revision %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Revisions&graf" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8365,31 +8481,31 @@ msgstr "Revisionsgrafsfilter" msgid "Revision graph" msgstr "Revisionsgraf" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "Revision(en/erna) återställda. Alla ändringar finns nu i ditt arbetsträd." -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revision:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "Spola tillbaka" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "Spola tillbaka %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "RTF\ntext med typsnitts- och paragrafformatering" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Höger vy:" @@ -8397,21 +8513,21 @@ msgstr "Höger vy:" msgid "Right image" msgstr "Höger bild" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Rad %d av %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Rad %d-%d av %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Rad Ner" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Rad Upp" @@ -8419,11 +8535,11 @@ msgstr "Rad Upp" msgid "S&elect..." msgstr "Mark&era..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "V&isa knappar på en rad" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "V&isa knappar på två rader" @@ -8431,15 +8547,23 @@ msgstr "V&isa knappar på två rader" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "V&isa snabbåtkomstfältet ovanför menyfliksområdet" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "&Statistik" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "Växla/Checka ut..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8459,7 +8583,7 @@ msgstr "SMTP-servern kräver inloggning" msgid "SMTP Server:" msgstr "SMTP-server:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP, direkt till servern" @@ -8467,11 +8591,11 @@ msgstr "SMTP, direkt till servern" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8479,19 +8603,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN Commit Type" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Fetch" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN Rebase" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN Rev" @@ -8503,15 +8627,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "Samma" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "Samma arkiveringstid" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8529,35 +8653,39 @@ msgstr "Exampelmeddelande för att testa bugtraq: regex strings.\n\nTesting ment msgid "Sample text:" msgstr "Exempeltext:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Spara" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Spara so&m..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Spara so&m...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Spara som" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "Spara nedre filen som\nDu kommer att få ange var du vill spara nedre filen" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Spara fil" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "Spara vänster fil som\nDu kommer att få ange var du vill spara filen" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8565,13 +8693,13 @@ msgid "" "%s" msgstr "Spara vänster fil\nÄndringarna sparas till\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "Spara höger fil som\nDu kommer att få ange var du vill spara filen" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8579,74 +8707,74 @@ msgid "" "%s" msgstr "Spara höger fil\nÄndringarna sparas till\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "Spara alla\nBåda filerna sparas" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "Spara och exkludera\nDina ändringar sparas och det ursprungliga innehållet används" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "Spara och ignorera markerade block\nBara dina manuella ändringar sparas, markerade block lämnas orörda" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "Spara och inkludera\nDina ändringar sparas och de markerade blocken inkluderas" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Spara som" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Spara som..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Spara som\nDu kommer att få ange var du vill spara filen" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Spara ändringar i %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Spara ändringar." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "Spara patch-fil" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Spara revision &till..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "Spara dokumentet med ett nytt namn\nSpara som" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "Spara dokumentet\nSpara" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8668,13 +8796,13 @@ msgstr "Spara ändringar som \"Unified Diff\"" msgid "Save unified diff since HEAD" msgstr "Spara ändringar sedan HEAD som \"Unified Diff\"" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Spara\nSpara filen med konfliktmarkörer." -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8686,12 +8814,12 @@ msgstr "Spara\nÄndringarna sparas till \n%s" msgid "Saved Data" msgstr "Sparad data" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "Sparningen av konfiguration misslyckades (nyckel: \"%s\", värde: \"%s\")." -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "Misslyckades att spara noteringar" @@ -8703,11 +8831,11 @@ msgstr "Scanna" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Scrolla vänster" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Scrolla höger" @@ -8715,7 +8843,7 @@ msgstr "Scrolla höger" msgid "Se&ttings..." msgstr "Ins&tällningar..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Sök &loggmeddelanden..." @@ -8727,20 +8855,20 @@ msgstr "Sök &uppåt" msgid "Search for:" msgstr "Sök:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Söker efter en bättre sökväg för att applicera patchen..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Sökning misslyckades i %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "Markera" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Markera &allt" @@ -8756,59 +8884,59 @@ msgstr "Välj &snabbmeny:" msgid "Select &window:" msgstr "Välj &fönster:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Välj färg verktyg\nVälj färg" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Välj fil..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Välj SSH-klient" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Välj en knapp." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Markera ett objekt för att få hjälp" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Markera ändringslista" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Välj applikation för att visa skillnader" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "Välj fil" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Välj mapp att associera med ärendespåraren" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Välj mapp att exportera till.\nDu kan behöva skapa en ny mapp innan du kan genomföra den här exporten." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Välj mapp att köra skriptet för" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Välj mapp där de valda filerna skall sparas" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Välj krokskriptfil" @@ -8816,20 +8944,20 @@ msgstr "Välj krokskriptfil" msgid "Select items automatically" msgstr "Välj versionshanterade objekt automatiskt" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Välj föreningsapplikation" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Välj föreningsmål" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "Välj dialogrutans beteende efter avklarad operation." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8841,15 +8969,19 @@ msgid "" "checker used for commit messages." msgstr "Välj vilket språk detta projekt använder. Inställningen påverkar rättstavningsfunktionen som används för arkiveringsmeddelanden." -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Välj applikation för att visa skillnadsfiler" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "Välj vilken fil du vill spara som" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8859,7 +8991,7 @@ msgstr "Välj vilken fil du vill spara som\nNotera: Det finns olösta konflikter msgid "Select/deselect &all" msgstr "Markera/Avmarkera &alla" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8867,7 +8999,7 @@ msgstr "" msgid "Send" msgstr "Skicka" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "Skicka email" @@ -8875,11 +9007,11 @@ msgstr "Skicka email" msgid "Send Mail after create" msgstr "Skicka mail efter skapande" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Skicka mail misslyckades." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "Skicka mail..." @@ -8887,19 +9019,19 @@ msgstr "Skicka mail..." msgid "Send Patch" msgstr "Skicka Patch" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Skicka Patch via email" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "Skicka Patch(ar) via email" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Skickar innehåll" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Skickar..." @@ -8919,28 +9051,28 @@ msgstr "Ändra förfa&ttare" msgid "Set author &date" msgstr "Ändra &datum" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "Sätter fjärrarkivet som \"pushremote\" för den valda lokala grenen." -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "Sätter fjärrgrenen som \"pushbranch\" för den valda lokala grenen." -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Sätter egenskaper..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Inställningar" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Inställningar - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Skal" @@ -8948,7 +9080,7 @@ msgstr "Skal" msgid "Shell Extended" msgstr "Utökat skal" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Ikoncachen reparerades!" @@ -8960,7 +9092,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Kort &datum/tid-format i loggmeddelanden" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Förkorta egenskapslistan" @@ -8972,7 +9104,7 @@ msgstr "Visa" msgid "Show &Accelerator for:" msgstr "Visa &snabbknapp för:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "Visa &Reflogg" @@ -8980,15 +9112,15 @@ msgstr "Visa &Reflogg" msgid "Show &Unversioned Files" msgstr "Visa filer som &inte är versionshanterade" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "Visa &hela projektet" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Visa &ändringar" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Visa &logg" @@ -8996,15 +9128,19 @@ msgstr "Visa &logg" msgid "Show &log..." msgstr "Visa &historik..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Visa &statusikoner och snabbmeny endast i Utforskaren" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Visa ovanför menyfliksområdet" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Visa nedanför menyfliksområdet" @@ -9012,35 +9148,35 @@ msgstr "Visa nedanför menyfliksområdet" msgid "Show Environment Variables" msgstr "Visa miljövariabler" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Visa färre knappar" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Visa HEAD revisionsnoder" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Visa skillnader inom rad ord för ord\nSkillnader inom rad per ord" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Visa fler knappar" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Visa snabbåtkomstfältet ovanför menyfliksområdet" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Visa snabbåtkomstfältet nedanför menyfliksområdet" @@ -9048,11 +9184,11 @@ msgstr "Visa snabbåtkomstfältet nedanför menyfliksområdet" msgid "Show Screen&Tips on toolbars" msgstr "Visa skärm&tips på verktygsfält" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Visa tomrum" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Visa en översikt av hela grafen" @@ -9060,7 +9196,7 @@ msgstr "Visa en översikt av hela grafen" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9068,11 +9204,11 @@ msgstr "" msgid "Show author" msgstr "Visa författare" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "Visa grenar som denna arkivering finns på" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Visa ändringar &som en \"Unified Diff\"" @@ -9092,15 +9228,15 @@ msgstr "Visa datum" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Visa målmapp" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "Visa ändringar" @@ -9112,11 +9248,15 @@ msgstr "Visa ändringar sedan senaste arkivering" msgid "Show excluded folders as normal" msgstr "Visa exkluderade mappar som normala" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Visa &hela menyerna efter en kort fördröjning" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "Visa filnamn" @@ -9132,7 +9272,7 @@ msgstr "Visa i&gnorerade filer" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "Visa bara arkiveringar med etiketter" @@ -9140,90 +9280,90 @@ msgstr "Visa bara arkiveringar med etiketter" msgid "Show linenumber&s" msgstr "Visa radnumme&r" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Visa historik" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "Visa historik &innan namnändring/kopiering" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "Visa historik för %s" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Visa historik för sub-modul" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Visa historik för denna mapp" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Visa historik..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "Visa ändrade filer i arbetsträdet" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "Visa nästa ändring för markerad arkivering\nVisa nästa" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Visa äldsta noden överst" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Visa eller dölj verktygsfält\nVäxla verktygsfält" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Visa eller dölj addressfält\nVäxla addressfält" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "Visa eller dölj statusrad\nVäxla statusrad" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Visa eller dölj statusrad\nVäxla statusrad" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Visa eller dölj verktygsrad\nVäxla verktygsrad" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "Visa ursprungligt radnummer" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "Visa föregående ändring för markerad arkivering\nVisa föregående" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Visa revisionsegenskaper" @@ -9231,7 +9371,7 @@ msgstr "Visa revisionsegenskaper" msgid "Show shortcut &keys in ScreenTips" msgstr "Visa genvägs&knappar i skärmtips" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9241,7 +9381,7 @@ msgstr "Visa specialtecken för tomrum och radbrytning\nVisa tomrum" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9253,45 +9393,43 @@ msgstr "Visa filer &utan ändringar" msgid "Show un&versioned files" msgstr "Visa filer som &inte är versionshanterade" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Visa/dölj" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "Visar %1!d! ref(s), %2!d! ref(s) valda" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "Visar %ld revision(er), från revision %s till revision %s - %ld revision(er) valda, %ld fil(er) valda\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Visar en grafisk representation av kopior/märken/grenar" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Visar alla ändrade filer sen förra uppdateringen, både lokalt och i arkivet" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Visar information om TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "Visa referensloggen" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Visar händelseloggen i standardeditorn" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "Visa historiken för vald fil/mapp" @@ -9303,7 +9441,7 @@ msgstr "Si&gnera" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Silver tema" @@ -9311,20 +9449,20 @@ msgstr "Silver tema" msgid "Since" msgstr "Sedan" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Storlek" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Hoppa över" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Hoppa över Patch: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9332,23 +9470,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Hoppades över" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Hoppade över mål som saknades" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Skjut" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "Smart tabb-tecken" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Mjukt" @@ -9356,13 +9494,13 @@ msgstr "Mjukt" msgid "Soft: Leave working tree and index untouched" msgstr "Mjukt: Lämna arbetsträdet och indexet orört" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "Någon/Några fil(er) har blivit ändrade utanför TortoiseGitMerge.\nVill du läsa in dessa ändringar?" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9376,7 +9514,7 @@ msgstr "Sortera efter antalet arkiveringar" msgid "Sort tag list in reversed order" msgstr "Sortera listan med märken i omvänd ordning" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9386,49 +9524,53 @@ msgstr "Specificerar hur många gamla loggmeddelanden som ska sparas i loggmedde msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Dela rader" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Dela det aktiva fönstret\nDela" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Squash" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Staplat stapeldiagram" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Staplat linjediagram" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standard" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Starta (FastFwd)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "Starta Cherry Pick" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "\"Börja arkivera\" krok" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "Starta Ombasering (Rebase)" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "Starta bisect-läget..." @@ -9436,7 +9578,7 @@ msgstr "Starta bisect-läget..." msgid "Start registry editor" msgstr "Starta registereditor" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "Startar en git-server som kör git-protokollet" @@ -9448,39 +9590,47 @@ msgstr "Stasha" msgid "Stash &Message" msgstr "Stash-meddelande" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Applicera Stash" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Lista Stash" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Poppa Stash" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Spara Stash" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "Stash-operation pågår..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Statisk" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Statistik" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Status" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Alternativ för statusfält" @@ -9492,32 +9642,32 @@ msgstr "Färger för status och händelser" msgid "Status cache" msgstr "Status cache" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Status cache endast för en mapp, ingan rekursiva statusikoner" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "Stoppa bisect-läget" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "Strategi" @@ -9525,15 +9675,15 @@ msgstr "Strategi" msgid "Strip lines starting with \"#\" in commit message" msgstr "Bortse från rader som börjar med \"#\" i arkiveringsmeddelandet" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Tema" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Rubrik" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Rubrik:" @@ -9541,7 +9691,7 @@ msgstr "Rubrik:" msgid "Submodule" msgstr "Sub-modul" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "&Uppdatera Sub-modul" @@ -9549,7 +9699,7 @@ msgstr "&Uppdatera Sub-modul" msgid "Submodule Add" msgstr "Lägg till Sub-modul" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "Lägg till Sub-modul..." @@ -9557,15 +9707,15 @@ msgstr "Lägg till Sub-modul..." msgid "Submodule Diff" msgstr "Jämför Sub-modul" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Initiera Sub-modul" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Synka Sub-modul" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Uppdatera Sub-modul" @@ -9573,7 +9723,7 @@ msgstr "Uppdatera Sub-modul" msgid "Submodule Update Options" msgstr "Uppdateringsinställningar för Sub-moduler" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9588,15 +9738,15 @@ msgstr "" msgid "Submodules" msgstr "Sub-moduler" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Lyckades" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Växla" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Växla %s till %s, Revision %s" @@ -9605,43 +9755,43 @@ msgstr "Växla %s till %s, Revision %s" msgid "Switch To" msgstr "Växla till" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Växla tillbaka till förra fönsterpanelen\nFöregående panel" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Växla mellan enkel och dubbel vy" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Växla mellan enkel och dubbel vy\nVäxla mellan enkel och dubbel vy" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Växla vänster och höger vy" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Växla innehållet i det högra och vänstra fönstret\nVäxla den vänstra och högra vyn" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Växla till nästa dokumentfönster" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Växla till nästa fönsterpanel\nNästa panel" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Växla till föregående dokumentfönster" @@ -9649,19 +9799,19 @@ msgstr "Växla till föregående dokumentfönster" msgid "Switch/Checkout" msgstr "Växla/Checka ut" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "Växla/Checka ut till" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "Växla/Checka ut till denna..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Växla/Checka ut arbetsträdet till en annan gren/märke" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Växla jämförelsen höger<->vänster" @@ -9673,23 +9823,23 @@ msgstr "" msgid "Symlink" msgstr "Symlänk" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Synka..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "System" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "Systemet är Offline. Kontrollera Internet Explorer." -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9699,11 +9849,11 @@ msgstr "Registryinställningar och eventuell .ini-fil har tagits bort." msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" @@ -9719,7 +9869,7 @@ msgstr "Tabb-platshållare" msgid "Tab size:" msgstr "Tabbstorlek:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Märke" @@ -9727,16 +9877,16 @@ msgstr "Märke" msgid "Tag (FF)" msgstr "Märke (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Info om märke" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Satte märke för arbetsträdet till %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Märken" @@ -9744,11 +9894,11 @@ msgstr "Märken" msgid "Tags:" msgstr "Märken:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Uppgifter" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Uppgiftspanel" @@ -9760,11 +9910,11 @@ msgstr "Temporära filer (inklusive Gravatar bilder)" msgid "Test" msgstr "Test" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Testa endast" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "Text filer (*.txt)|*.txt|Alla filer (*.*)|*.*||" @@ -9772,13 +9922,19 @@ msgstr "Text filer (*.txt)|*.txt|Alla filer (*.*)|*.*||" msgid "Thai" msgstr "Thai" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9786,64 +9942,78 @@ msgid "" "Do you really want to delete it?" msgstr "Grenen \"%s\" är en fjärrgren.\n\nVill du verkligen ta bort den?" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Storleken på stycket stämmer inte med antalet nya/borttagna rader!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "Arkiveringsmeddelandet kan inte vara tomt." -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "Nuvarande arbetsträd är inte rent.\nVill du Stasha dina ändringar?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Jämförelsemotorn avbröt på grund av följande fel:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Filen %s finns inte!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Filen %s kunde inte hittas i patch-filen!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "Filen \"%s\" existerar inte i arbetsträdet.\nVill du jämföra med en annan fil?" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9852,15 +10022,15 @@ msgid "" "Do you want to remove the file?" msgstr "Filen\n%s\när tom.\nVill du ta bort filen?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Filen är för stor" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Filen är för stor för att öppna." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9868,7 +10038,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Filen\n%s\nfinns redan! Vill du skriva över den?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9876,14 +10046,14 @@ msgid "" "is not a valid text file!" msgstr "Filen %s är inte en giltig textfil!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Mappen %s\ninnehåller filer som inte är versionshanterade och/eller ändrade filer. Vill du ta bort den ändå? " -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9892,78 +10062,78 @@ msgid "" "Would you like to create it first?" msgstr "Mappen \n%s\nfinns inte.\nVill du skapa den först?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Ett fel uppstod när krokskriptet kördes:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Bilden kan inte visas. " -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Ärendespårningsprovidern kunde inte skapas. Var god kontrollera att den är korrekt installerad. " -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Ärendespårningsprovidern misslyckades med att validara parameter texten" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Raden som visar den ny filen förväntas på rad %d!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Ange ett numeriskt värde mellan %d och %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "Lokala grenen \"%s\" kan inte snabbspolas (fast-forward) fram till fjärrgrenen \"%s\"." -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "Det lokala grennamnet och fjärrgrennamnet är tomma.\nFortsätt?" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "Det lokala gren/märkes-namnet är tomt. Detta kommer att resultera i en borttagning i fjärrarkivet.\nFortsätt?" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Den övre gränsen för antalet rader i händelseloggen.\nNär gränsen är nådd så tas den äldsta raden bort när en ny läggs till. " -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Kommandot misslyckades." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Argumenten '/path' och '/pathfile' är ömsesidigt uteslutande.\nDu får bara ange ett av dem. " -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "Patchen gör inte att applicera på %s och ingen versionsinformation är angiven.\nGår inte att patcha!" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9973,7 +10143,7 @@ msgid "" "do not match!" msgstr "Patchen verkar gammal! Filraden\n%s\noch patch-raden\n%s\n matchar inte!" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9984,7 +10154,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Sökvägen/URL verkar inte vara tillåten i Windows!\nDu kan försöka ändå, men du kan få fel senare.\n\nEn giltig sökväg i windows får inte innehålla '<<>|\"?*:' eller ett av de följande enhetsnamn:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nVill du fortsätta ändå?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9995,36 +10165,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "Sökvägen\n%s\nverkar inte stämma överens med sökvägen i patch-filen.\nTortoiseGitMerge hittade sökvägen\n%s\nsom stämmer bättre. Vill du använda den föreslagna sökvägen istället?" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "Processen körs ännu.\nÄr du säker på att du vill avbryta?" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "Reguljäruttrycket är ogiltigt!\nAnge ett giltigt reguljäruttryck." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "Fjärrarkivet \"%s\" finns redan.\nVill du skriva över det?" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Arkivet skapades utan problem. " -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Den valda filen verkar fortfarande ha en eller flera konfliktmarkörer i sig.\nÄr du säker på att du vill markera konflikten som löst?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10032,7 +10209,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10041,7 +10218,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Destinationsmappen\n%s\när en specialmapp som inte är tänkt att fungera som arkivrot!\nÄr du säker på att du vill initiera ett nytt Git-arkiv i denna mapp?" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10050,26 +10227,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "Målmappen\n%s\när inte tom!\nÄr du säker på att du vill initiera ett nytt Git-arkiv i den mappen?" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "Texten är identisk men filerna skiljer sig åt!\nFöljande skillnader hittades:" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Tid i sekunder efter vilket inläsningen av valda filer stoppas.\r\nEtt lägre värde gör automatisk ifyllningslistan tillänglig snabbbare,\r\nmen alla filer har kanske inte lästs." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "De två valda URL:erna är inte skapade från samma rot.\nDet går inte att visa loggmeddelandena mellan dem." -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10079,34 +10256,34 @@ msgstr "Arbetsträdet är inte rent och innehåller icke-adderade ändringar.\nG msgid "Their file:" msgstr "Deras fil:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Deras" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "Det finns ändringar eller icke versionshanterade objekt i en eller flera sub-moduler.\nDessa filer är inte listade i arkiveringen. Du måste arkivera dessa filer i sub-modulen" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Det finns för närvarande %d statusikonhanterare installerade förutom de som används av Tortoise." -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Det finns inga ärendespårningsproviders. " -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10115,85 +10292,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Det finns fortfarande olösta konflikter på rad %d!\nDu bör lösa dessa innan du sparar.\nVill du spara filen, med konflikterna kvar?\nOm du klickar Ja, måte du manuellt lösa dessa konflikter i en annan editor!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Det finns ändringar som inte sparats!\nVill du spara dina ändringar?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Ordbok" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Dessa är mer nyligen sparade än de för tillfället öppnade dokumenten och innehåller ändringar som var gjorda innan applikationen avslutades." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "Detta fält är obligatoriskt och kan inte lämnas tomt." -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Detta är inte en valid URL.\nVar god ange en URL här." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Det här är inte en giltig sökväg!\nEn giltig sökväg får inte innehålla '<<>|\"?*:' eller ett av följande enhetsnamn:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Det här programmet är länkad med den saknade exprten %s i filen %s. Den här datorn kan ha en inkompatibel version av %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Den här applikationen kräver filen %s, som inte kunde hittas." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Den här egenskapen är endast tillåten på mappar, inte filer." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "Fjärrnamnet kolliderar med hämta-refspec:en för andra fjärrnamn\nVälj ett annat namn" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "Den här uppgifter kräver att arbetsträdet är rent." -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Det här kommer att ta bort kommandohistoriken i det här programmet och återställa menyer och verktygsfält. Anpassningar kommer inte tas bort. Är du säker på att du vill göra detta?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "Trevägsjämförelse" @@ -10209,14 +10386,14 @@ msgstr "Ordna hori&sontellt" msgid "To" msgstr "Till" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "För att undvika att hämta fel märken, om detta inte är ett\nofficiellt fjärrarkiv, så rekommenderas du att avaktivera hämtandet av fjärrmärken.\nAvaktivera hämtning av märken?" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10228,13 +10405,13 @@ msgstr "" msgid "To:" msgstr "Till:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Växla mellan visning av en eller två sidor\nVäxla mellan visning av en eller två sidor" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "Växla filter" @@ -10246,11 +10423,11 @@ msgstr "Verktygsrad" msgid "Toolbar Name" msgstr "Verktygsradsnamn" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Verktygsradsval" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Internt fel i verktygsfält. Kontakta försäljaren av programmet. " @@ -10266,16 +10443,16 @@ msgstr "Verktyg" msgid "Tools:" msgstr "Verktyg:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10285,20 +10462,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit har upptäckt likande filnamn. Vill du att filerna: %s\nockså döps om?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit kommer inte att visa följande statusikoner: %s" @@ -10307,18 +10484,18 @@ msgstr "TortoiseGit kommer inte att visa följande statusikoner: %s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame är redan initierad för arkivet \"%s\". Kan inte växla till ett annat arkiv (\"%s\") under körning." -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10334,7 +10511,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10342,7 +10519,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - Ett verktyg för att jämföra avbildningar, en del av TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10356,16 +10533,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10374,18 +10551,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge kan inte processa den här patch-filen. Filnamnet \"%s\" förekommer mer än en gång." -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10424,11 +10601,11 @@ msgstr "Följ" msgid "Tracked Remote Branch:" msgstr "Följd fjärrgren" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "Följd gren" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Överför i %s" @@ -10437,39 +10614,35 @@ msgstr "Överför i %s" msgid "Transparent &color..." msgstr "Transparant &färg..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "Trimma höger" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Pröva \"Rensa\". Om det inte fungerar måste du göra en ny uthämtning." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Försök igen" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turkiska" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Tweaka TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Typ" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Typ:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL och mapp för inte vara tomt." @@ -10493,24 +10666,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Kunde inte ladda stöd för mailsystem." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Kan inte bearbeta kommando, servern är upptagen." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Kan inte läsa från %1, filen är öppnad av någon annan." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Kan inte läsa egenskap som är markerad för endast skrivning." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10518,91 +10691,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Kan inte skriva till egenskap som är markerad för endast läsning." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Kan inte skriva till %1, filen är markerad för endast läsning eller är öppnad av någon annan." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Avmarkera" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Ångra" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Ångra %d kommandon" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Ångra ett kommando" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Ångra Lägg till..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "Ångra senaste kommandot\nÅngra" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Ångra senaste ändring\nÅngra" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Oväntat filformat." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "Avmarkera som \"skip-worktree\" och \"assume-unchanged\"" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Veckla ut" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Oformaterad text\ntext utan formatering" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "\"Unified &Diff\" av HEAD revisioner" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "Okänd" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Okänt djup" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "Avmarkera detta block" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Olöst konflikt!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Namnlös" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Icke versionshanterad" @@ -10610,7 +10787,7 @@ msgstr "Icke versionshanterad" msgid "Unversioned files mark parent folder as modified" msgstr "Mappar med filer som inte är versionshanterade visas som ändrade" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Kopplar loss från versionshantering %s" @@ -10623,23 +10800,23 @@ msgstr "Upp" msgid "Update" msgstr "Uppdatera" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "Uppdatera Ref" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "Uppdatera sub-moduler" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Uppdaterade" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Uppdaterar ActiveX objekt" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "Uppdaterar indexet" @@ -10651,30 +10828,26 @@ msgstr "Använd &standardbild:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Använd &enkel vy som standard för 2-fils skillnader." -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Använd det &andra textblocket" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Använd \"mitt\" textblock" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Använd först \"mitt\" textblock och sedan \"deras\"" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Använd \"deras\" textblock" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Använd först \"deras\" textblock och sedan \"mitt\"" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "Använd Block" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "Använd HTTP sökvägskomponent" @@ -10695,15 +10868,15 @@ msgstr "Använd \"Thin &Pack\" (För långsamma nätverk)" msgid "Use Unified Diff from &clipboard" msgstr "Använd &patchfil i \"Unified Diff\"-format från urklipp" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "Använd ett annat namn eller välj \"Tvinga\" för att skriva över det." -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "Använd ett annat namn eller välj \"Skriv över gren\"." -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10713,7 +10886,7 @@ msgstr "Använda allt innehåll från den vänstra vyn\nAnvänd den vänstra fil msgid "Use block from left before right" msgstr "Använd blocket från vänster före höger" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10723,25 +10896,25 @@ msgstr "Använd blocket från den vänstra vyn innan blocket från den högra vy msgid "Use block from right before left" msgstr "Använd blocket från höger före vänster" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Använd blocket från den högra vyn innan blocket från den vänstra vyn\nAnvänd det högra blocket innan det vänstra" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Avnänd båda textblocken (den här först)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Använd båda textblocken (den här sist)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Använd vänster block" @@ -10757,15 +10930,15 @@ msgstr "Använd färgen för lokal gren även för nuvarande gren" msgid "Use recycle bin when reverting" msgstr "Använd papperskorgen vid återställning" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Använd reguljära uttryck" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Använd höger block" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Använd mellanslag" @@ -10773,61 +10946,61 @@ msgstr "Använd mellanslag" msgid "Use system locale for date/time" msgstr "Använd datorns inställningar för datum/tid" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Använd \"&mitt\" textblock" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Använd \"&deras\" textblock" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Använd \"mi&tt\" textblock innan \"deras\"" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Använd textblock från \"mitt\" före \"deras\"\nAnvänd \"mitt\" textblock följt av \"deras\"" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Använd textblocket från \"mitt\"\nAnvänd \"mitt\" textblock" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Använd 'd&eras' textblock innan 'mitt'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Använd textblocket från \"deras\" före \"mitt\"\nAnvänd \"deras\" textblock följt av \"mitt\"" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Använd textblocket från \"deras\"\nAnvänd \"deras\" textblock" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Använd textblocket från den vänstra vyn\nAnvänd vänstra blocket" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Använd &detta textblock" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10835,7 +11008,7 @@ msgid "" "%s" msgstr "Använd den funna sökvägen.\nApplicera patchen på\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10847,19 +11020,19 @@ msgstr "Använd ursprungliga sökvägen.\nApplicera patchen på\n%s" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Använd &hela den här filen" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Använd blocket till vänster" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Använd hela den andra &filen" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "Används för att rätta till (amend) sista arkiveringen på nuvarande gren." @@ -10875,11 +11048,11 @@ msgstr "Användarens info" msgid "User Name:" msgstr "Användarnamn:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Åtgärd avbruten av användaren" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10889,11 +11062,11 @@ msgstr "Användarens namn och email måste vara satt innan en arkivering.\nVill msgid "User&name:" msgstr "Användar&namn:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Användarnamn:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10912,7 +11085,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Värde" @@ -10920,24 +11093,24 @@ msgstr "Värde" msgid "Version" msgstr "Revision" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Version 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Version 1 (Nyare arkiveringstid)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Version 2 (Bas)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Version 2 (Bas) (Nyare arkiveringstid)" @@ -10945,11 +11118,11 @@ msgstr "Version 2 (Bas) (Nyare arkiveringstid)" msgid "Version Information" msgstr "Versionsinformation" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Version:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Versionshanterad" @@ -10961,23 +11134,27 @@ msgstr "Vietnamesiska" msgid "View" msgstr "Visa" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "Visa .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Visa Patch" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Visa Patch>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Visa revision för sökväg i &webläsare" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Visa revision i alternativ editor" @@ -10989,11 +11166,11 @@ msgstr "Visa systemets gitconfig" msgid "Visit our website" msgstr "Besök vår webbsida" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11004,7 +11181,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "VARNING:\nÄndra endast dessa inställningar om du är absolut säkert på vad du gör!\nRadera värdet för att återställa till standardvärden." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Vänta" @@ -11012,7 +11189,7 @@ msgstr "Vänta" msgid "Wait for the script to finish" msgstr "Vänta tills skriptet har avslutats" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Väntar på inmatning" @@ -11020,15 +11197,15 @@ msgstr "Väntar på inmatning" msgid "Walk Be&haviour" msgstr "Listalternativ" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Varning" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Varning!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11036,7 +11213,7 @@ msgid "" "Do you really want to continue?" msgstr "Varning: \"%s\" kommer att tas bort permanent. Den kan INTE återskapas!\n\nVill du verkligen fortsätta?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Webb" @@ -11044,56 +11221,56 @@ msgstr "Webb" msgid "Western European" msgstr "Väst-europeiska" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "När en patch appliceras, ignorera tomrumsändringar i omgivande rader, om nödvändigt" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "När en förloppsdialog med en körande git-process stängs, visa en dialog innan processen dödas" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Om vald så kommer TortoiseGit's kontextmeny vara tillgänglig när objekt flyttas." -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "När aktiverad så kommer större versionsnummer först. Oftast är senare versioner mer användbara." -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Välj versionshanterade objekt i arkiveringsdialogen automatiskt" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "När du skriver in en URL så kommer fjärrnamnet automatiskt att sättas till \"origin\" om fjärrnamnet lämnas tomt, för att du ska slippa." -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11103,15 +11280,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Tomrumsändringar (tabbar, mellanslag)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Tomrum" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Fönsterposition" @@ -11119,15 +11296,15 @@ msgstr "Fönsterposition" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11171,11 +11348,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "Inom en fil:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "Inom fil" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Arbetsträd" @@ -11183,29 +11360,25 @@ msgstr "Arbetsträd" msgid "Working Tree Path:" msgstr "Sökväg i arbetsträd:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Ändringar i mappen" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Radbryt långa rader" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Radbryt långa rader vid högra fönsterramen\nRadbryt långa rader" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Ja" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Ja till allt" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Du har redan den senaste versionen installerad." @@ -11215,51 +11388,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Du kan inaktivera specifika statusikonhanterare här. \nAvaktiverade hanterare kommer inte att använda en statusikonplats och ger andra verktyg en chans att visa sina statusikoner." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Du kan endast klistra in en bitmap med storleken (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Du kan inte skapa fler än %d användardefinerade verktygsfält!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Den här egenskapen går bara att sätta på filer, inte på mappar!\nKryssa i 'rekursivt' för att sätta den på alla filer i mappen." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "Du kan inte ändra typen för denna referens genom ett namnbyte." -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "Du har en gammal version av Git för Windows (https://msysgit.github.io/) installerad som har säkerhetsbrister.\n\nDu borde överväga att uppgradera till 1.9.5+." -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "Du har markerat ändrade block. Hur ska blocken sparas?" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Du har ändrat egenskaper utan att spara dem.\nVill du spara dem nu?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11267,67 +11440,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "Du har valt %d objekt att visa skillnader för.\nFör var och en av dessa objekt kommer en ny instans av skillnadsvisaren att startas.\nVill du verkligen starta så många skillnadsvisare på en gång?" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Du har inte angivit något ärendenummer!\nVill du arkivera utan ett ärendenummer?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "Du har inte angett din \"Signed-Off-By\"-rad" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Du kan definera upp till %d verktyg." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Du måste ange ett historikmeddelande för arkiveringen" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Du måste starta om systemet för ändringarna ska börja gälla. " -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "Du måste välja ett filnamn för zip-filen!" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "Du har valt en mapp.\nExport är endast möjligt till en zip-fil." -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Du har valt en fil som inte finns i arkivet.\nDen kommar att läggas till när du arkiverar dina ändringar." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Du bör fylla i text!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Du bör välja en bild!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Du har ändrat statusikonuppsättningen från %s till %s.\nDet behövs en omstart eller att du loggar ut och sedan in igen för att den ska börja gälla!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11337,7 +11510,7 @@ msgstr "Dina tidigare loggmeddelanden har sparats.\nKlicka här för att läsa o msgid "Your version is:" msgstr "Din version är:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Din version är: %d.%d.%d.%d" @@ -11347,10 +11520,10 @@ msgid "Zip File" msgstr "Zip-fil" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "Zoo&ma ut" +msgid "Zoo&m out\t-" +msgstr "Zoo&ma ut\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Zooma" @@ -11362,80 +11535,80 @@ msgstr "Zooma i&n" msgid "Zoom &Out" msgstr "Zooma &ut" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Zooma 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Zomma in\nZomma in" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Zomma ut\nZomma ut" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Zooma i&n" +msgid "Zoom i&n\t+" +msgstr "Zooma i&n\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Zooma in" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Zooma ut" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Anpassa zoomning" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Höjdanpassa zoom" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Breddanpassa zoom" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Standard]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Otilldelad]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" är ogiltig." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" är inte ett Git-arkiv" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11449,7 +11622,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "lägg till \"cherry picked från\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "tillagd" @@ -11457,7 +11630,7 @@ msgstr "tillagd" msgid "added files" msgstr "tillagda filer" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "en namnlös fil" @@ -11465,14 +11638,19 @@ msgstr "en namnlös fil" msgid "and support the developers" msgstr "och stöd utvecklarna" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "assume-valid" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "användarnamn" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "baserad på TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11505,30 +11683,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "arkiveringar" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "i konflikt" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "kopierad från\r\n%s - revision %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "dag" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "borttagen" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11540,7 +11718,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "email-inställningar" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11549,16 +11727,16 @@ msgid "" "%s" msgstr "exporterade\n%s\ntill\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "extern" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git avslutades inte korrekt (kod %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ignorerad" @@ -11566,15 +11744,15 @@ msgstr "ignorerad" msgid "include &untracked" msgstr "inkludera &oföljda" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "ofullständig" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "ärvd" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "objektet behölls lokalt" @@ -11582,7 +11760,7 @@ msgstr "objektet behölls lokalt" msgid "keep the file lists in English" msgstr "behåll fillistan på engelska" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11591,7 +11769,7 @@ msgid "" "%s = %ld" msgstr "rader: %d(+) %d(-) filer: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11606,11 +11784,11 @@ msgstr "rader: %d(+) %d(-) filer: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = % msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "förenad" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "saknas" @@ -11618,7 +11796,7 @@ msgstr "saknas" msgid "missing/deleted/replaced" msgstr "saknas/borttagen/ersatt" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "ändrad" @@ -11626,7 +11804,7 @@ msgstr "ändrad" msgid "modified/copied" msgstr "ändrad/kopierad" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "månad" @@ -11634,40 +11812,44 @@ msgstr "månad" msgid "new branch" msgstr "Som ny Gren" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "nej" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "beskrivning för detta kommando saknas" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "icke versionhanterad" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "inga" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "hittades inte" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "blockerad" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "på %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pixlar" @@ -11675,11 +11857,11 @@ msgstr "pixlar" msgid "possible or real conflict/obstructed" msgstr "möjlig eller verklig konflikt/blockering" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "kvartal" @@ -11687,35 +11869,35 @@ msgstr "kvartal" msgid "renamed" msgstr "omdöpt" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "ersatt" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "scannar sökväg:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "skip-worktree" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "växlade till\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "hantera ändringar i sub-moduler" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "till %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "till %s" @@ -11724,35 +11906,35 @@ msgstr "till %s" msgid "u&nknown changes" msgstr "okä&nda ändringar" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "vecka" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - alla Windows användare" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - nuvarande Windows användare" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - endast detta arkiv" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - nuvarande Windows användare" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - endast detta arkiv" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "år" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "ja" diff --git a/Languages/Tortoise_tr.po b/Languages/Tortoise_tr.po index c197c5a26..d84e10d67 100644 --- a/Languages/Tortoise_tr.po +++ b/Languages/Tortoise_tr.po @@ -9,22 +9,29 @@ # Can Berkol , 2013 # Can Berkol , 2013 # Ekrem KAYA , 2012-2013 +# Emre Can ÖZTAŞ , 2015 # Ekrem KAYA , 2012 # Ertan Tike , 2013 # Ertan Tike , 2013 # Göktuğ Öztürk , 2014 +# Huseyin , 2013 +# ibrahim YENER , 2014 +# Lübbe TortoiseSVN , 2011 +# Muhammet Kara , 2014 +# Ozan Tunca , 2013 # Ozan Tunca , 2013 # Ozan Tunca , 2013 # Sven Strickroth , 2012-2013 # Tahir , 2013 # Tahir , 2013 +# Vural Göze , 2011 # Ekrem KAYA , 2012 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Turkish (http://www.transifex.com/projects/p/tortoisegit/language/tr/)\n" "MIME-Version: 1.0\n" @@ -33,7 +40,7 @@ msgstr "" "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -55,138 +62,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# yazarların bireysel gösterimi:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f MB aktarıldı" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 beklenmeyen bir öğe içeriyor." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 hatalı bir yol içeriyor." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 hatalı bir şema içeriyor." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 hatalı bir biçime sahip." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 bulunamadı." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! gün önce" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! gün önce" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! saat önce" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! saat önce" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! dakika önce" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! ay önce" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! ay önce" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! saniye önce" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! saniye önce" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! hafta önce" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! hafta önce" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! yıl önce" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! yıl önce" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! öğe seçildi" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! dakika önce" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\n%2!d! dosya gösteriliyor, %3!d! alt modül ve %4!d! klasör, toplam %5!d! öğe" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nBetiğin çalışmasına devam edilsin mi ?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -194,52 +201,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nDosya bulunamadı.\nDosya ismi ya da yolunun doğru olduğundan emin olun." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Byte aktarıldı" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d kB aktarıldı" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d commits ahead \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d dosya değiştirildi" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d dosya silindi." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d dosya %s şekline döndürüldü." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d dosya seçildi, toplam %d dosya" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "Her (%d %%) için en az %d gönderim yapan %d en aktif yazarlar" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -247,78 +254,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alfa\nalfayı değiştirmek için tıklayın\nalfayı otomatik olarak değiştirmek için çift tıklayın" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld dakika ve %ld saniye" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld / %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - uyarlama: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Kurtarıldı]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s içinde %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s için Git >= %s gerekiyor" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, de %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Çalışma Ağacı" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\\\Dışarı Aktar (%d) / %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Dışarı Aktar %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nDüzgün bir şekilde yamalanamadı." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nNe olursa olsun silmek istiyor musunuz?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -334,6 +341,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3 yollu birleştirme" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&TortoiseGitBlame Hakkında..." @@ -362,15 +373,15 @@ msgstr "&Filtre Ekle" msgid "&Add New/Save" msgstr "&Yeni ekle/Kaydet" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Ekle" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Buton ekle ya da sil" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Ekle..." @@ -410,7 +421,7 @@ msgstr "&Atama" msgid "&Associate double-click event with:" msgstr "&Çift-tıklama ile ilişkilendirilecek olay:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Otomatik Gizle" @@ -426,15 +437,15 @@ msgstr "&Putty Anahtarını otomatik yükle" msgid "&Backup original file" msgstr "&Esas dosyanın yedeğini al" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Kusurlu" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Kusurlu değişiklikler" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Kusurlu uyarlamalar" @@ -458,7 +469,7 @@ msgstr "&Dal:" msgid "&Browse Dir" msgstr "&Klasöre gözat" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Depoya gözat" @@ -494,7 +505,7 @@ msgstr "&Kategori:" msgid "&Choose commands from:" msgstr "&Komutlarından seç:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Temizle..." @@ -518,7 +529,7 @@ msgstr "&Pencere" msgid "&Command:" msgstr "&Komut:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Teslim et" @@ -526,23 +537,27 @@ msgstr "&Teslim et" msgid "&Commit submodule..." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Teslim et..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&Uyarlamaları karşılaştır" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Kopyala" @@ -562,19 +577,19 @@ msgstr "&Özel" msgid "&Default" msgstr "&Varsayılan" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Sil" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Sil (yerel dosyaları koru)" #. Resource IDs: (1507) msgid "&Delete Filter" -msgstr "" +msgstr "Filtre &Sil" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Uzak && yerel dosyaları sil" @@ -586,11 +601,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&Değişiklikler" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&Önceki sürüm ile değişiklikler" @@ -602,7 +617,7 @@ msgstr "&Klasör" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Çıkart" @@ -610,7 +625,7 @@ msgstr "&Çıkart" msgid "&Do the same for the rest" msgstr "" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Yerleştirme" @@ -618,11 +633,15 @@ msgstr "&Yerleştirme" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Aşağı" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&İndir" @@ -630,19 +649,19 @@ msgstr "&İndir" msgid "&Edit" msgstr "&Düzenle" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&.git/config dosyasını düzenle" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Tümünü düzenle" #. Resource IDs: (1506) msgid "&Edit Filter" -msgstr "" +msgstr "Filtre &Düzenle" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Karışıklıkları düzenle" @@ -664,13 +683,13 @@ msgstr "&Proxy sunucusunu etkinleştir" #. Resource IDs: (32976) msgid "&Enable edit" -msgstr "" +msgstr "&Etkinleştir düzenleme" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Seçilenleri gönder..." @@ -682,27 +701,27 @@ msgstr "&Harici" msgid "&File" msgstr "&Dosya" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Bul" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Bul\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Görüntüyü pecere boyutuna ayarla" +msgid "&Fit images in window\tF" +msgstr "&Görüntüyü pecere boyutuna ayarla\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Sabit sürücüler" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Kayan" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "&Yeni isimleri takip et" @@ -714,7 +733,7 @@ msgstr "&Günlük mesajları için yazı biçimi:" msgid "&Font:" msgstr "&Yazı:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Zorla" @@ -734,7 +753,7 @@ msgstr "&Git Biçiminde Teslim et (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "&Git\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -746,7 +765,7 @@ msgstr "&Yeşil:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Yardım" @@ -754,7 +773,7 @@ msgstr "&Yardım" msgid "&Help Topics" msgstr "&Yarım Başlıkları" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Gizle" @@ -762,11 +781,11 @@ msgstr "&Gizle" msgid "&Icon Set:" msgstr "&Simge Takımı:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Yoksay" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "%d öğe adına göre &yoksay" @@ -780,14 +799,14 @@ msgid "&Image" msgstr "&Görüntü" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Görüntü bilgisi" +msgid "&Image info\tI" +msgstr "&Görüntü bilgisi\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Sadece görüntü" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&İçe aktar" @@ -799,7 +818,7 @@ msgstr "&Başlangıç klasörü:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Kur" @@ -811,11 +830,11 @@ msgstr "&Yüklendiğinde ilk değişikliğe git" msgid "&Keep CR" msgstr "&CR Tut" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Mevcut durumu koru" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -837,16 +856,16 @@ msgstr "&Aramayı değiştirilmiş satırlara kısıtla" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Limit:" #. Resource IDs: (1078) msgid "&Line number" -msgstr "" +msgstr "&Satır numarası" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" -msgstr "" +msgstr "&Satır numarası (%d - %d)" #. Resource IDs: (32797) msgid "&Link image positions" @@ -860,7 +879,7 @@ msgstr "&Liste Görünümü" msgid "&Local Branch:" msgstr "&Yerel Dal." -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -870,11 +889,11 @@ msgstr "&Yerel:" #. Resource IDs: (65535) msgid "&Luminence:" -msgstr "" +msgstr "&Parlaklık:" #. Resource IDs: (65535) msgid "&Max line length for inline diffs" -msgstr "" +msgstr "&Maksimum satır hizalama farkları için satır uzunluk" #. Resource IDs: (16543) msgid "&Menu animations:" @@ -884,11 +903,11 @@ msgstr "&Menü canlandırmaları:" msgid "&Menu contents:" msgstr "&Menü içeriği: " -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" -msgstr "" +msgstr "&Birleştir" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Birleştir..." @@ -910,7 +929,7 @@ msgstr "&Küçült" #. Resource IDs: (32880) msgid "&Moved blocks" -msgstr "" +msgstr "&Taşınmış bloklar" #. Resource IDs: (1515) msgid "&Name" @@ -938,12 +957,16 @@ msgstr "&Yeni..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Sonraki >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Sonraki Sayfa" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Çift-tıklama yok" @@ -960,11 +983,11 @@ msgstr "&Yok" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&Tamam" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Tek Sayfa" @@ -972,19 +995,15 @@ msgstr "&Tek Sayfa" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Aç" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Aç...\tCtrl+O" @@ -997,18 +1016,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Kaplama simgeleri" +msgid "&Overlay images\tO" +msgstr "&Kaplama simgeleri\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Şifre:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Yapıştır" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1016,7 +1035,7 @@ msgstr "" msgid "&Port:" msgstr "&Port:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Baskı Önizleme" @@ -1024,11 +1043,15 @@ msgstr "&Baskı Önizleme" msgid "&Print..." msgstr "&Yazdır..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Yazdır...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "&Çek" @@ -1036,10 +1059,14 @@ msgstr "&Çek" msgid "&Push all branches" msgstr "&Tüm dalı gönder" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "&TekrarTeslim" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Son iletiler" @@ -1052,7 +1079,7 @@ msgstr "&İçyineleme" msgid "&Red:" msgstr "&Kırmızı:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Yinele" @@ -1068,7 +1095,7 @@ msgstr "&Yenile" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1076,7 +1103,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "&Uzak Dal:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1084,7 +1111,7 @@ msgstr "" msgid "&Remote:" msgstr "&Uzak" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Dil" @@ -1094,9 +1121,9 @@ msgstr "" #. Resource IDs: (1511) msgid "&Replace" -msgstr "" +msgstr "&Değiştir" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Depoya-gözat" @@ -1104,7 +1131,7 @@ msgstr "&Depoya-gözat" msgid "&Reset" msgstr "&Sıfırla" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Araç çubuğunu sıfırla" @@ -1120,23 +1147,27 @@ msgstr "&Kullanım verisini sıfırla" msgid "&Reset to Default" msgstr "&Varsayılana döndür" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "&Çözümle" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Geri al" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Eski duruma al" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Bu teslim ile geri al" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Bu teslimler ile geri al" @@ -1146,9 +1177,9 @@ msgstr "&SSH istemcisi:" #. Resource IDs: (65535) msgid "&Saturation:" -msgstr "" +msgstr "&Doygunluk:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Kaydet" @@ -1156,15 +1187,19 @@ msgstr "&Kaydet" msgid "&Save authentication" msgstr "&Kimliği Kaydet..." -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "Diyagramı farklı &kaydet..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "Seçili dosyaları içeren listeyi &kaydet..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Kaydet\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1172,7 +1207,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "&Uzak dalı upstream/track olarak ayarla" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Ayarlar" @@ -1192,7 +1227,7 @@ msgstr "&Metin etiketlerini göster" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Atla" @@ -1200,7 +1235,7 @@ msgstr "&Atla" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1212,7 +1247,7 @@ msgstr "&Başlat" msgid "&Start Group" msgstr "&Grup Başlat" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "&Sakla" @@ -1232,7 +1267,7 @@ msgstr "&Sembol görünümü" msgid "&Tab size:" msgstr "&Sekme boyutu:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Sekmelenmiş Döküman" @@ -1240,7 +1275,7 @@ msgstr "&Sekmelenmiş Döküman" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Etiketler" @@ -1276,7 +1311,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Araç çubukları:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1288,7 +1323,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Gövde:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&çift sayfa" @@ -1296,15 +1335,15 @@ msgstr "&çift sayfa" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Gerial" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" -msgstr "" +msgstr "&Birleştirilmiş karşılaştırma" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1316,7 +1355,7 @@ msgstr "&Bilinmeyen sürücüler" msgid "&Up" msgstr "&Yukarı" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "Öğeyi revizyona göre &güncelle" @@ -1328,11 +1367,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "Dosya dizinleri ve anahtar kelimeler için otomatik-tamamlama &kullan." -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Kullanıcı adı:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Görünüm" @@ -1340,7 +1379,7 @@ msgstr "&Görünüm" msgid "&View:" msgstr "&Görünüm:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "Teslim esnasında eksik Tarafından-İmzalanmış varsa uyar" @@ -1356,6 +1395,10 @@ msgstr "&Tüm sözcük" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&Boşluk değişikliklerini yoksay" @@ -1364,46 +1407,46 @@ msgstr "&Boşluk değişikliklerini yoksay" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(%s tarafından)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(değişiklik yok)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(satır numarası yok)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(değer yok)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(bulunamadı)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(bilinmeyen)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- hepsi -" @@ -1411,13 +1454,14 @@ msgstr "- hepsi -" msgid "--&all" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1425,7 +1469,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1441,7 +1485,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1457,31 +1501,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1490,66 +1534,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit bir shell uzantısıdır.\nBu Windows explorer'a entegre ediliyor anlamına gelir.\nTortoiseGit programını kullanmak için lütfen explorer'ı açınız ve dilediğiniz klasörün\nüstüne sağ tuşla tıklayınız, böylece bütün TortoiseGit komutlarını bulabileceğiniz\niçerik menüsünü görebilirsiniz.\nve lütfen kullanma kılavuzunu okuyunuz!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "Zula Onayı başarısız!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "Zula Çıkartma başarısız!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "Zula başarısız!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "Zula Onayı başarısız, çakışmalar mevcut" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "Zula Çıkartma başarısız, çakışmalar mevcut" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "Zula Onayı başarılı" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "Zula Çıkartma başarılı" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "Zula Başarılı" @@ -1557,7 +1601,7 @@ msgstr "Zula Başarılı" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1569,71 +1613,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "Bu isimli dal mevcut." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "Yeni bir versiyon mevcut. Güncel versiyonu indirin!" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Boş satır ile ayrılmış, işaretli dizinlerin listesi.\nEğer dizin sonuna \"*\" karakteri eklerseniz o dizinin içinde bulunan dosyalar ve alt-klasörler de dahil edilir." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Boş satır ile ayrılmış, işaretsiz dizinlerin listesi.\nEğer dizin sonuna \"*\" karakteri eklerseniz o dizinin içinde bulunan dosyalar ve alt-klasörler de dahil edilmez.\nBoş bir liste istenilen tüm dizinlerin işaretlenebilmesini sağlar. " -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Boş satır ile ayrılmış, işaretsiz dizinlerin listesi.\nEğer dizin sonuna \"*\" karakteri eklerseniz o dizinin içinde bulunan dosyalar ve alt-klasörler de dahil edilmez.\nBoş bir liste istenilen tüm dizinlerin işaretlenebilmesini sağlar. " -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Gerekli kaynak erişilebilir değil." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "Bu isimli etiket mevcut." -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "GNU fark dosyaları için görüntüleyici (yama dosyaları).\r\nEğer yoksa NotePad kullanın." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "İ&ptal" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "H&akkında" @@ -1649,25 +1693,25 @@ msgstr "Hızlı yeniden isimlendirme" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "İptal" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "Birleştirmeyi &İptal et" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" -msgstr "" +msgstr "Hakkında" #. Resource IDs: (129) msgid "About TortoiseGit" @@ -1685,12 +1729,12 @@ msgstr "TortoiseGitMerge Hakkında" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "%1 erişimi engellendi." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "İşlem" @@ -1698,26 +1742,26 @@ msgstr "İşlem" msgid "Action log" msgstr "İşlem günlüğü" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "İşlemler" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Etkin Görev Listesi" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Etkin Dosyalar" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX nesneleri Windows kapanırken kaydedilemez!\nTüm %1 değişikliklerinden vazgeçilsin mi?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Ekle" @@ -1725,7 +1769,7 @@ msgstr "Ekle" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "'%s' yı sözlüğe ekle" @@ -1738,15 +1782,15 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Belirli bir uzantı için karşılaştırma programı ekle" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Belirli bir uzantı için birleştirme programı ekle" @@ -1754,15 +1798,15 @@ msgstr "Belirli bir uzantı için birleştirme programı ekle" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Aldır&mama listesine ekle" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Hızlı Erişim için Araç Çubuğuna Ekle" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Ekle..." @@ -1770,11 +1814,11 @@ msgstr "Ekle..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Belirli bir uzantı için karşılaştırma/birleştirme programı ekle/düzenle." -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Eklendi" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1782,25 +1826,25 @@ msgid "" "to the ignore list." msgstr "%s\\n\nDosya şablon(ları)\n'Aldırılmayanlar' listesine eklendi." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Ekleniyor" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Git kontrolüne dosya(lar) ekle" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "'Aldırılmayanlar' listesine seçili dosya(ları) yada dosya maskelerini ekler" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Ayarları ayarla\nAyarlar" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Gelişmiş" @@ -1808,43 +1852,43 @@ msgstr "Gelişmiş" msgid "Advanced Diff/Merge Settings" msgstr "Gelişmiş Fark/Birleştirme Ayarları" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Gelişmiş fark ayarları" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Gelişmiş birleştirme ayarları" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Tümü" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Tüm Komutlar" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Tüm Dosyalar (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Tüm Dosyalar (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "Tüm üst öğeler" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1852,47 +1896,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Tüm değişiklikleriniz kaybolacak! Gerçekten tüm araç çubuklarını ve menüleri sıfırlamak istiyor musunuz?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Tüm değişiklikleriniz kaybolacak! Gerçekten tüm tuş atamalarını sıfırlamak istiyor musunuz?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Tüm değişiklikleriniz kaybolacak! Gerçekten '%s' menüsünü sıfırlamak istiyor musunuz?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Tüm değişiklikleriniz kaybolacak! Gerçekten '%s araç çubuğunu sıfırlamak istiyor musunuz?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" -msgstr "" +msgstr "bu görüntü için düzenlemeye izin ver\nİzin ver Düzenle" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "Zaten güncel." @@ -1908,11 +1952,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Zaman ve tarihi gösterme için daima sistem yerel ayarlarını kullan." -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1920,12 +1964,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1936,7 +1980,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1949,36 +1993,36 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "%1 ile geçersiz bir dosya tanımı ilişkilendirildi." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Bilinmeyen bir hata oluştu." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "%1 erişimi esnasında bilinmeyen hata oluştu." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "%d satırında bilinmeyen satır biçi bulundu !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" -msgstr "" +msgstr "Sağ blok ekle" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" -msgstr "" +msgstr "Bu bloğu sola ekle" #. Resource IDs: (65535) msgid "Application Frame Menus: " @@ -1988,11 +2032,11 @@ msgstr "Uygulama Pencere Menüleri:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Yama Serisi Uygula..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Yama Uygula" @@ -2000,7 +2044,7 @@ msgstr "Yama Uygula" msgid "Apply Patches" msgstr "Yamalar Uygula" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Eposta kutusundan yama serisi uygula" @@ -2008,47 +2052,47 @@ msgstr "Eposta kutusundan yama serisi uygula" msgid "Apply unified diff" msgstr "Birleştirilmiş karşılaştırma dosyasını uygula" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" -msgstr "" +msgstr "Aqua stili" #. Resource IDs: (65535) msgid "Arabic" msgstr "Arapça" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "İsteğe bağlı &URL:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Çakışan dosyayı(ları) çözümlendi olarak işaretlemek istediginizden emin misiniz?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "%d eleman(lar)daki değişiklikleri geri almak istediğinizden emin misiniz? Son güncellemeden bu yana olan bütün değişiklikler silinir!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "&Dikey yerleştirme" +msgid "Arrange &vertical\tV" +msgstr "&Dikey yerleştirme\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Atanılan '%s' değişiklik listesi" @@ -2057,11 +2101,11 @@ msgstr "Atanılan '%s' değişiklik listesi" msgid "Assigned to:" msgstr "Atanılan:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "Değiştirilmemiş varsayın" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "Geçerli/Değiştirilmemiş varsayın" @@ -2073,34 +2117,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Uyarlama: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Desteklenmeyen bir işlem yapılmak istendi." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Sonunu %1 aşan bir yere erişmeye çalışıldı." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Yazılan %1 'den okunmaya çalışıldı." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Okunan %1 'e yazılmaya çalışıldı." @@ -2117,11 +2161,11 @@ msgstr "Kimlik belirleme" msgid "Authentication data" msgstr "Kimlik verileri" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Yazar" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2129,7 +2173,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Yazar:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Yazarlar" @@ -2151,11 +2195,11 @@ msgstr "Kendiliğinden CrLf dönüşümü" msgid "Auto Crlf:" msgstr "Kendiliğinden CrLf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Kendiliğinden Gizle" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Tümünü Kendiliğinden Gizle" @@ -2163,23 +2207,23 @@ msgstr "Tümünü Kendiliğinden Gizle" msgid "Auto&Crlf" msgstr "Kendiliğinden&CrLf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Çakışma yoksa otomatik kapat" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Hatalar yoksa otomatik kapat" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Birleşme, ekleme veya silme yoksa otomatik kapatma" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2193,7 +2237,7 @@ msgstr "Putty &Anahtarını Kendiliğinden Yükle" msgid "Autoload Putty &Key" msgstr "Putty &Anahtarını Kendiliğinden Yükle" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Otomatik" @@ -2203,7 +2247,7 @@ msgstr "Her hafta kendiliğinden ¥i sürüm kontrolü yap" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Otomatik metin test aracı" #. Resource IDs: (1157) msgid "Average" @@ -2213,19 +2257,19 @@ msgstr "Ortalama" msgid "B&rowse..." msgstr "G&özat" -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Geri" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Arkaplan" #. Resource IDs: (65535) msgid "Baltic" msgstr "Baltık" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Diyagram Çubuğu" @@ -2245,7 +2289,7 @@ msgstr "Taban dosya:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "Basit Bilgi" @@ -2257,45 +2301,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "Big5 (Geleneksel)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "İkiye ayırma kötü" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "İkiye ayırma iyi" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "İkiye ayırmayı sıfırla" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "İkiye ayırma başlat" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Bit Eşlemi\nbir bit eşlem" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" -msgstr "" +msgstr "Siyah stil" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Sorumlu" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "Önceki Düzenlemeyi Suçla" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Dosyanın içinde yazılı satırların sorumlulukları o satırı yazan kişiye aittir" @@ -2303,26 +2347,30 @@ msgstr "Dosyanın içinde yazılı satırların sorumlulukları o satırı yazan msgid "Blend alpha" msgstr "Alfayı karıştır" -#. Resource IDs: (156, 626) -msgid "Blue Style" +#. Resource IDs: (156) +msgid "Blocks" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (215, 10009) +msgid "Blue Style" +msgstr "Mavi stil" + +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "/logmsg ve /logmsgfile, her ikisi de belirtildi!\nSadece bir tanesi belirtilmeli." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" -msgstr "" +msgstr "Hem yama dosyası yolu hem de hedef yol mutlak yol olmalıdır!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2334,30 +2382,30 @@ msgstr "&Gözat" msgid "Branc&h:" msgstr "&Dal" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Dal" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Dal/Etiket adı geçersiz." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Dal/Etiket adı boş ya da geçersiz olmamalıdır." @@ -2369,11 +2417,11 @@ msgstr "Dal:" msgid "Bro&wse" msgstr "Göz&at" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Harici bir karşılaştırma uygulaması ara" @@ -2385,19 +2433,19 @@ msgstr "" msgid "Browse..." msgstr "Gözat..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Böcek-ID" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "Bug-ID i&fadesi:" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "Böcek-ID/Sorun-No." -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Böcek-IDleri" @@ -2413,7 +2461,7 @@ msgstr "" msgid "Button Appearance" msgstr "Buton Görünümü" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Buton1" @@ -2429,7 +2477,7 @@ msgstr "Şimdi kon&trol et" msgid "C&ommands:" msgstr "K&omutlar:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "&Revizyondan dal/etiket oluştur" @@ -2437,11 +2485,11 @@ msgstr "&Revizyondan dal/etiket oluştur" msgid "C&urrent Keys:" msgstr "Geçerli Tuşlar:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "K&es" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2457,11 +2505,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Bir önceki revizyon ile karşılaştırmak icin günlüğün içine çift tıklama yapınız" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Statik bir ActiveX nesnesi aktifleştirilemiyor." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2470,94 +2518,94 @@ msgid "" "%s" msgstr "%s\na\n%s\nkopyalanamıyor" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Resim panoya kopyalanamıyor!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Yeni bir görüntü oluşturulamıyor!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" -msgstr "" +msgstr "Menüler özelleştirilemiyor!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Panodan biteşlem görüntü yapıştırılamıyor!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "İptal" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" -msgstr "" +msgstr "İptal Et\nDosya kopyalanmadı." -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." -msgstr "" +msgstr "Geri almayı onayla" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "" +msgstr "İptal Et\nÖnce çakışmaları çözümle." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Dosyadaki uyuşmayan yeni satırlar yüzünden farklılıklar gösterilemiyor." #. Resource IDs: (16926) msgid "Casca&de" -msgstr "" +msgstr "Basamaklan&dır" #. Resource IDs: (65535) msgid "Cascaded context menu" msgstr "Kademeli içerik menüsü" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Büyük-küçük harfe duyarlı" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2579,33 +2627,33 @@ msgstr "" msgid "Change log" msgstr "Değişiklik günlüğü" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" -msgstr "" +msgstr "Uygulamanın görünümünü değiştir\nGörünüm Değiştir" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Pencerenin konumunu değiştir" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Pencerenin boyutunu değiştir" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2613,38 +2661,38 @@ msgstr "" msgid "Changed Files" msgstr "Değişen Dosyalar" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Dosyalar %s, %s ile %s, %s arasında değiştirildi" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Değiştirilmiş Dosyalar: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "%s Değiştirilmiş Dosyalar " @@ -2653,15 +2701,15 @@ msgstr "%s Değiştirilmiş Dosyalar " msgid "Changes made (double-click on file for diff):" msgstr "Yapılan değişiklikler (farklılık detayları için iki kere tıklayın):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" -msgstr "" +msgstr "Uygulamanın görünümünü değiştirir" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Teslim etme metin kutularında gösterilecek sınır çizgisi için karakter pozisyonu: " -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Konrol Et" @@ -2673,31 +2721,31 @@ msgstr "Güncellemeleri kontrol et - TortoiseGit" msgid "Check For Updates..." msgstr "Güncellemeleri Kontrol Et..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Modi&fikasyonları kontrol et" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Giridiğiniz dizin ve/veya bağlantıyı kontrol ediniz." -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "TortoiseGit alt menüsü yerine üst içerik menüsünde gösterilmesini istediğiniz menü elemanlarını işaretleyiniz. " -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Günlük kayıtlarında göreceli zaman göstermek için kontrol ediniz" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Günlük kayıtlarında daha az gereksiz sözcük kullanarak tarihi ve zamanı göstermek için işaretleyiniz" @@ -2705,31 +2753,31 @@ msgstr "Günlük kayıtlarında daha az gereksiz sözcük kullanarak tarihi ve z msgid "Check:" msgstr "Kontol Et" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Çıkar(al)" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2737,11 +2785,11 @@ msgstr "" msgid "Chinese" msgstr "Çince" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "Depo Seçiniz" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2753,78 +2801,78 @@ msgstr "Temizle" msgid "Clean Type" msgstr "Temizle Türü" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Temizleniyor" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Temizleniyor." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Temizleme işlemi aşağıdaki yolları işlemede başarısız oldu:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Cleanup has successfully processed the following paths:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Temizle" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Clear Tool\nClear" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "%ld kullanıcı adı/şifresi çiftini, %ld ssl sertifikalarını ve %ld kullanıcı adlarını siler" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "%ld depolarından önbelleğe alınmış kayıtları temizler" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Kayıtlı kimlik belirleme bilgilerini siler.\nTüm depolar için tekrar kullanıcı adınızı/şifrenizi girmeniz gerekecektir. " -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "%ld diyaloglarının saklanan pozisyon ve boyut bilgilerini siler" @@ -2833,7 +2881,7 @@ msgstr "%ld diyaloglarının saklanan pozisyon ve boyut bilgilerini siler" msgid "Click here to go to the website" msgstr "Web sitesine gitmek için buraya tıklayın" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Son yazılan mesajı seçmek için buraya tıklayın" @@ -2849,17 +2897,17 @@ msgid "" "extension" msgstr "Belirli bir uzantı için alternatif birleştirme programları belirtmek için \"Gelişmiş\" 'e tıklayın" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Pano" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2867,7 +2915,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Var Olan Depoyu Çoğalt" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "Depo Kopyala" @@ -2875,53 +2923,53 @@ msgstr "Depo Kopyala" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Çoğalt..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Kapat" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Tam Ekranı Kapat" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Baskı Önizlemeyi Kapat\n&Kapat" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Elle Kapatın" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Aktif pencereyi kapatır ve dökümanları kayıt etmeniz gerektiğini söyler " -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" -msgstr "" +msgstr "Gizle" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" -msgstr "" +msgstr "Değişmemiş bölümleri kapat\nKapat" #. Resource IDs: (16662) msgid "Color" @@ -2943,7 +2991,7 @@ msgstr "Renkler:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2951,11 +2999,11 @@ msgstr "" msgid "Comman&ds:" msgstr "&Komutlar:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Komut" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Komut satırı" @@ -2963,7 +3011,7 @@ msgstr "Komut satırı" msgid "Command Line To Execute:" msgstr "Yürütülecek komut satırı:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Komut başarısız." @@ -2971,41 +3019,41 @@ msgstr "Komut başarısız." msgid "Commands" msgstr "Komutlar" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Teslim et" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "Teslim Etme Tarihi" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "Teslim Etme E-Postası" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "Teslim Etme Sonu" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "Gönderim Bilgisi" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "Teslim Etme Adı" @@ -3013,7 +3061,7 @@ msgstr "Teslim Etme Adı" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3021,19 +3069,19 @@ msgstr "" msgid "Commit to:" msgstr "Teslim et:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Teslim et..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Yaratıcıya göre teslim eder" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Tarihe göre teslim eder" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Her %s başına düşen teslim sayısı" @@ -3042,15 +3090,15 @@ msgstr "Her %s başına düşen teslim sayısı" msgid "Commits each week:" msgstr "Haftalık teslim sayısı" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Değişikliklerinizi depoya teslim eder" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3062,52 +3110,52 @@ msgstr "Versiyonlanmamış bir klasörün teslim edilmesi otomatik olarak alt ka msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" -msgstr "" +msgstr "&Baş revizyonları karşılaştır" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "İki dosya karşılaştır" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Boşlukları karşılaştır" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "&Taban ile karşılaştır" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Bir önceki revizyon ile karşılaştır" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" -msgstr "" +msgstr "Fark alırken boşluk karakterlerini karşılaştırır\nBoşluk karakterlerini karşılaştır" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Yaptığınız değişiklikleri size göstermek için dosyayı en son teslim edilen dosya ile karşılaştırır" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "%s ile %s karşılaştırılıyor" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Tamamlandı" @@ -3123,7 +3171,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3157,11 +3205,11 @@ msgstr "GNU karşılaştırma dosyasi (Yama dosyası) görüntüleyicisi ayarlar msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "Çakışma" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "Çakışan Dosyalar" @@ -3169,15 +3217,15 @@ msgstr "Çakışan Dosyalar" msgid "Conflict resolved" msgstr "Çakışma düzeltildi" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Çakıştı" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "Çakışmalar" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Çakışmalar: %d" @@ -3190,124 +3238,124 @@ msgstr "Sağ-tık Menüsü:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Devam" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Sözleşme yerleşik pencere" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" -msgstr "" +msgstr "Boşlukları sekmelere dönüştür" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" -msgstr "" +msgstr "Sekmeleri boşluklara dönüştür" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "Kop&yala" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Kopyalandı" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Kopyala" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "%s öğesini buraya kopyala: %s, Revizyon %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Kopya Aracı\nKopyala" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Bütün bilgileri panoya kopyala" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Kopyala ve tekrar adlandır" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "Günlük mesajlarını panoya kopyala" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Yolları Pano'ya kopyalama" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Seçimi Pano'ya kopya" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Seçileni kopyala ve Panoya koy\nKopyala" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Panoya Kopyala" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Kopyala: %s için yeni isim" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "%s kopyalanıyor" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Kopyalanıyor..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Düzeltmeler" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "%s aldırılmayanlar listesine eklenemedi!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Yeni versiyon kontrolü yapılamadı!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3315,76 +3363,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "%1 yaratılamadı çünkü dizin dolu." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Son gönderilen revizyona ulaşılamadı!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Durum bilgisine ulaşılamadı!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "%1 açılamadı çünkü çok fazla açık dosya bulunmakta." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Dosya açılamadı\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 silinemedi çünkü şu anki dizin." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "%s aldırılmayanlar listesinden silinemedi!" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Dosyanın bağlantısına ulaşılamadı!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "Revizyon %s, %s dosyasını alamadı.\nYama işlemi mümkün değil!" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "TortoiseGitBlame başlatılamadı" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3392,7 +3440,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3400,7 +3448,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3408,11 +3456,11 @@ msgid "" "%s" msgstr "Harici Birleştirme programı başlatılamadı!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Çıktı alma işlemi başlatılamadı." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3420,11 +3468,11 @@ msgid "" "%s" msgstr "Metin görüntüleyicisi başlatılamadı!\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Ek şerit başlatılamadı!" @@ -3432,7 +3480,7 @@ msgstr "Ek şerit başlatılamadı!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3445,15 +3493,15 @@ msgstr "Kütüphane &Oluştur" msgid "Create .gitignore file" msgstr ".gitignore dosyası oluştur" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "Bu sürümde dal oluştur..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "Dal Oluştur..." @@ -3465,29 +3513,29 @@ msgstr "Değişiklik Listesi Oluştur" msgid "Create New Branch" msgstr "Yeni Dal Oluştur" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "Paket Serisi Oluştur..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "Bu sürümde etiket oluştur..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "Etiket Oluştur..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "Yeni belge yarat\nYeni" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3496,49 +3544,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" -msgstr "" +msgstr "Yama dosyası oluştur" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "Burada depo &yarat.." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "Yaratıldı" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "İki dosyanın farklarından bir yama dosyası yaratır.\nYama dosyası yarat" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Şu anki yerde depo veritabanı oluşturur" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Yaptığınız tüm değişikliklerle birleştirilmiş bir karşılaştırma dosyası oluşturur" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3550,7 +3598,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "Ke&s" @@ -3558,7 +3606,7 @@ msgstr "Ke&s" msgid "Current" msgstr "Geçerli" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Şu anki Dal" @@ -3566,7 +3614,7 @@ msgstr "Şu anki Dal" msgid "Current Branch:" msgstr "Şu anki Dal:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3578,7 +3626,7 @@ msgstr "" msgid "Current version is:" msgstr "Şu anki versiyon:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Şu anki versiyon: %s" @@ -3591,7 +3639,7 @@ msgstr "Kişiselleş&tir..." msgid "Custom" msgstr "Özel" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Kişiselleştir" @@ -3599,19 +3647,19 @@ msgstr "Kişiselleştir" msgid "Customize Keyboard" msgstr "Klavyeyi Özelleştir" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Hızlı Erişim Araç Çubuğunu Özelleştir" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Hızlı Erişim Araç Çubuğunu Özelleştir..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "Özelleştir..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3625,88 +3673,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Tarih" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Varsayılan" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Varsayılan Menü" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Varsayılan uygulama menüsü. Hiçbir belge açık değilken görünür." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "UTF-8 kodlamasına dön" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Sil" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "%d elemanı sil ve isme göre al&dırma" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "Sil ve &aldırmama listesine ekle" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "%d kalemleri &uzantısına göre sil veya atla" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "Kol/Etiket sil" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3714,34 +3766,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "Alt modülü sil" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." -msgstr "" +msgstr "Sil\nDosya silinir." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Silindi" @@ -3749,36 +3801,36 @@ msgstr "Silindi" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Siler ve seçili dosya(ları) veya dosya maskelerini 'aldırılmayanlar' listesine ekler" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "İşlem günlük dosyasını siler" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Siliniyor" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Önbelleğe alınmış veri siliniyor" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Dosya siliniyor" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3788,7 +3840,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Derinlik" #. Resource IDs: (65535) msgid "Describe" @@ -3798,7 +3850,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Açıklama" @@ -3806,7 +3858,7 @@ msgstr "Açıklama" msgid "Description:" msgstr "Açıklama:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Değişiklik listesini seçme" @@ -3814,33 +3866,33 @@ msgstr "Değişiklik listesini seçme" msgid "Destination" msgstr "Hedef" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Hedef disk sürücüsü dolu." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" -msgstr "" +msgstr "Taşınmış blokları tespit et ve vurgula" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3854,11 +3906,15 @@ msgstr "Diyalog boyutları ve konumları" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Fark Seçenekleri" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "İki Teslimi Karşılaştır" @@ -3890,7 +3946,7 @@ msgstr "Karşılaştırma dosyası:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3902,12 +3958,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3920,19 +3976,19 @@ msgstr "Arasındaki farklılık" msgid "Diffing" msgstr "Karşılaştırma" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "Klasör..." @@ -3944,26 +4000,26 @@ msgstr "Dizin:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "%1 'e erişilirken disk dolu." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Gönderme hatası: %1" @@ -3972,44 +4028,52 @@ msgstr "Gönderme hatası: %1" msgid "Display &buttons in this order" msgstr "Düğmeleri &bu sırayla görüntüle" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Seçili butonlar, menüler ve pencereler için yardım dosyasını göster\nYardım" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Şu anki işlem yada komutla ilgili yardım dosyasını göster\nYardım" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Yardımın nasıl kullanılıcağını gösteren metni göster\nYardım" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Program bilgisi, versiyon numarası ve kullanım telif hakklarını göster\nHakkında" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "Alt modülleri otomatik seçme" @@ -4022,54 +4086,71 @@ msgstr "Aşağıdaki yollar için içerik menüsünü gösterme:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "'%s' araç çubuğunu gerçekten silmek istiyor musunuz?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Bu dosyayı gerçekten de bu klasöre taşımak istiyor musunuz?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "\"%s\" siliniyor. Emin misiniz ?" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,7 +4158,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4085,21 +4166,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "Uzakta yeni dallar eklendi. Uzak dalları almak ister misiniz?" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" -msgstr "" +msgstr "Değiştirilen dosyaları yüklemek istiyor musunuz?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4107,21 +4188,21 @@ msgid "" "as resolved?" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" -msgstr "" +msgstr "Otomatik kaydedilen bu belgeleri geri döndürmek istiyor musunuz?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Yapılan ayar değişikliklerini görmek için tüm dokümanları tekrar yüklemek istiyor musunuz?\nNot: Kayıt etmediyseniz yaptığınız değişiklikler silinir!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "Değişiklikleri görmek istiyor musunuz ?" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "Şimdi pop saklamak istiyor musunuz?" @@ -4129,42 +4210,42 @@ msgstr "Şimdi pop saklamak istiyor musunuz?" msgid "Document :" msgstr "Döküman:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" -msgstr "" +msgstr "Otomatik kaydedilen belgeleri geri döndürme\nBelgelerin açık bir şekilde kaydedilen en son versiyonlarını kullan" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" -msgstr "" +msgstr "Kaydetme\nDeğişiklikleri kaydetmeden görünümleri yeniden yükle" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Bu mesajı tekrar gösterme" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "Tamam" @@ -4176,7 +4257,7 @@ msgstr "Aşağı" msgid "Download" msgstr "İndir" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Bu menüyü kaydırmak için sürükleyin" @@ -4204,6 +4285,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "Bu &yolları hariç tut:" @@ -4212,7 +4297,7 @@ msgstr "Bu &yolları hariç tut:" msgid "E&xit" msgstr "Çı&kış" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Dışa aktar..." @@ -4232,11 +4317,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "Doğu Avrupa" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Düzenle" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4252,23 +4337,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Buton Resmini Düzenle" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "Notları Düzenle" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Yazarı düzenle" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Belirli bir uzantının karşılaştırma programını düzenle" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Belirli bir uzantının birleştirme programını düzenle" @@ -4280,11 +4365,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Günlük mesajını düzenle" @@ -4304,25 +4389,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Proxy sunucusunun ismini yada IP'sini giriniz" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Elips Araçları\nElips" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "ePosta" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4330,9 +4415,9 @@ msgstr "" msgid "Empty" msgstr "Boş" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" -msgstr "" +msgstr "Düzenlemeyi etkinleştir" #. Resource IDs: (1510) msgid "Enable EditorConfig" @@ -4346,7 +4431,7 @@ msgstr "" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4355,10 +4440,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Sağlanan Simge Yöneticileri" @@ -4367,35 +4456,35 @@ msgstr "Sağlanan Simge Yöneticileri" msgid "Encode" msgstr "Şifrele" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" -msgstr "" +msgstr "Kodlama" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "%1 'e erişilirken bir donanım I/O hatası ile karşılaşıldı" -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "%1 'e erişilirken bir kilitleme ihlaliyle karşılaşıldı." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "%1 'e erişilirken bir paylaşım ihlali oluştu." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Uygun olmayan bir argümanla karşılaşıldı." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "%1 'i okurken beklenilmeyen bir hata ile karşılaşıldı." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "%1 'e yazarken beklenilmeyen bir hata ile karşılaşıldı." @@ -4408,11 +4497,11 @@ msgstr "" msgid "End" msgstr "Son" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" -msgstr "" +msgstr "Satır Sonu Biçemi" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Pencereyi tam ekran boyutuna büyüt" @@ -4420,23 +4509,23 @@ msgstr "Pencereyi tam ekran boyutuna büyüt" msgid "Enter Log Message" msgstr "Günlük Mesajı Giriniz" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Bağlantı Giriniz" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Bir GUID girin." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Para birimi girin" -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Bir tarih ve/veya saat girin." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Bir Tarih girin." @@ -4444,90 +4533,90 @@ msgstr "Bir Tarih girin." msgid "Enter a name for the changelist:" msgstr "Değişim listesi için bir &ad giriniz:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "%1 ve %2 arasında bir sayı giriniz." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Bir sayı girin." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Pozitif bir tam sayı girin." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Bir saat girin." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "%1 ve %2 arasında bir tam sayı girin." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "0 ve 255 arasında bir tam sayı giriniz." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Bir tam sayı girin." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Dosya içeriğini test için aşağıya girin:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Günlük mesajı &giriniz:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "%1 den fazla karakter girmeyin." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Aşağıya düzenli ifadeyi girin:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Herşeyi Sil\nHepsini Sil" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Seçileni Sil\nSil" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Hata" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Kabuk Simge Önbelleğini tekrar oluştururken hata!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "%1s\n%s kütüğünün anahtarı okunurken/yazılırken hata oluştu" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4537,28 +4626,28 @@ msgstr "Çalıştırılabilir (*.exe)|*.exe|Komu (*.com)|*.com|Bilgi (*.pdf)|*.p msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Mevcut" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Çıkış" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Genişlet (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Küçültülmüş pencereyi genişlet" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "İncele" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Dışa aktar" @@ -4566,36 +4655,36 @@ msgstr "Dışa aktar" msgid "Export Zip File" msgstr "Zip Dosyasını Dışarı Aktar" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Dışa aktarma klasörü:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "Bu versiyonu dışarı al..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Versiyonlanmamış dosyaları da dışa aktar" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Dışa aktarılıyor %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Dışa aktarılıyor..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Uzantı" @@ -4611,7 +4700,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Harici" @@ -4619,101 +4708,101 @@ msgstr "Harici" msgid "External Program:" msgstr "Harici Program:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" -msgstr "" +msgstr "Azal" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Geri dönülemedi" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Bağlantı hatası.\nBağlantı kopuk olabilir." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "ActiveX nesnesi dönüştürülemedi." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Boş döküman yaratılamadı." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Nesne oluşturulamadı. Uygulamanın sistem kayıtlarına yazıldığına emin olun." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Yardım dosyası açılamadı." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Sunucu uygulaması çalıştırılamadı." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Döküman açılamadı." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Sunucu işlemi gerçekleştirilemedi." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Döküman kaydedilemedi." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Değişiklik listesinin değiştirilmesi/silinmesi gerçekleştirilemedi '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Sorun takip COM sağlayıcısı çalıştırılamadı '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Başarısız!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4721,62 +4810,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Getir/Al" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "SVN kaynağından al" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "Getir..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Dosyaya ulaşılıyor..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Dosyanın %s revizyonuna ulaşılıyor:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Dosya" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" -msgstr "" +msgstr "Dosya Kodlaması" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Her %s başına düşen dosya değişikliği" @@ -4785,27 +4874,27 @@ msgstr "Her %s başına düşen dosya değişikliği" msgid "File changes each week:" msgstr "Haftalık dosya değişim sayısı" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Dosya farklılıkları" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" -msgstr "" +msgstr "Dosyada çakışma yok" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." -msgstr "" +msgstr "Dosya boş." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Dosya listesi boş." -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Dosya yamaları" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4817,7 +4906,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dosya Boyutu:\t\t%s (%s)\nGenişlik:\t\t\t%ld piksel\nYükseklik:\t\t\t%ld piksel\nYatay Çözünürlük:\t%.1f dpi\nDikey Çözünürlük:\t%.1f dpi\nDerinlik:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4837,7 +4926,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dosya Boyutu:\t\t%s (%s)\nGenişlik:\t\t\t%ld piksel\nYükseklik:\t\t\t%ld piksel\nYatay Çözünürlük:\t%.1f dpi\nDikey Çözünürlük:\t%.1f dpi\nDerinlik:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nDosya Boyutu:\t\t%s (%s)\nGenişlik:\t\t\t%ld piksel\nYükseklik:\t\t\t%ld piksel\nYatay Çözünürlük:\t%.1f dpi\nDikey Çözünürlük:\t%.1f dpi\nDerinlik:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4849,7 +4938,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dosya Boyutu:\t\t\t%s (%s)\nGenişlik:\t\t\t%ld piksel\nYükseklik:\t\t\t%ld piksel\nYatay Çözünürlük:\t%.1f dpi\nDikey Çözünürlük:\t\t%.1f dpi\nDerinlik:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4869,7 +4958,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Dosya Boyutu:\t\t\t%s (%s)\nGenişlik:\t\t\t%ld piksel\nYükseklik:\t\t\t%ld piksel\nYatay Çözünürlük:\t%.1f dpi\nDikey Çözünürlük:\t\t%.1f dpi\nDerinlik:\t\t\t%d bit\nZoom:\t\t\t%d%%\n\nDosya Boyutu:\t\t\t%s (%s)\nGenişlik:\t\t\t%ld piksel\nYükseklik:\t\t\t%ld piksel\nYatay Çözünürlük:\t%.1f dpi\nDikey Çözünürlük:\t\t%.1f dpi\nDerinlik:\t\t\t%d bit\nZoom:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Dosya Adı" @@ -4877,17 +4966,17 @@ msgstr "Dosya Adı" msgid "Files" msgstr "Dosyalar" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Doldurma Aracı\nDoldurma" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Filtrele" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Filtre yolları" @@ -4899,11 +4988,11 @@ msgstr "Filtre:" msgid "Filter: " msgstr "Filtre:" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Bul" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4913,17 +5002,17 @@ msgstr "Belirtilen metni bul\nBul" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4931,23 +5020,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "Bitir" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Tamamlandı!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Üst" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Sadece Üst" @@ -4956,18 +5045,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Disket sürücüler (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Klasör" @@ -4979,38 +5068,34 @@ msgstr "Ad değişiklerini takip et" msgid "Font" msgstr "Font:" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Yardım için F1 tuşuna basın. Yatay olarak ilerlemek için Ctrl-KaydırmaÇubuğunu kullanın" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Önceki tüm işlemleri görmek için 'Kopyalamada/Tekrar adlandırmada dur' işaretini kaldırın" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Zorla" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5028,20 +5113,20 @@ msgstr "" msgid "Format Patch" msgstr "Yama Biçimi" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "Yama Düzenle..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "İleri" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5049,7 +5134,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Otomatik kelimeler bulundu:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5071,11 +5156,11 @@ msgstr "" msgid "From SVN Repository" msgstr "SVN Deposundan" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5083,7 +5168,7 @@ msgstr "" msgid "From:" msgstr "Buradan:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Tam Ekran" @@ -5091,7 +5176,7 @@ msgstr "Tam Ekran" msgid "Full text search" msgstr "Metin arama" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Tamamen özyineli" @@ -5099,7 +5184,7 @@ msgstr "Tamamen özyineli" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5107,24 +5192,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "GB2312 (Sadeleştirilmiş)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ başlatılamadı!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ bitmap objesi yaratamadı. Belki de yeterli bellek yok." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Bilgi getiriliyor. Lütfen bekleyin..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5154,43 +5239,43 @@ msgstr "Genel::İçerik Menüsü" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Genel::Diyalog Ayarları 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Genel::Diyalog Ayarları 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Genel::Diyalog Ayarları 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Günlük dosyalarını birleştir" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "%s dosyasını getir" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "%s dosyasının, %s uyarlamasını getir" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Bilgi getiriliyor..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "İstenilen bilgi getiriliyor..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Birleştirilmiş karşılaştırma dosyası getiriliyor" @@ -5202,23 +5287,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git Kopyala ve dosyaları Çalışan Kopyaya ekle" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git versiyonlanmış elemanı buraya Kopyala ve yeniden adlandır" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git versiyonlanmış eleman(lar)ı buraya Kopyala" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git tüm elemanları buraya Dışa Aktar" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git versiyonlanmış elemanları buraya Dışa Aktar" @@ -5226,35 +5311,35 @@ msgstr "Git versiyonlanmış elemanları buraya Dışa Aktar" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git Kaydı" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git versiyonlanmış elemanı buraya taşı ve yeniden adlandır" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git versiyonlanmış eleman(lar)ı buraya taşı" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5266,31 +5351,31 @@ msgstr "Git Eşleme" msgid "Git clone - TortoiseGit" msgstr "Git clone - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5311,59 +5396,59 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" #. Resource IDs: (155) msgid "Go To Line" -msgstr "" +msgstr "Satıra Git" #. Resource IDs: (221) msgid "Go to line" msgstr "Satıra git" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Bir sonraki çakışmaya git\nSonraki çakışma" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Bir sonraki farklılığa git\nSonraki farklılık" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" -msgstr "" +msgstr "Bir sonraki satır içi farklılığa git\nSonraki satır içi farklılık" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Bir önceki çakışmaya git\nÖnceki çakışma" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Bir önceki farklılığa git\nÖnceki farklılık" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" -msgstr "" +msgstr "Satıra Git" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Diyagram" @@ -5379,11 +5464,11 @@ msgstr "Gri" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Değişiklik listelerini grupla" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5399,7 +5484,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5411,7 +5496,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Yardım" @@ -5435,11 +5520,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Versiyonlanmamış dizinler için menüleri gizle" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Eklenmiş pencereyi gizle" @@ -5447,25 +5532,25 @@ msgstr "Eklenmiş pencereyi gizle" msgid "Hide the script while running" msgstr "Çalışırken komutu gizle" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" -msgstr "" +msgstr "Yama dosyası listesini göster/sakla" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Yama dosyası listesini göster/sakla\nYama dosyası listesini gösterir yada saklar" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5475,7 +5560,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "İpucu: içerik menüsünü seçin, 'Commands' sayfasını açın ve araç çubuğu düğmelerini menü penceresine sürükleyin." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Anasayfa" @@ -5491,7 +5576,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Çengel Komutları::Sorun Takip Entegrasyonu" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Yakalayıcı türü" @@ -5505,9 +5590,9 @@ msgstr "Bu dizi&nleri dahil et:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5515,55 +5600,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5571,15 +5657,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5603,7 +5689,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5611,7 +5697,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5619,7 +5705,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5627,16 +5713,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5647,17 +5733,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5669,7 +5755,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5733,7 +5819,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Simge Ayarları" @@ -5745,7 +5831,7 @@ msgstr "Simge Ayarları::Simge Seti" msgid "Icon Overlays::Overlay Handlers" msgstr "Simge Ayarları::Simge Seti" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5755,52 +5841,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Simgeler/Tasarım/Kodlama:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Etkinleştirildiğinde, işaretlerin ve sağ-tık menüsünün 'arklı kaydet..' ya da 'aç' diyaloglarını göstermesini engeller" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Eğer seçilmişse, kayıt listesindeki bir revizyonu çift tıklayarak, onu önceki revizyon ile karşılaştırır" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "İşaretlendiğinde, teslim diyaloğunda bir hatadan sonra tekrar otomatik olarak başlayacaktır,\nson seçim ve günlük mesajı korunacak." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Etkinse, yeni sürümün kullanılabilir olduğunu haftada bir kez TortoiseGit'i kontrol et" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "İşaretlendiğinde, versiyonlanmamış klasörlerin içindeki dosyalar durum kontrolünde gösterilir.\nDurum kontrolü örneğin teslim diyalogunda kullanılır." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5813,18 +5899,18 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Aldırma" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "%d elemana uzantısına göre al&dırma" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" -msgstr "" +msgstr "Yorumları Yoksay" #. Resource IDs: (1692) msgid "Ignore File" @@ -5834,27 +5920,27 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" -msgstr "" +msgstr "Boşluk karakteri değişikliklerinin tümüne aldırma" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" #. Resource IDs: (1067) msgid "Ignore case cha&nges" -msgstr "" +msgstr "Büyük/küçük harf değişiklikleri&ne aldırma" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." -msgstr "" +msgstr "Değişiklikleri yoksay\nHarici değişiklikleri yoksay." #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" @@ -5868,11 +5954,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Satır &sonlarına aldırma (önerilir)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5880,33 +5966,33 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" -msgstr "" +msgstr "Boşluk karakteri değişikliklerine aldırma" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Aldırılmayan" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" -msgstr "" +msgstr "Fark alırken boşluk karakterlerindeki değişiklerinin tümüne aldırmaz\nBoşluk karakteri değişikliklerinin tümüne aldırma" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" -msgstr "" +msgstr "Fark alırken boşluk karakterlerindeki değişiklere aldırmaz\nBoşluk karakteri değişikliklerine aldırma" #. Resource IDs: (16916) msgid "Image &and Text" @@ -5920,24 +6006,24 @@ msgstr "Görüntü ve y&azı" msgid "Images" msgstr "Görseller" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Mevcut alt elemanlar, klasörler dahil" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "İçeri aktar" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "%s öğesini buraya içe aktar: %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5946,16 +6032,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Dosyayı %s'a içe aktar" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5977,26 +6063,26 @@ msgstr "" #. Resource IDs: (65535) msgid "Include only the following revision range:" -msgstr "" +msgstr "Sadece bu revizyon aralığını dahil et" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Geçersiz dosya adı." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "İlk içe aktarım" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" -msgstr "" +msgstr "Satır içi karşılaştırma" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "" @@ -6008,25 +6094,25 @@ msgstr "Satıriçi farklılıklar" msgid "Input" msgstr "Giriş" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Pano içeriğini ekle\nYapıştır" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "İşlemi gerçekletirmek için yetersiz bellek." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "İçsel uygulama hatası." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Geçersiz Sürüm." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6034,7 +6120,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6043,7 +6129,7 @@ msgstr "Dosya ismini sadece harfleri büyük ya da küçük harf yaparak değiş #. Resource IDs: (1074) msgid "J&ump to first conflict when loading" -msgstr "" +msgstr "&Yüklerken ilk çakışmaya atla" #. Resource IDs: (65535) msgid "Japanese" @@ -6057,7 +6143,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6065,11 +6151,11 @@ msgstr "" msgid "Keep changelists" msgstr "Değişiklik listesi koru" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6083,7 +6169,7 @@ msgstr "Klavye" msgid "Keyboard shortcuts:" msgstr "Klavye kısa yolları:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Tuşlar" @@ -6125,21 +6211,41 @@ msgstr "SATIR8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Dil:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "Son Düzenleme" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "Son Düzenleme:" @@ -6147,7 +6253,11 @@ msgstr "Son Düzenleme:" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6155,17 +6265,17 @@ msgstr "" msgid "Least active author:" msgstr "En az etkin olan yazar:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" -msgstr "" +msgstr "Çakışmış olarak bırak\nDosyanın çakışma durumu korunur" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Sol Görünüş:" @@ -6173,30 +6283,30 @@ msgstr "Sol Görünüş:" msgid "Left image" msgstr "Soldaki resim" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Çizgi grafiği" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" -msgstr "Satır aracı ⏎ Satır" +msgstr "Satır aracı\nSatır" #. Resource IDs: (32853) msgid "Line diff bar" -msgstr "" +msgstr "Satır karşılaştırma çubuğunu göster " #. Resource IDs: (65535) msgid "Line differences" msgstr "Dizin farklılıkları" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" -msgstr "" +msgstr "Satır %ld satırından taşındı" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "" @@ -6209,26 +6319,26 @@ msgstr "" msgid "Line:" msgstr "Satır:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Dizin: %*ld " -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "Eklenen Satır" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "Silinen Satır" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Yardımı Konuları Listesi\nYardım Konuları" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6246,23 +6356,23 @@ msgstr "Resimleri yükle" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6270,13 +6380,13 @@ msgstr "" msgid "Local Branch" msgstr "Yerel Dal" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Yerel durum" @@ -6284,7 +6394,7 @@ msgstr "Yerel durum" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6292,9 +6402,9 @@ msgstr "" #. Resource IDs: (32854) msgid "Locator Bar" -msgstr "" +msgstr "Konum Bulma Çubuğu" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Günlük" @@ -6334,12 +6444,12 @@ msgstr "İleti günlüğü (Günlük diyaloğunu göster)" msgid "Login:" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Gösterilen en düşük revizyon: %ld - Gösterilen en yüksek revizyon: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6350,26 +6460,22 @@ msgstr "Gösterilen en düşük revizyon: %ld - Gösterilen en yüksek revizyon: msgid "Lum" msgstr "Aydınlık" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "E-Posta" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "Posta sistemi DLL dosyası geçersiz." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6382,47 +6488,47 @@ msgstr "&Yönet" msgid "Manage" msgstr "Yönet" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Çözüldü olarak işaratle" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" -msgstr "" +msgstr "Çözüldü olarak işaretle\nDosya durumu güncellendi durumuna çevrilir" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Karşılaştırma için işaretle" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "Dosyayı Git'de çözümlendi olarak işaretler\nÇözümlendi olarak işaretle" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "&Diziyi bul" @@ -6446,7 +6552,7 @@ msgstr "Me&nüler önce en son kullanılan komutları gösteriyor" msgid "Menu" msgstr "Menü" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Menü Çubuğu" @@ -6454,7 +6560,7 @@ msgstr "Menü Çubuğu" msgid "Menu s&hadows" msgstr "Menü &gölgeleri" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Birleştir" @@ -6462,34 +6568,34 @@ msgstr "Birleştir" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Yeniden Entegre Ederek Birleştir" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Birleştirildi" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6497,22 +6603,22 @@ msgstr "" msgid "Merging" msgstr "Birleştiriliyor" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "%s, revizyon %s şuraya birleştiliriyor: %s, revizyon %s şuraya: %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Birleştirme için farklı revizyonlar yada 'From:' ve 'To:' kısımlarında farklı URL'ler gerekir " -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "%s, %s revizyonlarını şuraya birleştiriyor: %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Mesaj" @@ -6522,9 +6628,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "M&esaj bölümü ifadesi:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Mesajlar" @@ -6532,23 +6638,27 @@ msgstr "Mesajlar" msgid "Min" msgstr "Min" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Benim" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Şeriti Küçült" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Teslim etme mesajı için asgari karakter adedi:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Çeşitli" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Karışık" @@ -6556,35 +6666,35 @@ msgstr "Karışık" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Değiştirilme tarih:" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Değiştirilmiş" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Daha fazla" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Daha Fazla Buton" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Daha fazla komut..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Daha fazla renk..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Daha fazla..." @@ -6604,41 +6714,41 @@ msgstr "&Aşağı Taşı" msgid "Move &Up" msgstr "&Yukarı Taşı" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Öğeyi Aşağı Taşı" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Öğeyi Yukarı Taşı" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Taşı ve yeniden adlandır" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Değişim listesine taşı" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Taşı/Tekrar adlandır" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Taşı : %s için yeni isim" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Revizyona dönmeden önce güncellenmiş dosyaları geri dönüşüm kutusuna taşır" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "%s Taşınıyor" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Taşınıyor..." @@ -6646,11 +6756,11 @@ msgstr "Taşınıyor..." msgid "My file:" msgstr "Benim dosyam:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "Ad" @@ -6660,9 +6770,9 @@ msgstr "&Ad:" #. Resource IDs: (156) msgid "Navigate" -msgstr "" +msgstr "Dolaş" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6672,11 +6782,11 @@ msgstr "" msgid "Navigation Pane Options" msgstr "Navigasyon Penceresi Seçenekleri" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Navigasyon Penceresi Seçenekleri..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "İçiçe yerleştirilmiş" @@ -6688,7 +6798,7 @@ msgstr "Ağ Ayarları" msgid "Network::Email" msgstr "Ağ::E-Posta" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Yeni" @@ -6697,43 +6807,43 @@ msgid "New &name:" msgstr "Yeni &isim:" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Yeni Dal\\Etiket" +msgid "New Branch/Tag" +msgstr "Yeni Dal/Etiket" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Yeni Menü" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "%s için yeni isim" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Yeni isim:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6741,33 +6851,29 @@ msgstr "" msgid "Next" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Sonraki Sayfa\nSonraki Sayfa" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" -msgstr "" +msgstr "Sonraki çakışma" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" -msgstr "" +msgstr "Sonraki fark" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" -msgstr "" - -#. Resource IDs: (73) -msgid "No" -msgstr "Hayır" +msgstr "Sonraki satıriçi farklılık" #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6779,102 +6885,107 @@ msgstr "Çıkar/Al Yok" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Komut değeri belirtilmedi" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Farklılık bulunamadı!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Hata mesajı bulunamadı" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Hata oluşmadı." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Değiştirilmiş klasör yada dosya bulunamadı. TortoiseGit'in geri dönebileceği bir şey yok!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Geçerli ayarla gösterilebilecek dosya yok\nVersiyonlanmamış, aldırılmayan ve/veya değiştirilmemiş dosyaları görmek için aşağıdaki bir veya daha fazla ayarı kontrol edin.\nUzaktaki değişiklikleri görmek için, 'Depoyu Kontrol Et'e tıklayın" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Bir önceki teslim etmeden buyana değiştirilmiş yada\neklenmiş dosya bulunamadı. TortoiseGit'in\nburada yapabileceği bir şey yok..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Son teslimden beri hiçbir dosya değişmedi.\nBu durumda TortoiseGit'in yapacağı bir şey yok...\nVersiyonlanmamış dosyaları görmek ister misiniz?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" -msgstr "" +msgstr "Mevcut bir diyagram bulunmamakta" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "%s için resim kodlayıcısı bulunamadı." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Yazım düzeltmeleri yok" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Durum önbelleği mevcut değil. Sadece versiyonlu klasörler işaretlenir, dosyalar işaretlenmez" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Eşanlamlı önerisi bulunmamakta" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6882,11 +6993,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Hiçbiri" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Normal" @@ -6898,30 +7009,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "Tüm dosyaları indirilemedi ve doğrulanmadı." -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Sistem kütüğüne girilen bileşenlerin (yada INI dosyalarının) hepsi silinemedi." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "İşlemi bitirebilmek için yeterli hafıza yok." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." -msgstr "" +msgstr "Yetersiz bellek!\nRevizyon düğümleri kapatarak veya yakınlaştırma etmenini azaltarak\ngrafiğinin boyutunu küçültmeyi deneyin." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6929,12 +7040,12 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " "not recover the auto-saved versions, they will be deleted." -msgstr "" +msgstr "Otomatik kaydedilen belgeleri geri döndürmeyi seçerseniz, orjinal belgenin üzerine yazacak şekilde açıkça kaydetmelisiniz. Otomatik kaydedilen versiyonları geri döndürmeyi seçmezseniz, belgeler silinir." #. Resource IDs: (65535) msgid "Note: These settings also apply to the Patch Viewer dialog." @@ -6948,26 +7059,26 @@ msgstr "Not: klasör versiyonlanmamış elemanlar içeriyor" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "Notlar" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "Teslim edilecek bir şey yok" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Duyuru" @@ -6975,7 +7086,7 @@ msgstr "Duyuru" msgid "Number Commits" msgstr "Sayı Teslim Et" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "%s adedi" @@ -6988,7 +7099,7 @@ msgstr "Yazar sayısı:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7060,41 +7171,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "Tamam" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" -msgstr "" +msgstr "Office 2007 renkleri" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7102,15 +7213,15 @@ msgstr "" msgid "Older lines" msgstr "Daha eski satırlar" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "Gerektiğinde" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." -msgstr "" +msgstr "Bir veya daha fazla otomatik kaydedilen belge bulundu" -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Bir yada daha fazla dosya çakışır durumunda." @@ -7122,29 +7233,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Sadece dosya alt öğeleri" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Sadece numara girebilirsiniz (isterseniz virgül ile ayırabilirsiniz)" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Yalnız bu öğe" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Aç" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7154,51 +7265,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Panodan aç" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Resim dosyasını aç..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Bir üst klasörü Aç" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Farklı Aç..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Yardımı Açar\nYardım Konuları" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Seçenek" @@ -7207,30 +7319,30 @@ msgid "Options" msgstr "Seçenekler" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Ori&jinal boyutu" +msgid "Ori&ginal size\tS" +msgstr "Ori&jinal boyutu\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Diğer görev bölmeleri" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Diğerleri" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Yetersiz hafıza." @@ -7238,7 +7350,7 @@ msgstr "Yetersiz hafıza." msgid "Output Directory" msgstr "Çıktı Dizini" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7246,20 +7358,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Sayfa %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7270,15 +7386,15 @@ msgstr "Sayfa %u\nSayfalar %u-%u\n" msgid "Page :" msgstr "Sayfa:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Parametreler" @@ -7286,25 +7402,25 @@ msgstr "Parametreler" msgid "Parameters:" msgstr "Parametreler:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "Üst 1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "Üst 2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7314,41 +7430,41 @@ msgstr "" #. Resource IDs: (4585) msgid "Password" -msgstr "" +msgstr "Şifre" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Parola:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" +msgstr "Yapıştır" + +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "Son Mesajı Yapıştır" +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Yapıştıma Aracı\nYapıştır" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Dosya adı listesi yapıştır" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "svn dizinini panodan yapıştırarak taşıma (kes) ya da kopyalama işlemine neden olur" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "Yama" @@ -7364,54 +7480,54 @@ msgstr "&Seçili elemanı yamala" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" -msgstr "" +msgstr "Tüm dosyaları yamala" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" -msgstr "" +msgstr "Seçili dosyaları yamala" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" -msgstr "" +msgstr "Yamalanıyor" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Dizin" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." -msgstr "" +msgstr "Yamaya daha iyi uyan dizin yolu bulundu." #. Resource IDs: (1580, 65535) msgid "Path:" msgstr "Dizin:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Dizinler" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Kalem Aracı\nKalem" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Yaratıcı yüzdesi" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Yüzdeler" @@ -7419,24 +7535,24 @@ msgstr "Yüzdeler" msgid "Personalized Menus and Toolbars" msgstr "Kişiselleştirilmiş Menü ve Araç Çubukları" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7446,56 +7562,56 @@ msgstr "Resim (Meta dosyası)\nbir resim" msgid "Picture:" msgstr "Resim:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Diyagram (Yuvarlak)" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Lütfen çalıştırılacak yakalayıcı komut dosyasını giriniz." -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Lütfen Komut-dosyasını uygulamak istediğiniz dizini giriniz." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Lütfen yakalayıcı türünü belirtiniz" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Iptal işlemi yapılırken lütfen bekleyiniz..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Farklılıkları alana kadar lütfen bekleyiniz..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Lütfen bekleyiniz..." @@ -7511,11 +7627,11 @@ msgstr "Port :" msgid "Port:" msgstr "Port :" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Teslim-sonrası yakalayıcısı" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Gönderim Sonrası Kancası" @@ -7523,23 +7639,23 @@ msgstr "Gönderim Sonrası Kancası" msgid "Pre&v Page" msgstr "&Önceki Sayfa" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Teslim-öncesi yakalayıcısı" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Gönderim Öncesi Kancası" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "" @@ -7551,11 +7667,11 @@ msgstr "&Yeni Kısayolu Tuşuna Basın:" msgid "Press &new shortcut key:" msgstr "&Yeni kısayol tuşuna basın:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Önizleme" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Yamalanmış dosyayı önizle" @@ -7567,51 +7683,51 @@ msgstr "Önizleme:" msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Önceki Sayfa\nÖnceki Sayfa" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" -msgstr "" +msgstr "Önceki çakışma" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" -msgstr "" +msgstr "Önceki fark" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" -msgstr "" +msgstr "Önceki satıriçi farklılık" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Yazdır" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Belgeyi Yazdır\n&Yazdır" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Dosyaya Yazdır" @@ -7619,7 +7735,7 @@ msgstr "Dosyaya Yazdır" msgid "Printer :" msgstr "Yazıcı:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Yazıcı Dosyaları (*.prn)|*.prn|Tüm dosyalar (*.*)|*.*||" @@ -7627,11 +7743,11 @@ msgstr "Yazıcı Dosyaları (*.prn)|*.prn|Tüm dosyalar (*.*)|*.*||" msgid "Printing" msgstr "Yazdırılıyor" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Program" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Programlar (*.exe)|*.exe|Tüm dosyalar (*.*)|*.*||" @@ -7639,11 +7755,11 @@ msgstr "Programlar (*.exe)|*.exe|Tüm dosyalar (*.*)|*.*||" msgid "Progress" msgstr "Durum" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" -msgstr "" +msgstr "Proje" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Özellik" @@ -7651,17 +7767,17 @@ msgstr "Özellik" msgid "Property Page" msgstr "Özellik Sayfası" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Sağlayıcı" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "Para&metreleri girin:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "Sağlayıcı uuid win&32:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7683,15 +7799,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Çek" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "Çek.." @@ -7699,19 +7815,19 @@ msgstr "Çek.." msgid "Pull/Fetch" msgstr "Çek/İndir" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Yolla" @@ -7727,11 +7843,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "Gönder" @@ -7739,22 +7855,22 @@ msgstr "Gönder" msgid "Putty Key:" msgstr "Puyyt Anahtarı:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Uygulamadan çıkış; dökümanlarınızı kayıt etmenizi hatırlatır\nÇıkış" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7772,11 +7888,15 @@ msgstr "R&AM sürücüleri" msgid "R&eset" msgstr "R&eset" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "Bu revizyona geri&dön" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "Tekrar Konumlandır" @@ -7784,7 +7904,7 @@ msgstr "Tekrar Konumlandır" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7806,7 +7926,7 @@ msgstr "" msgid "Re&movable drives" msgstr "T&aşınabilir sürücüler" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Tekrar ad&landır..." @@ -7822,15 +7942,15 @@ msgstr "Hep&sini sıfırla" msgid "Re&store defaults" msgstr "Var&sayılanları yükle" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "Geri&dön..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Takılmadan önce günlük kullanım kılavuzunu okuyunuz..." @@ -7838,21 +7958,21 @@ msgstr "Takılmadan önce günlük kullanım kılavuzunu okuyunuz..." msgid "Rebase" msgstr "Tekrar Konumlandır" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "Rebase..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Son" @@ -7864,21 +7984,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Yakın zamanda değiştirilmiş satırlar" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Sadece kaydet" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" -msgstr "" +msgstr "Otomatik olarak kaydedilen belgeleri geri getir\nAçıkça kaydedilen versiyonlar yerine otomatik olarak kaydedilen versiyonlarını aç" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7892,17 +8012,21 @@ msgstr "Alt modülleri tara" msgid "Recursive" msgstr "Özyineli" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Bir onceki iptal edilen işlemi terarla\nTekrarla" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Pencereyi küçült" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7910,31 +8034,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Yenile" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "Güncelleniyor" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7946,7 +8070,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7965,7 +8089,7 @@ msgid "" "\\s : whitespaces" msgstr "Normal ifade süzgeci:\n. : herhangi bir karakter\nc+ : c karakterini bir ya da daha fazla kez eşleştir\nc* : c karakterini sıfır ya da daha fazla kez eşleştir\n^ : satır başı\n$ : satır sonu\n(dize){n} : dizeyi n kere eşleştir\n(abcd) : alt ifade\n[aei0-9] : a,e,i ve 0..9'u eşleştir\n[^aei0-9] : a,e,i ve 0..9 dışında herşey\n\n\\w : a-z,A-Z,0-9 ve _ ile eşleşir\n\\W : herhangi alfasayısal olmayan karakter\n\\d : 0-9 rakamları\n\\s : boşluklar" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "" @@ -7978,7 +8102,7 @@ msgstr "Günlükte Göreceli Zamanlar" msgid "Reload" msgstr "Tekrar yükle" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8012,19 +8136,19 @@ msgstr "" msgid "Remote Branch" msgstr "Uzaktaki Dal" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Uzaktaki durum" @@ -8036,12 +8160,12 @@ msgstr "Uzaktaki:" msgid "Remove" msgstr "Kaldır" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "%ld elemanı kaldır" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "%s 'ı kaldır" @@ -8050,7 +8174,7 @@ msgstr "%s 'ı kaldır" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8058,21 +8182,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "&Aldırmama listesinden çıkar" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Hızlı Erişim Araç Çubuğundan Kaldır" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Değişiklik listesinden çıkar" @@ -8084,7 +8208,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8092,11 +8216,11 @@ msgstr "" msgid "Removed" msgstr "Kaldırıldı" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Değişiklik listesinden çıkarıldı" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8104,7 +8228,7 @@ msgid "" "from the ignore list." msgstr "%s\nDosya şablon(ları)\n'Aldırılmayanlar' listesinden silindi." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "'Aldırılmayanlar' listesinden dosya(ları) yada dosya maskelerini siler" @@ -8112,11 +8236,11 @@ msgstr "'Aldırılmayanlar' listesinden dosya(ları) yada dosya maskelerini sile msgid "Rena&me..." msgstr "Yeniden &Adlandır" -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Tekrar adlandır" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "%s'ı Yeniden Adlandır" @@ -8125,20 +8249,20 @@ msgstr "%s'ı Yeniden Adlandır" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Ad Değiştir / Taşı" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8148,7 +8272,7 @@ msgstr "Son işlemi tekrarla\nTekrarla" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8162,12 +8286,12 @@ msgstr "" msgid "Replace:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Değiştiriliyor" @@ -8191,11 +8315,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Kullanıcı adı ve sifre bilgilerini ister" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." -msgstr "" +msgstr "Çözüm&le" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Sıfırla" @@ -8207,25 +8331,25 @@ msgstr "Hepsi&ni sıfırla" msgid "Reset Type" msgstr "Türü Sıfırla" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Kolonları sıfırla" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Çözümle" @@ -8233,166 +8357,162 @@ msgstr "Çözümle" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "'Mine'i kullanarak çakışmayı çözümle" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "'Onların'ı kullanarak çakışmayı çözümle" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Çözümlendi" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Çözümlenen:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Çakışan dosyaları çözümler" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Geri al" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Varsayılana Geridön" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Pencereyi normal boyutuna döndür" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Geridönüldü" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Tekrar" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Geri Dön" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Geridönüldü" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Son güncellemeden itibaren yaptığınız tum değişiklikleri iptal eder" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Bir eklemeyi versiyon kontrolüne alır" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Revizyon" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Revizyon %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Revizyon %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" -msgstr "" +msgstr "Revizyon &Diyagramı" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" #. Resource IDs: (4580) msgid "Revision Graph" -msgstr "" +msgstr "Revizyon Diyagramı" #. Resource IDs: (4584) msgid "Revision Graph Filter" -msgstr "" +msgstr "Revizyon Diyagramı Filtresi" #. Resource IDs: (65535) msgid "Revision graph" msgstr "Revizyon &Diyagramı" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "Revizyon:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "RTF (Rich Text) formatı\nMetinde yazıtipi ve paragraf formatlama" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Sağ Görünüş:" @@ -8400,33 +8520,33 @@ msgstr "Sağ Görünüş:" msgid "Right image" msgstr "Sağdaki resim" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "%d ile %d arasındaki satır" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "%d-%d ile %d arasındaki satır" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" -msgstr "" +msgstr "Aşağı Taşı" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" -msgstr "" +msgstr "Satır yukarı" #. Resource IDs: (17045) msgid "S&elect..." msgstr "&Seç..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "Butonları tek satırda g&öster" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "Butonları iki satırda g&öster" @@ -8434,25 +8554,33 @@ msgstr "Butonları iki satırda g&öster" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "Hızlı Araç Çubuğu'nu Şerit'in altında g&öster." +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "İ&statistikler" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8462,7 +8590,7 @@ msgstr "" msgid "SMTP Server:" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8470,31 +8598,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8506,15 +8634,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8530,37 +8658,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Örnek metin:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" -msgstr "" +msgstr "Kaydet" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Farklı &kaydet..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Farklı &kaydet...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Farklı Kaydet" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" -msgstr "" +msgstr "Dosyayı Kaydet" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8568,13 +8700,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8582,74 +8714,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" -msgstr "" +msgstr "Tümünü kaydet\nHer iki dosya da kaydedilir" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" -msgstr "" +msgstr "Farklı kaydet" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Farklı Kaydet..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" -msgstr "" +msgstr "Farklı kaydet\nDosyanın nereye kaydedileceği sorulacak" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "%1 'e yapılan değişiklikler kaydedilsin mi?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." -msgstr "" +msgstr "Değişiklerine kaydet." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Revizyonu kaydet &..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8671,13 +8803,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." -msgstr "" +msgstr "Kaydet\nDosyayı çakışma işaretleriyle kaydet" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8689,28 +8821,28 @@ msgstr "" msgid "Saved Data" msgstr "Kaydedimiş Veri" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Tara" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla (Kıvılcım)" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Sola Kaydır" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Sağa Kaydır" @@ -8718,7 +8850,7 @@ msgstr "Sağa Kaydır" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "&Günlük mesajlarında ara..." @@ -8730,20 +8862,20 @@ msgstr "" msgid "Search for:" msgstr "Bunu ara:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." -msgstr "" +msgstr "Yamayı uygulamak için daha iyi bir adres aranıyor" -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Arama %1'de başarısız oldu" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" -msgstr "" +msgstr "Seç" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Hepsi&ni seç" @@ -8759,59 +8891,59 @@ msgstr "Sağ-tık &menüsü seçin:" msgid "Select &window:" msgstr "&Pencere seç" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Renk Seçme Aracı\nRenk seç" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Dosya Seç..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "SSH client'ını seç" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Bir düğme seçin." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Hakkında Yardım istediğiniz bir konu seçiniz" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Değişiklik listesini seç" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Karşılaştırma uygulaması seç" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Bu sorun izleyicisiyle ilişkilendirmek için bir klasör seçin" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Dışa aktarılacak klasörü seç.\nBu dışa aktarmayı yapmadan önce yeni klasör oluşturmanız gerekebilir." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Komut-dosyasını içinde çalıştırmak istediğiniz klasörü seçiniz" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Dosyasını kopyalamak istediğiniz klasörü seçiniz" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Yakalayıcı komut-dosyası seç" @@ -8819,20 +8951,20 @@ msgstr "Yakalayıcı komut-dosyası seç" msgid "Select items automatically" msgstr "Elemanları otomatik seç" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Birleştirme uygulaması seç" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Birleştirme hedefi seç" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8842,17 +8974,21 @@ msgstr "Tüm belgeyi seç\nHepsini Seç" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Projenin kullandığı dili seçin. Bu ayarlar teslim etme mesajları için kullanılan yazım kontrolcüsünü etkiler." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Karşılaştırma dosyalarını görüntülemek için bir uygulama seç " -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8862,7 +8998,7 @@ msgstr "" msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8870,7 +9006,7 @@ msgstr "" msgid "Send" msgstr "Gönder" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "ePosta Gönder" @@ -8878,11 +9014,11 @@ msgstr "ePosta Gönder" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Send Mail mesajınızı gönderemedi" -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "ePosta Gönder..." @@ -8890,19 +9026,19 @@ msgstr "ePosta Gönder..." msgid "Send Patch" msgstr "Yama Gönder" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "Yamayı ePosta ile Gönder" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "İçerik gönderiliyor" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "Gönderiliyor..." @@ -8922,28 +9058,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Özellikler ayarlanıyor..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Seçenekler" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Ayarlar - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Kabuk" @@ -8951,7 +9087,7 @@ msgstr "Kabuk" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Kabuk Simge Önbelleği tekrar oluşturuldu!" @@ -8963,7 +9099,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "Günlük mesajlarında kısaltılmış &Tarih/Zaman kullan" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Özellik listesini kısalt" @@ -8975,7 +9111,7 @@ msgstr "Göster" msgid "Show &Accelerator for:" msgstr "&Hızlandırıcıyı göster:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8983,15 +9119,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "&Değişiklikleri göster" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "&Günlüğü göster" @@ -8999,15 +9135,19 @@ msgstr "&Günlüğü göster" msgid "Show &log..." msgstr "&Günlüğü göster..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "İşaret&lemeleri ve sağ-tık menüsünü sadece explorer'da göster" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Şeritin Üstünde Göster" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Şeritin Altında Göster" @@ -9015,35 +9155,35 @@ msgstr "Şeritin Altında Göster" msgid "Show Environment Variables" msgstr "Ortam Değişkenlerini Göster" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Daha Az Düğme Göster" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" -msgstr "" +msgstr "Baş revizyon düğümlerini göster" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Satıriçi farklılıkları kelime bazında göster\nKelime bazlı satıriçi farklılıklar" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Daha Fazla Düğme Göster" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Hızlı Erişim Araç Çubuğunu Şeritin Üstünde Göster" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Hızlı Erişim Araç Çubuğunu Şeritin Altında Göster" @@ -9051,19 +9191,19 @@ msgstr "Hızlı Erişim Araç Çubuğunu Şeritin Altında Göster" msgid "Show Screen&Tips on toolbars" msgstr "Ekran&ipuçlarını araç çubuklarında göster." -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" -msgstr "" +msgstr "Boşluk karakterlerini göster" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" -msgstr "" +msgstr "Tüm diyagramın bir genel bakışını göster" #. Resource IDs: (1074) msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9071,11 +9211,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Değişiklikleri &birleştirilmiş karşılaştırma dosyası olarak göster" @@ -9095,15 +9235,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "Hedef klasörü göster" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9115,11 +9255,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "Normal olarak dışlanan klasörleri göster" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Men&ülerin tamamını kısa aralıklarla göster" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9135,7 +9279,7 @@ msgstr "Göz &ardı dosyaları göster" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9143,90 +9287,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Satır numaralarasını/larını &s goster" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "Kayıtları Göster" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "Alt modülün günlüğünü göster" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "Bu klasörün günlüğünü göster" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "Günlüğü göster..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" -msgstr "" +msgstr "En eski düğümleri yukarıda göster" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Satır karşılaştırma çubuğunu göster yada gizle\nSatır karşılaştırma çubuğunu Aç/Kapa" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Yer konumu çubuğunu göster yada gizle\nYer konumu çubuğunu Aç/Kapa" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Durum çubuğunu göster yada gizle\nDurum çubuğu" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Araç çubuğunu göster yada gizle\nAraç çubuğu" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Revizyon özelliklerini göster" @@ -9234,7 +9378,7 @@ msgstr "Revizyon özelliklerini göster" msgid "Show shortcut &keys in ScreenTips" msgstr "Kısayolları ve &anahtar sözcükleri İpucuEkranı'nda göster" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9244,7 +9388,7 @@ msgstr "" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9256,45 +9400,43 @@ msgstr "Değiştiril&memiş dosyaları göster" msgid "Show un&versioned files" msgstr "Versiyonlan&mamış dosyaları göster" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Göster/Gizle" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" -msgstr "" +msgstr "Kopya/etiket/dal ı temsil eden grafiği gösterir " -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Yerel ve depodaki, son güncellemeden beri değişiklik yapılan dosyaları gösterir" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "TortoiseGit ile ilgili bilgiyi gösterir" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "İşlem günlüğünü varsayılan metin editöründe gösterir" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9306,28 +9448,28 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" -msgstr "" +msgstr "Gümüş stili" #. Resource IDs: (1532) msgid "Since" msgstr "Beri" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Boyut" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Atla" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "Yamayı atla: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9335,23 +9477,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Atlandı" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Kayıp hedef atlandı" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" -msgstr "" +msgstr "Kaydır" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9359,13 +9501,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9379,7 +9521,7 @@ msgstr "Teslim etme sayına göre sırala" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9389,57 +9531,61 @@ msgstr "En son Günlük mesajları diyalogunda kaç tane elemanı saklamak isted msgid "Spin1" msgstr "Döndür1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Satırları ayır" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Etkin pencere içerisinde çerçeveyi ayır\nAyır" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Yığılı Çubuk Çizelgesi" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Yığılı Çizgi Çizelgesi" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Standart" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "Başlat (İleri sar)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Teslim yakalayıcısını çalıştır" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "İkiye bölünmüş kip..." #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Kütük düzenleyicisini başlat" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9451,39 +9597,47 @@ msgstr "Zula" msgid "Stash &Message" msgstr "Zula &İletisi" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "Zulayı Uygula" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "Zula Listesi" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "Zulayı Çıkart" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "Zulayı Kaydet" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Durağan" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "İstatistik" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Durum" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Durum Çubuğu Ayarları" @@ -9495,32 +9649,32 @@ msgstr "Durum ve eylem renkleri" msgid "Status cache" msgstr "Durum önbelleği" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Durum önbelleği sadece tek bir klasör için, özyineli işaretler yok " -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "İkiye bölünmüş kipten çık" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9528,15 +9682,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" -msgstr "" +msgstr "Stil" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "Konu" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "Konu:" @@ -9544,7 +9698,7 @@ msgstr "Konu:" msgid "Submodule" msgstr "Altbirim" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9552,7 +9706,7 @@ msgstr "" msgid "Submodule Add" msgstr "Altbirim Ekle" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9560,15 +9714,15 @@ msgstr "" msgid "Submodule Diff" msgstr "Altbirim Farkı" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "Altbirim Hazırla" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "Altbirim Eşitle" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "Altbirim Güncelle" @@ -9576,7 +9730,7 @@ msgstr "Altbirim Güncelle" msgid "Submodule Update Options" msgstr "Altbirim Güncelleme Seçenekleri" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9591,15 +9745,15 @@ msgstr "" msgid "Submodules" msgstr "Alt modüller" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "Başarılı" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Değiştir" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "%s %s olarak değiştir, uyarlama %s" @@ -9608,43 +9762,43 @@ msgstr "%s %s olarak değiştir, uyarlama %s" msgid "Switch To" msgstr "Değiştir" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Bir önceki pencereye geç\nÖnceki pencere" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Tek yada çift pencereli görünüm arası geçiş\nTek yada çift pencereli görünüm arası geçiş" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" -msgstr "" +msgstr "Sol ve sağ görünümü yer değiştir" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Sol ve sağ panelin içeriklerini kendi aralarında değiştir\nSol ve sağ paneli kendi aralarında değiştir" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Bir sonraki belge penceresine geç" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Bir sonraki pencereye geç\nSonraki pencere" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Bir önceki belge penceresine geç" @@ -9652,21 +9806,21 @@ msgstr "Bir önceki belge penceresine geç" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "Çalışma ağacını farklı dal/etiket olarak değiştir/dışarı çıkart" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Karşılaştırmayı değiştirir Sol<->Sağ" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9676,23 +9830,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "Uzaktaki Depoları Eşitle, çekme, gönderme, eposta yaması ve buna benzer " -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "Eşitle..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9702,13 +9856,13 @@ msgstr "Sistem yazmaç girileri ve INI dosyası (varsa) silindi." msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9722,7 +9876,7 @@ msgstr "Çıkıntı Yertutucu" msgid "Tab size:" msgstr "Çıkıntı boyutu:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "Etiket" @@ -9730,16 +9884,16 @@ msgstr "Etiket" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "Etiket Bilgisi" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "Çalışılan ağacı %s olarak etiketle" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Etiketler" @@ -9747,11 +9901,11 @@ msgstr "Etiketler" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Görevler" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Görev Bölümü" @@ -9763,11 +9917,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Sadece Test" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9775,13 +9929,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9789,64 +9949,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Yığın boyutu eklenen/silinen satır sayısı ile uyuşmuyor!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "Geçerli çalışma ağacı temiz değil.\nDeğişiklikleri saklamak istiyor musunuz?" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Karşılaştırma motoru bu hatadan dolayı durduruldu:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "%s Dosyası bulunamadı!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "%s Dosyası yama dosyasında bulunamadı!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9855,15 +10029,15 @@ msgid "" "Do you want to remove the file?" msgstr "%s\ndosyası\nboş değil\nDosyayı kaldırmak istiyor musunuz?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Dosya çok büyük" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Dosya açmak için çok büyük." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9871,7 +10045,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "%s\nDosya adı\nbulunmakta! Üzerine yazmak istiyor musunuz?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9879,14 +10053,14 @@ msgid "" "is not a valid text file!" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "%s klasörü sürümlendirilmemiş veya değiştirilmiş dosya veya dosyalar barındırıyor. Bu klasörü yine de silmek istiyor musunuz?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9895,78 +10069,78 @@ msgid "" "Would you like to create it first?" msgstr "%s klasörü bulunmuyor. Yaratmak ister misin?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Kanca kodu hata verdi:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Resim gösterilemiyor." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Sorun-izleyici sağlayıcı oluşturulamıyor. Lütfen doğru olarak yüklendiğini kontrol ediniz." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Sorun-izleyici sağlayıcı parametre dizisini doğrulamayamadı." -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Yeni dosyaya işaret etmesi beklenen satır %d satırında bulunamadı!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" -msgstr "" +msgstr "Satır numarası %d ile %d arasında olmalıdır" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Tutulacak maksimum kayıt sayısıdır.\nBu sayıyı aşan her kayıt, listedeki en eski kayıdın silinmesine neden olacaktır." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "İşlem başarısız." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "'/path' ve '/pathfile' parametreleri birbirini dışlarlar.\nYalnız birini belirtmelisiniz." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9976,7 +10150,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9987,7 +10161,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Girdiğiniz dosya yolu Windows için geçerli bir dosya yolu değildir.\nEğer bu dosya yolunu kullanmakta ısrar ederseniz ileride hatalarla karşılaşabilirsiniz.\n\nWindows üzerinde geçerli bir dosya yolu '<<>|\"?*:' işaretlerini ya da com1-com9, lpt1-lpt9, prn, aux, con, nış, clock$ aygıt isimlerini kullanamaz.\n\nDevam etmek istediğinizden emin misiniz?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9998,36 +10172,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "Düzenli ifade geçersiz!\nLütfen geçerli bir düzenli ifade girin." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Depo başarıyla yaratıldı." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Seçili dosyada halen bir yada daha fazla çakışma işaretleri bulunmakta.\nBu dosyayı çözümlendi olarak işaretlemek istediğinizden emin misiniz?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10035,7 +10216,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10044,7 +10225,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10053,26 +10234,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Seçilen dosyanın çözümlenmesinin durdurulmasına kalan süre (sn).\r\nDaha düşük bir değer otomatik-tamamlama listesinin daha hızlı gelmesini sağlar,\r\nfakat tüm dosyaları taramayabilir." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Seçili URL'ler aynı kökten(kaynaktan) yaratılmamıştır.\nAralarındaki Günlük mesajlarını göstermek mümkün değildir!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10082,34 +10263,34 @@ msgstr "" msgid "Their file:" msgstr "Onların dosyası:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Onların" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Uygun sorun-izleyici bulunamadı." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10118,85 +10299,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "%d satırında halen çözümlenmemiş çakışmalar bulunmakta!\nKaydetmeden önce bu çakışmaları çözümlemelisiniz.\nDosyayı bu çakışmalarla halen kaydetmek istiyor musunuz?\n Eğer EVET'i tıklarsanız daha sonra başka bir editör kullanarak bu çakışmaları kendiniz düzeltmeniz gerekli!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Kayıtlı olmaya değişiklikler var.Değişikliklerinizi kayit etmek ister misiniz?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Sözlük" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." -msgstr "" +msgstr "Bunlar şu anda açık olan belgelerden daha sonra kaydedilmiş ve uygulama kapatılmadan önce yapılmış değişiklikler içeriyor." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Bu geçerli bir URL adresi değil. Lütfen URL'yi belirtiniz." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Bu program var olmayan dışa aktarma %s'ya (%s dosyasında) yönlendirilmiş. Bu makinede %s 'in uyumsuz bir versiyonu olabilir. " -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Programın çalışması için bu sistemde bulunamayan %s doyası gerekli." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Bu özellik dosyalar için değil, sadece klasörler için geçerlidir." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Bu işlem uygulamada kullandığınız komutların kaydını siler ve menüler ve araç çubuklarındaki varsayılan komut setini geri yükler. Hiçbir kişiselleştirme ayarını değiştirmez. Bunu yapmak istediğinizden emin misiniz?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10206,20 +10387,20 @@ msgstr "Dikey& Olarak Döşe" #. Resource IDs: (16924) msgid "Tile Hori&zontally" -msgstr "" +msgstr "&Yatay olarak döşe" #. Resource IDs: (1676) msgid "To" msgstr "Kime" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10231,13 +10412,13 @@ msgstr "" msgid "To:" msgstr "Kime:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Bir/İki sayfa görüntülemeye geçiş\nBir/İki sayfa görüntülemeye geçiş" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10249,11 +10430,11 @@ msgstr "Araç çubuğu" msgid "Toolbar Name" msgstr "Araç Çubuğu İsmi" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Araç Çubuğu Seçenekleri" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Dahili araç çubuğu hatası. Lütfen program satıcınızla iletişime geçin." @@ -10269,16 +10450,16 @@ msgstr "Araçlar" msgid "Tools:" msgstr "Araçlar:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10288,40 +10469,40 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit benzer dosya isimleri algıladı. Bu dosyalarında tekrardan adlandırılmasını ister misiniz?\n%s" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" -msgstr "" +msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10337,7 +10518,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10345,7 +10526,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10359,36 +10540,36 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10427,11 +10608,11 @@ msgstr "Takip" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "%s de transfer edilmekte" @@ -10440,39 +10621,35 @@ msgstr "%s de transfer edilmekte" msgid "Transparent &color..." msgstr "Şeffaf &renk..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Lütfen 'Temizle' deneyiniz. Eğer bu işe yaramaz ise yeniden çekiniz." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Tekrar dene" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Türkçe" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "TortoiseGit Ayarları" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Tip" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "Tip:" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10496,24 +10673,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "E-Posta sistemi desteği yüklenemedi." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "İşlem gerçekleştirilemedi, sunucu meşgul." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "%1'den okunamadı, başkası tarafından kullanılmakta" -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Salt-okunur özelliği okunamadı." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10521,91 +10698,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Salt-okunur özelliği yazılamadı." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "%1 'e yazılamadı, ya salt-okunur bir dosya yada bir başkası tarafından açılmış durumda." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Boşalt" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" -msgstr "" +msgstr "Geri al" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "%d işlem geri al" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "1 işlem geri al" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "Eklemeyi Geri Al..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Beklenmedik dosya formatı" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" -msgstr "" +msgstr "Katları Aç" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Unformatted Text\ntext without any formatting" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" -msgstr "" +msgstr "Baş revizyonlarının birleştirilmiş kar&şılaştırma dosyası" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Bilinmeyen derinlik" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" +msgstr "Çözülmemiş çakışmalar!" + +#. Resource IDs: (1558) +msgid "Unset tracked branch" msgstr "" -#. Resource IDs: (3841) +#. Resource IDs: (61443) msgid "Untitled" msgstr "Başlıksız" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Versiyonlanmamış" @@ -10613,7 +10794,7 @@ msgstr "Versiyonlanmamış" msgid "Unversioned files mark parent folder as modified" msgstr "Versiyonlanmamış dosyalar içinde bulundukları klasörü değiştirildi diye işaretlerler" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Versiyon kaldırılıyor: %s" @@ -10624,25 +10805,25 @@ msgstr "Yukarı" #. Resource IDs: (1710) msgid "Update" -msgstr "" +msgstr "Güncelleme" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Güncellendi" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "ActiveX nesneleri güncelleniyor" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10654,29 +10835,25 @@ msgstr "&Varsayılan Resmi Kullan:" msgid "Use &one-pane view as default for 2-file diff" msgstr "2-dosyalı karşılaştırmanın &tek pencereli görünümü" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Başka& metin bloğunu kullan" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" -msgstr "" +msgstr "'benim' metin bloğunu kullan" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" -msgstr "" +msgstr "Önce 'benim' metin bloğunu kullan sonra 'onların' kini" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" -msgstr "" +msgstr "'onların' metin bloğunu kullan" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" -msgstr "" - -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "" +msgstr "Önce 'onların' metin bloğunu kullan sonra 'benim' kini" #. Resource IDs: (1761) msgid "Use HTTP path component" @@ -10698,15 +10875,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Panodaki birleştirilmiş &karşılaştırma dosyasını kullan" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10716,7 +10893,7 @@ msgstr "Tüm içeriği sol gösterimden kullan\nSol dosyayı kullan" msgid "Use block from left before right" msgstr "Sağdaki bloktan önce soldakini kullan" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10726,27 +10903,27 @@ msgstr "Sağdaki bloktan önce sol gösterimdeki bloğu kullan\nSağdakinden ön msgid "Use block from right before left" msgstr "Soldaki bloktan önce sağdakini kullan" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Soldaki bloktan önce sağ gösterimdeki bloğu kullan\nSoldakinden önce sağdaki bloğu kullan" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Metin bloklarının ikisini de kullan (ilk olarak bunu)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Metin bloklarının ikisini de kullan (son olarak bunu)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" -msgstr "" +msgstr "Sol bloğu kullan" #. Resource IDs: (32856) msgid "Use left file" @@ -10760,15 +10937,15 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Geri döndürürken geri dönüşüm kutusunu kullan" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Kurallı ifade kullan" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "" @@ -10776,61 +10953,61 @@ msgstr "" msgid "Use system locale for date/time" msgstr "Tarih/zaman için sistem yerelini kullan" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "'&Benim'den itibaren metin bloğunu kullan" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "\"&Onların\" 'dan itibaren metin bloğunu kullan" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "\"Onların\" yerine \"B&enim\" metin bloğunu kullan" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "'Onların'dan önce 'Benim' metin bloğunu kullan\nİlk 'Benim' sonra 'Onların' metin bloğunu kullan" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "'Benim'deki metin bloğunu kullan\n'Benim' metin bloğunu kullan." -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" -msgstr "" +msgstr "'benim'kinden önce 'o&nlar'ın metin bloğunu kullan" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "'Onların'dan sonra ve 'Benim'den önceki metin bloğunu kullan\nİlk 'Onların' sonra 'Benim' metin bloğunu kullan" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "\"Onların\" 'daki metin bloğunu kullan\n\"Onların\" metin bloğunu kullan." -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Soldaki metin bloğunu kullan\nSol bloğu kullan" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Bu& metin bloğunu kullan" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10838,7 +11015,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10850,19 +11027,19 @@ msgstr "" msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Bu dosyanın &tümünü kullan" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Başka dosyanın &tümünü kullan" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10878,11 +11055,11 @@ msgstr "Kullanıcı Bilgisi" msgid "User Name:" msgstr "Kullanıcı Adı:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Kullanıcı iptal edildi" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10892,11 +11069,11 @@ msgstr "Kullanıcı adı ve eposta adresi teslimden önce ayarlanmalıdır.\r\n msgid "User&name:" msgstr "&Kullanıcı Adı:" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Kullanıcıadı:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10915,7 +11092,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Değer" @@ -10923,24 +11100,24 @@ msgstr "Değer" msgid "Version" msgstr "Sürüm" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Sürüm %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Sürüm 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Sürüm 2 (Taban)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10948,11 +11125,11 @@ msgstr "" msgid "Version Information" msgstr "Sürüm Bilgisi" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Sürüm:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Sürümlendi" @@ -10962,25 +11139,29 @@ msgstr "Vietnamca" #. Resource IDs: (156) msgid "View" -msgstr "" +msgstr "Görünüm" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Yamayı göster" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Yamayı göster>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "&Webviewer içinde uyarlama yolunu göster" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Farklı düzenleyici ile uyarlamayı göster" @@ -10992,11 +11173,11 @@ msgstr "" msgid "Visit our website" msgstr "İnternet sayfamızı ziyaret edin" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11007,7 +11188,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "UYARI:\r\nBu ayarları sadece ne yaptığınızdan kesinlikle eminseniz değiştirin!\r\nDeğerleri varsayılanlara döndürmek için değer metnini silin." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Bekle" @@ -11015,7 +11196,7 @@ msgstr "Bekle" msgid "Wait for the script to finish" msgstr "Betiğin bitmesi bekleniyor" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Giriş için bekleniyor" @@ -11023,15 +11204,15 @@ msgstr "Giriş için bekleniyor" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Dikkat" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Dikkat!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11039,7 +11220,7 @@ msgid "" "Do you really want to continue?" msgstr "Dikkat: \"%s\" kalıcı olarak silinecektir. Bir dahaKURTARILMASI mümkün olmayacaktır!\r\n\r\nDevam etmek istediğinizden emin misiniz?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11047,56 +11228,56 @@ msgstr "Web" msgid "Western European" msgstr "Batı Avrupa" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "İzin verildiği durumda, teslim etme diyaloğunda listelenen tüm versiyonlanmış kalemler otomatik olarak seçilirler" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11106,15 +11287,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Boşluk karakterleri" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Pencere Konumu" @@ -11122,15 +11303,15 @@ msgstr "Pencere Konumu" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11174,11 +11355,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "Çalışma Ağacı" @@ -11186,29 +11367,25 @@ msgstr "Çalışma Ağacı" msgid "Working Tree Path:" msgstr "Çalışma Ağacı Yolu:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "Çalışma klasörü değişiklikleri" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" -msgstr "" +msgstr "Uzun satırları ayır" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Evet" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Tümüne evet" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Bilgisayarınızda son sürüm yüklü." @@ -11218,51 +11395,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Burada belirli Simge yöneticilerini geçersiz kılabilirsiniz.\nGeçersiz kılınan yöneticiler bir simge bölmesi kullanmayacaklar ve diğer kabuk eklentilerinin kendi simgelerini kullanmalarına şans tanıyacaklardır." -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Sadece (%d x %d) boyutlarında biteşlem yapıştırabilirsiniz!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "%d den fazla kullanıcı tanımlı araç çubuğu yaratamazsınız!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Bu özelliği klasörler için uygulayamazsınız, sadece dosyalar için geçerlidir!.\nBir klasörün içindeki tüm dosyalara uygulamak için,\n'özyineli' seçeneğini etkinleştirmelisiniz." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Bazı özelliklerde değişiklik yaptınız ve bunları daha kaydetmediniz.\nBunları şimdi kaydetmek ister misiniz?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11270,67 +11447,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Sorun numarası eklemediniz!\nSorun numarası olmadan teslim etmek istediğinizden emin misiniz?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "%d adede kadar araç tanımlayabilirsiniz." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Teslim etmek için bir günlük mesajı girmelisiniz." -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Değişikliklerin etkin olması için sisteminizi tekrar başlatmalısınız." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Versiyonsuz bir dosya seçtiniz.\nDosyayı teslim ettiğinizde versiyon kontrolüne eklenecektir." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Yazı girmelisiniz!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Resim seçmelisiniz!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Simge takımını %s de %s'ye değiştirdiniz.\nBu değişiklik bilgisayarınızı yeniden başlatmadığınız ya da oturumunuzu kapatıp açmadığınız sürece değişmeyecek!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11340,7 +11517,7 @@ msgstr "Girilen önceki günlük mesajınız kayıt edildi.\nOkumak ve yeniden g msgid "Your version is:" msgstr "Sürümünüz:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Sürümünüz: %d.%d.%d.%d" @@ -11350,10 +11527,10 @@ msgid "Zip File" msgstr "Zip dosyası" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Küçült" +msgid "Zoo&m out\t-" +msgstr "&Küçült\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Oran" @@ -11365,80 +11542,80 @@ msgstr "Büyült&" msgid "Zoom &Out" msgstr "&Küçült" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" -msgstr "" +msgstr "100% Tamamını göster" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Büyüt\nBüyüt" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Küçült\nKüçült" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Büyüt& " +msgid "Zoom i&n\t+" +msgstr "Büyüt& \t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Büyüt" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Küçült" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" -msgstr "" +msgstr "Tamamını göster" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" -msgstr "" +msgstr "Yüksekliğe sığdıracak şekilde büyüt" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" -msgstr "" +msgstr "Genişliğe sığdıracak şekilde büyüt" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" -msgstr "" +msgstr "[Varsayılan]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Atanmadı]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" geçerli." -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\" git deposu değil" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11452,7 +11629,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "eklendi" @@ -11460,7 +11637,7 @@ msgstr "eklendi" msgid "added files" msgstr "dosyalar eklendi" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "isimlendirilmemiş dosya" @@ -11468,14 +11645,19 @@ msgstr "isimlendirilmemiş dosya" msgid "and support the developers" msgstr "ve geliştiricileri destekle" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "varsayın-geçerli" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "yazar" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "TortoiseSVN altyapısı(http://www.tortoisesvn.net/)" @@ -11508,30 +11690,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "teslimler" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "çakıştı" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "kopyalandı\r\n%s - uyarlama %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "gün" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "silindi" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11543,7 +11725,7 @@ msgstr "işlevsiz" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11552,16 +11734,16 @@ msgid "" "%s" msgstr "verildi\n%s\nden\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "harici" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git başarılı çıkış yapamadı (çıkış kodu %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "yoksayıldı" @@ -11569,23 +11751,23 @@ msgstr "yoksayıldı" msgid "include &untracked" msgstr "&izlenilmeyenleri dahil et" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "tamamlanmadı" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "öğeyi yerel olarak sakla" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "dosya listeleri İngilizce olarak kalsın" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11594,7 +11776,7 @@ msgid "" "%s = %ld" msgstr "satır: %d(+) %d(-) dosya: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11609,11 +11791,11 @@ msgstr "satır: %d(+) %d(-) dosya: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = msgid "master" msgstr "ana birim" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "birleştirilmiş" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "eksik" @@ -11621,7 +11803,7 @@ msgstr "eksik" msgid "missing/deleted/replaced" msgstr "eksik/silinmiş/değiştirilmiş" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "değiştirildi" @@ -11629,7 +11811,7 @@ msgstr "değiştirildi" msgid "modified/copied" msgstr "değiştirildi/kopyalandı" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "ay" @@ -11637,40 +11819,44 @@ msgstr "ay" msgid "new branch" msgstr "yeni dal" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "hayır" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "bu komut için açıklama mevcut değil" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "sürümlenmedi" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "normal" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "bulunamadı" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "engellenmiş" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "%1 de" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "pikseller" @@ -11678,11 +11864,11 @@ msgstr "pikseller" msgid "possible or real conflict/obstructed" msgstr "mümkün ya da çakışan/engellenmiş" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "yılın çeyrekleri" @@ -11690,35 +11876,35 @@ msgstr "yılın çeyrekleri" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "değiştirildi" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" -msgstr "" +msgstr "yolu tarıyor:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "%s'e\ndeğiştirildi" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "buraya %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "buraya %s" @@ -11727,35 +11913,35 @@ msgstr "buraya %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "hafta" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "yıl" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "evet" diff --git a/Languages/Tortoise_uk.po b/Languages/Tortoise_uk.po index 09fd9299b..9d1841529 100644 --- a/Languages/Tortoise_uk.po +++ b/Languages/Tortoise_uk.po @@ -4,19 +4,22 @@ # This file is distributed under the same license as TortoiseGit # # Translators: +# Alexander Stulnikov , 2015 # Віктор Лелейко , 2013 # Dmytro Kutianskyi , 2015 # ktretyak , 2013 -# Maks Lyashuk , 2013 -# Maks Lyashuk , 2013 +# Max Lyashuk , 2013 +# Max Lyashuk , 2013 +# Max Lyashuk , 2013 +# Tymur Mudzhyri , 2015 # Vitaliy Katerusha , 2011 # Віктор Лелейко , 2013 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/tortoisegit/language/uk/)\n" "MIME-Version: 1.0\n" @@ -25,7 +28,7 @@ msgstr "" "Language: uk\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -47,138 +50,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# індивідуально вказані автори:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "%.2f МіБ переслано" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 містив неочікуваний об'єкт." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 містить невірний шлях." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 містить невірну схему." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "У %1 поганий формат." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "%1 не знайдено." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! день тому" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! дні(в) тому" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! годину тому" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! годин тому" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! хвилину тому" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! місяць тому" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! місяців тому" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! секунду тому" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! секунд тому" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! тиждень тому" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! тижнів тому" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! рік тому" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! років тому" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "%1!d! елементів вибрано" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! хвилин тому" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\nПоказано %2!d! файлів, %3!d! підмодулів і %4!d! папок, усього: %5!d! елементів" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\nРозмір %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nПродовжити виконання скрипта?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -186,52 +189,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nНе вдалося знайти цей файл.\nПеревірте, чи вірні шлях та ім'я файла." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig або %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "%I64d Байт переслано" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "%I64d КіБ переслано" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" -msgstr "" +msgstr "%d фіксацій перед \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d файлів змінено" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d файлів видалено" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d файлів відновлено до %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "%d файлів вибрано, %d файлів усього" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d найбільш активні автор(и) принаймні з %d фіксацій у кожного (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -239,78 +242,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% альфа\nклікніть щоб перемкнути альфу\nклікніть двічі для автоматичного перемикання альфи" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld хвилин і %ld секунд" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld з %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - на ревізії: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Відновлено]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s за %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s Потребує Git версії >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, на швидкості %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: Робоча копія" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Експортовано (%d) з %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Експортовано з %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nНеможливо коректно застосувати патч" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nВи все-таки хочете його видалити?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -326,6 +329,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3-стороннє злиття" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Про TortoiseGitBlame..." @@ -354,15 +361,15 @@ msgstr "&Додати фільтр" msgid "&Add New/Save" msgstr "&Додати новий/Зберегти" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Додати його" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Додати або видалити кнопки" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Додати..." @@ -402,7 +409,7 @@ msgstr "&Призначити" msgid "&Associate double-click event with:" msgstr "&Асоціювати подію подвійного кліку з:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Автоматично ховати" @@ -418,15 +425,15 @@ msgstr "&Автоматично завантажувати ключ Putty" msgid "&Backup original file" msgstr "&Зберегти резервну копію оригінального файлу" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Звинуватити" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "Про&коментувати зміни" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "Про&коментувати ревізії" @@ -450,7 +457,7 @@ msgstr "&Гілка:" msgid "&Browse Dir" msgstr "&Огляд каталога" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "Про&глянути сховище" @@ -486,7 +493,7 @@ msgstr "&Категорія:" msgid "&Choose commands from:" msgstr "Вибрати &команди з:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Очистити..." @@ -510,7 +517,7 @@ msgstr "&Закрити вікно(а)" msgid "&Command:" msgstr "&Команда:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "За&фіксувати" @@ -518,23 +525,27 @@ msgstr "За&фіксувати" msgid "&Commit submodule..." msgstr "За&фіксувати підмодуль..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "За&фіксувати без" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "За&фіксувати..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "По&рівняти ревізії" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "&Стиснутий граф" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Копіювати" @@ -554,11 +565,11 @@ msgstr "&Адаптоване" msgid "&Default" msgstr "&Типове" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "Зни&щити" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "Зни&щити (залишити локально)" @@ -566,7 +577,7 @@ msgstr "Зни&щити (залишити локально)" msgid "&Delete Filter" msgstr "&Знищити фільтр" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Знищити і віддалену і локальну" @@ -578,11 +589,11 @@ msgstr "&Визначити переміщені або скопійовані msgid "&Detect moved or copied lines:" msgstr "&Визначити переміщені або скопійовані рядки:" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "Ві&дмінності" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "Ві&дмінності з попередньою версією" @@ -594,7 +605,7 @@ msgstr "&Каталог:" msgid "&Disabled" msgstr "&Недоступно" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Скасувати" @@ -602,7 +613,7 @@ msgstr "&Скасувати" msgid "&Do the same for the rest" msgstr "&Зробити те саме з іншими" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "С&тикування" @@ -610,11 +621,15 @@ msgstr "С&тикування" msgid "&Don't ask me again" msgstr "&Не запитувати мене знову" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Вниз" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Завантажити" @@ -622,11 +637,11 @@ msgstr "&Завантажити" msgid "&Edit" msgstr "&Редагувати" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Редагувати .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Редагувати УСІ" @@ -634,7 +649,7 @@ msgstr "&Редагувати УСІ" msgid "&Edit Filter" msgstr "&Редагувати фільтр" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Редагувати конфлікти" @@ -659,10 +674,10 @@ msgid "&Enable edit" msgstr "&Дозволити редагування" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "&Вийти" +msgid "&Exit\tCtrl+W" +msgstr "&Вийти\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Експортувати виділене до..." @@ -674,27 +689,27 @@ msgstr "&Зовнішня" msgid "&File" msgstr "&Файл" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Знайти" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "&Знайти\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Розтягнути зображення по вікну" +msgid "&Fit images in window\tF" +msgstr "&Розтягнути зображення по вікну\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "Ста&ціонарні диски" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "П&лаваюче" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -706,7 +721,7 @@ msgstr "&Шрифт повідомлень логу:" msgid "&Font:" msgstr "&Шрифт:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "" @@ -716,7 +731,7 @@ msgstr "" #. Resource IDs: (1608) msgid "&From:" -msgstr "" +msgstr "&Від:" #. Resource IDs: (2153) msgid "&Git Style Commit (--rmdir)" @@ -726,7 +741,7 @@ msgstr "" msgid "&Go to\tCtrl+G" msgstr "&Перейти\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -738,7 +753,7 @@ msgstr "&Зелений:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Довідка" @@ -746,7 +761,7 @@ msgstr "&Довідка" msgid "&Help Topics" msgstr "Теми &довідки" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "При&ховати" @@ -754,11 +769,11 @@ msgstr "При&ховати" msgid "&Icon Set:" msgstr "Набір п&іктограм" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "&Ігнорувати" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Ігнорувати %d елементів за назвою" @@ -772,14 +787,14 @@ msgid "&Image" msgstr "&Зображення" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "Інформація про &зображення" +msgid "&Image info\tI" +msgstr "Інформація про &зображення\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "Лише &зображення" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Імпортувати..." @@ -791,7 +806,7 @@ msgstr "По&чатковий каталог" msgid "&Initialize submodules (--init)" msgstr "&Ініціалізувати підмодулі (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "&Встановити" @@ -803,11 +818,11 @@ msgstr "Пере&йти до першої відмінності під час msgid "&Keep CR" msgstr "&Залишити CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "&Залишити у поточному стані" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -835,7 +850,7 @@ msgstr "&Обмеження:" msgid "&Line number" msgstr "&Номер рядка" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Номер рядка (%d - %d)" @@ -852,7 +867,7 @@ msgstr "У вигляді &списку" msgid "&Local Branch:" msgstr "&Локальна гілка:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "&Локальні гілки" @@ -876,11 +891,11 @@ msgstr "Анімація &меню:" msgid "&Menu contents:" msgstr "Вміст &меню" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "З&лити" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "З&лити..." @@ -936,6 +951,10 @@ msgstr "&Далі >" msgid "&Next Page" msgstr "&Наступна сторінка" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Без події подвійного кліку" @@ -952,11 +971,11 @@ msgstr "" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&ОК" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Одна сторінка" @@ -964,19 +983,15 @@ msgstr "&Одна сторінка" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Відкрити" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "&відрити веб-сторінку Git для Windows" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "&Відкрити..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "&Відкрити...\tCtrl+O" @@ -989,18 +1004,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "Пе&рекривати зображення" +msgid "&Overlay images\tO" +msgstr "Пе&рекривати зображення\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Пароль:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "В&ставити" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "" @@ -1008,7 +1023,7 @@ msgstr "" msgid "&Port:" msgstr "&Порт:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "Попередній перегляд &друку" @@ -1016,11 +1031,15 @@ msgstr "Попередній перегляд &друку" msgid "&Print..." msgstr "&Друк..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&Друк...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1028,10 +1047,14 @@ msgstr "" msgid "&Push all branches" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Останні повідомлення" @@ -1044,7 +1067,7 @@ msgstr "&Рекурсивно" msgid "&Red:" msgstr "Че&рвоний" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "Пе&реробити" @@ -1060,7 +1083,7 @@ msgstr "О&новити" msgid "&Regular Expression" msgstr "&Регулярний вираз" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "&Нагалати мені пізніше" @@ -1068,7 +1091,7 @@ msgstr "&Нагалати мені пізніше" msgid "&Remote Branch:" msgstr "&Віддалена гілка:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "&Віддалені гілки" @@ -1076,7 +1099,7 @@ msgstr "&Віддалені гілки" msgid "&Remote:" msgstr "" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "Ви&далити" @@ -1088,7 +1111,7 @@ msgstr "&Видалити це з індексу" msgid "&Replace" msgstr "&Замінити" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "Оглядач &репозиторію" @@ -1096,7 +1119,7 @@ msgstr "Оглядач &репозиторію" msgid "&Reset" msgstr "Пе&реініціалізувати" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "Пе&реініціалізувати рядок знарядь" @@ -1112,23 +1135,27 @@ msgstr "Пе&реініціалізувати мої дані про корис msgid "&Reset to Default" msgstr "Пе&реініціалізувати типовим" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "&Відновити" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "&Відновити старий стан" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "" @@ -1140,7 +1167,7 @@ msgstr "Клієнт &SSH" msgid "&Saturation:" msgstr "" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Зберегти" @@ -1148,15 +1175,19 @@ msgstr "&Зберегти" msgid "&Save authentication" msgstr "&Зберегти автентифікацію" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Зберегти граф як..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Зберегти список вибраних файлів до..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Зберегти\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "&Задати шлях до Git" @@ -1164,7 +1195,7 @@ msgstr "&Задати шлях до Git" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Налаштування" @@ -1184,7 +1215,7 @@ msgstr "По&казувати текстові мітки" msgid "&Signing key ID:" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "&Пропустити" @@ -1192,7 +1223,7 @@ msgstr "&Пропустити" msgid "&Squash" msgstr "" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "" @@ -1204,7 +1235,7 @@ msgstr "&Почати" msgid "&Start Group" msgstr "По&чаткова група" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1224,7 +1255,7 @@ msgstr "&Символьний перегляд" msgid "&Tab size:" msgstr "Розмір &табуляції" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "Документ з вкла&дками" @@ -1232,7 +1263,7 @@ msgstr "Документ з вкла&дками" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "&Зрізи" @@ -1268,7 +1299,7 @@ msgstr "" msgid "&Toolbars:" msgstr "Рядки &знаряддь:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1280,7 +1311,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Дві сторінки" @@ -1288,15 +1323,15 @@ msgstr "&Дві сторінки" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "С&касувати" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&Об'єднані відмінності" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "" @@ -1308,7 +1343,7 @@ msgstr "&Невідомі диски" msgid "&Up" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "" @@ -1320,11 +1355,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "В&икористовувати автодоповнення для файлових шляхів та ключових слів" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "Ім'я &користувача" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "Пере&глянути" @@ -1332,7 +1367,7 @@ msgstr "Пере&глянути" msgid "&View:" msgstr "Пере&глянути:" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "" @@ -1348,6 +1383,10 @@ msgstr "&Ціле слово" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&ігнорувати зміни пробілів" @@ -1356,46 +1395,46 @@ msgstr "&ігнорувати зміни пробілів" msgid "&known changes" msgstr "&відомі зміни" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(немає списку змін)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(немає номера рядка)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(немає значення)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(не знайдено)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(невідомо)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- усі -" @@ -1403,13 +1442,14 @@ msgstr "- усі -" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1417,7 +1457,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1433,7 +1473,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1449,31 +1489,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<Усі гілки>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "<Автоматично згенеровано Git-ом>" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "<Локальні гілки>" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "<Розділювач>" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "<Без назви>" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1482,66 +1522,66 @@ msgid "" "And read the manual!" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1549,7 +1589,7 @@ msgstr "" msgid "" msgstr "<опис>" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<новий список змін>" @@ -1561,73 +1601,73 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." -msgstr "" +msgstr "Гілка з такою назвою вже існує." -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Список розділених новими рядками шляхів, для яких не відображається контекстне меню.\r\nЯкщо в кінець шляху додати символ '*', то всі файли та підкаталоги цього шляху теж буде виключено.\r\nПорожній список дозволить контекстне меню на всіх шляхах." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Необхідний ресурс виявився недоступним." -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Програма перегляду файлів відмінностей GNU (файлів-латок).\r\nЯкщо у вас такої немає, скористайтеся NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" -msgstr "" +msgstr "&Про" #. Resource IDs: (1) msgid "A&pply" @@ -1641,48 +1681,48 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Припинити" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "Припинити &злиття" #. Resource IDs: (4592) msgid "Abort Merge" -msgstr "" +msgstr "Припинити злиття" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Про" #. Resource IDs: (129) msgid "About TortoiseGit" -msgstr "" +msgstr "Про TortoiseGit" #. Resource IDs: (100) msgid "About TortoiseGitBlame" -msgstr "" +msgstr "Про TortoiseGitBlame" #. Resource IDs: (136) msgid "About TortoiseGitMerge" -msgstr "" +msgstr "Про TortoiseGitMerge" #. Resource IDs: (1) msgid "Accept certificate" -msgstr "" +msgstr "Прийняти сертифікат" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Доступ до %1 було заборонено." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Дія" @@ -1690,26 +1730,26 @@ msgstr "Дія" msgid "Action log" msgstr "Лог дій" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Дії" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Активувати список завдань" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Активні файли" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Об'єкти ActiveX не можна зберігати під час виходу з Windows!\nСкасувати всі зміни в %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Додати" @@ -1717,7 +1757,7 @@ msgstr "Додати" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Додати '%s' до словника" @@ -1730,31 +1770,31 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" -msgstr "" +msgstr "Додати іншу фіксацію?" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Додати характерну для розширення програму відмінностей" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Додати характерну для розширення програму злиття" #. Resource IDs: (1065) msgid "Add new files automatically to Git" -msgstr "" +msgstr "Автоматично додавати нові файли до Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Додати до списку &ігнорованих" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Додати до Панелі швидкого доступу" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Додати..." @@ -1762,11 +1802,11 @@ msgstr "Додати..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Додати/Редагувати характерну для розширення програму Відмінностей/Злиття" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Додано" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1774,25 +1814,25 @@ msgid "" "to the ignore list." msgstr "Шаблон(и) файлів\n%s\nдодано до списку ігнорованих." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Додавання" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Додає вибрані файли чи файлову маску до списку ігнорованих" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Коригувати налаштування\nНалаштування" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Хитріше" @@ -1800,43 +1840,43 @@ msgstr "Хитріше" msgid "Advanced Diff/Merge Settings" msgstr "Хитріші налаштування Злиття/Відмінностей" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Хитріші налаштування відмінностей" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Хитріші налаштування злиття" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Все" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Усі команди" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Усі файли (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Усі файли (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" -msgstr "" +msgstr "Усі локальні гілки" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1844,49 +1884,49 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Усі зміни буде втрачено! Дійсно переініціалізувати всі рядки знарядь та меню?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Усі зміни буде втрачено! Дійсно переініціалізувати клавіатурні присвоєння?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Усі зміни буде втрачено! Дійсно переініціалізувати меню '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Усі зміни буде втрачено! Дійсно переініціалізувати рядок знарядь '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." -msgstr "" +msgstr "Вже оновлено." #. Resource IDs: (1482) msgid "Always push to the selected remote archive for this local branch" @@ -1900,11 +1940,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Завжди використовувати локальні налаштування системи для показу часу і дати." -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1912,12 +1952,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1928,7 +1968,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1941,34 +1981,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "З %1 було асоційовано неправильний дескриптор файлу." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Трапилася невідома помилка." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Під час доступу до %1 трапилася невідома помилка." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "У рядку %d виявлено невідомий тип рядка!" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "" @@ -1978,21 +2018,21 @@ msgstr "Меню кістяка програми:" #. Resource IDs: (32780) msgid "Apply &Patch..." -msgstr "" +msgstr "Застосувати &патч..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Застосувати патч..." #. Resource IDs: (311) msgid "Apply Patches" -msgstr "" +msgstr "Застосувати патчі" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "" @@ -2000,7 +2040,7 @@ msgstr "" msgid "Apply unified diff" msgstr "Застосувати об'єднані відмінності" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Аква стиль" @@ -2008,39 +2048,39 @@ msgstr "Аква стиль" msgid "Arabic" msgstr "" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Дійсно позначити конфліктні файли як владнані?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" +msgid "Arrange &vertical\tV" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Призначено до списку змін '%s'" @@ -2049,11 +2089,11 @@ msgstr "Призначено до списку змін '%s'" msgid "Assigned to:" msgstr "Призначено:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2065,34 +2105,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "У модифікації: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Була спроба непідтримуваної операції" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Спроба доступу до %1 після його закінчення." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Спроба прочитати з %1, що пише." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Спроба писати до %1, що читає." @@ -2109,11 +2149,11 @@ msgstr "Автентифікація" msgid "Authentication data" msgstr "Дані автентифікації" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Автор" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2121,7 +2161,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Автор:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Автори" @@ -2141,37 +2181,37 @@ msgstr "" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "" +msgstr "Auto Crlf:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Автоматично ховати" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Автоматично все ховати" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Автоматично закривати за відсутності конфліктів" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Автоматично закривати за відсутності помилок" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Самозакривати, якщо нема злиттів, додавань або знищень" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2185,7 +2225,7 @@ msgstr "" msgid "Autoload Putty &Key" msgstr "" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Автоматичне" @@ -2205,7 +2245,7 @@ msgstr "Середнє" msgid "B&rowse..." msgstr "Про&глянути" -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Назад" @@ -2217,7 +2257,7 @@ msgstr "Тло" msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Гістограма" @@ -2237,7 +2277,7 @@ msgstr "Базовий файл:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2249,45 +2289,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Растр\nрастр" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Чорний стиль" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Прокоментувати" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Коментує кожен рядок файла автора" @@ -2295,26 +2335,30 @@ msgstr "Коментує кожен рядок файла автора" msgid "Blend alpha" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Блакитний стиль" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Було вказано обидва /logmsg і /logmsgfile !\nМожна вказувати тільки одного з них." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2326,46 +2370,46 @@ msgstr "Про&глянути..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" -msgstr "" +msgstr "Гілка" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" -msgstr "" +msgstr "Назва гілки" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "" #. Resource IDs: (1518) msgid "Branch:" -msgstr "" +msgstr "Гілка:" #. Resource IDs: (1383) msgid "Bro&wse" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "" @@ -2377,7 +2421,7 @@ msgstr "" msgid "Browse..." msgstr "Проглянути..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Баг-ID" @@ -2389,7 +2433,7 @@ msgstr "" msgid "Bug-ID/Issue-Nr:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Баг-ID" @@ -2405,7 +2449,7 @@ msgstr "" msgid "Button Appearance" msgstr "Вигляд кнопки" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2421,7 +2465,7 @@ msgstr "Пе&ревірити вже" msgid "C&ommands:" msgstr "&Команди:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "С&творити гілку/зріз із модифікації" @@ -2429,17 +2473,17 @@ msgstr "С&творити гілку/зріз із модифікації" msgid "C&urrent Keys:" msgstr "П&оточні клавіші:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "В&ирізати" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" #. Resource IDs: (65535) msgid "CC:" -msgstr "" +msgstr "CC:" #. Resource IDs: (1741) msgid "Calculate" @@ -2449,11 +2493,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Можна двічі клацнути у списку логу, щоб порівняти з попередньою модифікацією" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Не вдається активувати статичний об'єкт ActiveX." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2462,80 +2506,80 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Не можу скопіювати растрове зображення до буфера обміну!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Не вдається створити нове зображення!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Не можу вклеїти растрове зображення з буфера обміну!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Скасувати" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Не вдається показати відмінності через неузгоджені нові рядки у файлі." @@ -2547,7 +2591,7 @@ msgstr "Каска_дом" msgid "Cascaded context menu" msgstr "Каскадні контекстні меню" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "Чутливі до регістра" @@ -2571,33 +2615,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Змінити розташування вікна" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Змінити розмір вікна" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2605,38 +2649,38 @@ msgstr "" msgid "Changed Files" msgstr "Змінені файли" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" -msgstr "" +msgstr "Змінені файли: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Список змін %s переміщено" @@ -2645,7 +2689,7 @@ msgstr "Список змін %s переміщено" msgid "Changes made (double-click on file for diff):" msgstr "Внесені зміни (для відмінностей двічі клацніть файл):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "" @@ -2653,43 +2697,43 @@ msgstr "" msgid "Char position where to show a border line in commit text boxes:" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Позначити" #. Resource IDs: (174) msgid "Check For Updates - TortoiseGit" -msgstr "" +msgstr "Перевірити наявність оновлень - TortoiseGit" #. Resource IDs: (1031) msgid "Check For Updates..." msgstr "Перевірити наявність оновлень..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Перевірити на моди&фікування" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Первірте введений шлях і/або URL" -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Позначте щоб використовувати менш докладний формат дати й часу в повідомленнях логу" @@ -2697,31 +2741,31 @@ msgstr "Позначте щоб використовувати менш докл msgid "Check:" msgstr "Перевірити:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Вивірити" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2729,11 +2773,11 @@ msgstr "" msgid "Chinese" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" -msgstr "" +msgstr "Обрати сховище" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2745,78 +2789,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Очищується" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Прибиранню не вдалося обробити наступні шляхи:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Прибирання успішно обробило наступні шляхи:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Очистити" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Знаряддя для очищення\nОчистити" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Очищує кешовані логи з %ld репозиторіїв" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Очищає збережені розміри та розташування %ld діалогів" @@ -2825,7 +2869,7 @@ msgstr "Очищає збережені розміри та розташуван msgid "Click here to go to the website" msgstr "Клацніть тут щоб піти на вебсайт" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Клацніть тут що вибрати нещодавно надруковане повідомлення" @@ -2841,17 +2885,17 @@ msgid "" "extension" msgstr "Клацніть \"Хитріше\", щоб вказати альтернативні програми злиття, залежно від розширення файла" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Буфер обміну" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2859,57 +2903,57 @@ msgstr "" msgid "Clone Existing Repository" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" -msgstr "" +msgstr "Клонувати сховище" #. Resource IDs: (1653) msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "" -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Закрити" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Закрити повноекранний режим" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Закрити попередній перегляд друку\n&Закрити" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Закрити вручну" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Закриває активне вікно і пропонує зберегти документи" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Згорнути" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2935,7 +2979,7 @@ msgstr "Кольори:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2943,11 +2987,11 @@ msgstr "" msgid "Comman&ds:" msgstr "&Команди:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Команда" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Командний рядок" @@ -2955,7 +2999,7 @@ msgstr "Командний рядок" msgid "Command Line To Execute:" msgstr "Командний рядок для виконання:" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Команду спіткала невдача." @@ -2963,49 +3007,49 @@ msgstr "Команду спіткала невдача." msgid "Commands" msgstr "Команди" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Зафіксувати" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" -msgstr "" +msgstr "Дата фіксації" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" -msgstr "" +msgstr "Назва фіксації" #. Resource IDs: (1750) msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3013,19 +3057,19 @@ msgstr "" msgid "Commit to:" msgstr "Зафіксувати в:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Зафіксувати..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Фіксування за автором" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Фіксування за датою" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "" @@ -3034,15 +3078,15 @@ msgstr "" msgid "Commits each week:" msgstr "Фіксувань щотижня:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Фіксує зміни до сховища" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3054,52 +3098,52 @@ msgstr "Фіксування неверсійного каталогу не до msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "Порівняти &HEAD-модифікації" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "Порівняти 2 файли" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "Порівняти пробіли" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "Порівняти з &базовим" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "Порівняти з попередньою модифікацією" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "Порівнює всі пробіли під час порівнювання\nПорівнювати пробіли" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "Порівнює файл з останньою зафіксованою модифікацією, щоб показати внесені зміни" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Готово" @@ -3115,7 +3159,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3149,27 +3193,27 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" -msgstr "" +msgstr "Конфліктні файли" #. Resource IDs: (65535) msgid "Conflict resolved" msgstr "Конфлікт вирішено" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Конфліктні" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" -msgstr "" +msgstr "Конфлікти" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Конфлікти: %d" @@ -3182,201 +3226,201 @@ msgstr "Контекстні меню:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" -msgstr "" +msgstr "Продовжити" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Стиснути пристиковане вікно" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Копіювати" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Скопійовано" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Копіювати" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Знаряддя для копіювання\nКопіювати" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" -msgstr "" +msgstr "Копіювати всю інформацію до буфера обміну" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Копіювати та перейменувати" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" -msgstr "" +msgstr "Копіювати шляхи до буфера обміну" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Копіювати виділене до &буфера обміну" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Копіює виділене та кладе його до буфера обміну/nКопіювати" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Копіювати до буфера обміну" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Копіювання: Нове ім'я для %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Копіювання..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Не вдалося додати %s до списку ігнорованих!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Не вдалося перевірити наявність новішої версії!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" -msgstr "" +msgstr "Не вдалося перевірити наявність новішої версії! %s (Код помилки: 0x%08X)" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" "\n" "%s" -msgstr "" +msgstr "Не вдалося скопіювати файли!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Не вдалося створити %1, тому що каталог заповнений." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Не вдалося визначити останню зафіксовану модифікацію!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Не вдалося отримати стан!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Не вдалося відкрити %1, бо відкрито надто багато файлів." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Не вдалося відкрити файл\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Не вдалося видалити %1, бо він у поточному каталозі." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Не вдалося видалити %s зі списку ігнорованих" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Не вдалося отримати URL файла!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3384,7 +3428,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3392,7 +3436,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3400,11 +3444,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Не вдалося розпочати роботу на принтері." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3412,11 +3456,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Не вдалося запустити нитку!" @@ -3424,7 +3468,7 @@ msgstr "Не вдалося запустити нитку!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3437,17 +3481,17 @@ msgstr "" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." -msgstr "" +msgstr "Створити гілку..." #. Resource IDs: (243) msgid "Create Changelist" @@ -3455,31 +3499,31 @@ msgstr "Створити список змін" #. Resource IDs: (1527) msgid "Create New Branch" -msgstr "" +msgstr "Створити нову гілку" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3488,49 +3532,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Створює файл-латку з відмінностей між двома файлами\nСтворити файл-латку" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Створює базу даних сховища у поточному місцеперебуванні" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Створює файл об'єднаних відмінностей з усіма внесеними вами змінами" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3542,7 +3586,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "В&ирізати" @@ -3550,15 +3594,15 @@ msgstr "В&ирізати" msgid "Current" msgstr "Поточний" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" -msgstr "" +msgstr "Поточна гілка" #. Resource IDs: (65535) msgid "Current Branch:" -msgstr "" +msgstr "Поточна гілка:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3570,7 +3614,7 @@ msgstr "" msgid "Current version is:" msgstr "Поточна версія:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Поточна версія: %s" @@ -3583,7 +3627,7 @@ msgstr "Адап&тувати..." msgid "Custom" msgstr "Адаптоване" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Адаптувати" @@ -3591,19 +3635,19 @@ msgstr "Адаптувати" msgid "Customize Keyboard" msgstr "Адаптувати клавіатуру" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Адаптувати Панель швидкого доступу" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Адаптувати Панель швидкого доступу..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3617,123 +3661,127 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Дата" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Типове" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Типове меню" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Типове меню програми. З'являється, коли немає відкритих документів." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Типово - в кодування UTF-8" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Знищити" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Знищити й &ігнорувати %d елементів за назвою" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Знищити й ігнорувати %d елементів за роз&ширенням" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" -msgstr "" +msgstr "Знищити гілку" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" -msgstr "" +msgstr "Знищити віддалену гілку" #. Resource IDs: (4579) msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Знищено" @@ -3741,36 +3789,36 @@ msgstr "Знищено" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Знищує та додає вибрані файли чи файлову маску до списку ігнорованих" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Знищує файл з логом дій" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Знищується" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "Знищуються кешовані дані" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "Знищується файл" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3790,7 +3838,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Опис" @@ -3798,7 +3846,7 @@ msgstr "Опис" msgid "Description:" msgstr "Опис:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Зняти видилення зі списку змін" @@ -3806,33 +3854,33 @@ msgstr "Зняти видилення зі списку змін" msgid "Destination" msgstr "" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Диск призначення переповнений." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3846,11 +3894,15 @@ msgstr "Розміри та розташування діалогів" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "Параметри Diff" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3882,7 +3934,7 @@ msgstr "Файл відмінностей:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3894,12 +3946,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3912,19 +3964,19 @@ msgstr "Різниця між" msgid "Diffing" msgstr "Пошук відмінностей" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3936,26 +3988,26 @@ msgstr "Каталог:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Під час доступу до %1 диск переповнився." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Відхилити виключення: %1" @@ -3964,44 +4016,52 @@ msgstr "Відхилити виключення: %1" msgid "Display &buttons in this order" msgstr "Відображати &кнопки у цій послідовності" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Відображати довідку для клацнутих кнопок, меню та вікон\nДовідка" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Відображати довідку для поточного завдання чи команди\nДовідка" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Відображати інструкції з використання довідки\nДовідка" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Відображати інформацію про програму, номер версії та авторські права\nПро" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4014,54 +4074,71 @@ msgstr "Не показувати контекстне меню для таки msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Дійсно знищити стрічку знаряддь '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4069,7 +4146,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4077,21 +4154,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4099,21 +4176,21 @@ msgid "" "as resolved?" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Перевантажити документи, щоб відобразити зміни налаштувань?\nПримітка: зроблені вами зміни будуть втрачені!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4121,28 +4198,28 @@ msgstr "" msgid "Document :" msgstr "Документ :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4152,11 +4229,11 @@ msgstr "" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "" @@ -4168,7 +4245,7 @@ msgstr "" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Потягніть, щоб це меню попливло" @@ -4196,6 +4273,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "В&иключити шляхи:" @@ -4204,7 +4285,7 @@ msgstr "В&иключити шляхи:" msgid "E&xit" msgstr "Ви&хід" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Експорт..." @@ -4224,11 +4305,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Редагувати" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4244,23 +4325,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Редагувати зображення кнопки" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Редагувати автора" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Редагувати характерну для розширення програму відмінностей" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Редагувати характерну для розширення програму злиття" @@ -4272,11 +4353,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Редагувати повідомлення логу" @@ -4296,25 +4377,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Ім'я або ж IP проксі-сервера" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Знаряддя еліпса\nЕліпс" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4322,7 +4403,7 @@ msgstr "" msgid "Empty" msgstr "Порожньо" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "" @@ -4338,7 +4419,7 @@ msgstr "" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4347,10 +4428,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "" @@ -4359,35 +4444,35 @@ msgstr "" msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "Кодування" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Під час доступу до %1 виявлено апаратну помилку вводу/виводу." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Під час доступу до %1 трапилось порушення блокування." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Під час доступу до %1 трапилось порушення спільного доступу." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Трапився неправильний аргумент." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Під час читання %1 трапилася несподівана помилка." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Під час запису %1 трапилася несподівана помилка." @@ -4400,11 +4485,11 @@ msgstr "" msgid "End" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Збільшити вікно до повного розміру" @@ -4412,23 +4497,23 @@ msgstr "Збільшити вікно до повного розміру" msgid "Enter Log Message" msgstr "Введіть повідомлення для логу" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Введіть GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Введіть валюту" -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Введіть дату і/або час." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Введіть дату." @@ -4436,33 +4521,33 @@ msgstr "Введіть дату." msgid "Enter a name for the changelist:" msgstr "" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Введіть номер від %1 до %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Введіть номер." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Введіть ціле додатнє число." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Введіть час." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Введіть ціле число від %1 до %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Введіть ціле число від 0 до 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Введіть ціле число." @@ -4474,7 +4559,7 @@ msgstr "Введіть тут файловий вміст для тестува msgid "Enter log &message:" msgstr "Введіть логове повідо&млення:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Введіть не більше ніж %1 символів." @@ -4483,43 +4568,43 @@ msgstr "Введіть не більше ніж %1 символів." msgid "Enter the regex string below:" msgstr "Введіть тут регулярний вираз:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Стерти геть усе\nСтерти все" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Стерти виділення\nСтерти" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Помилка" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Помилка перебудови кеша піктограм оболонки!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4529,28 +4614,28 @@ msgstr "Виконувані (*.exe)|*.exe|Командні (*.com)|*.com|Ін msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Існуючі" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Вийти" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Розгорнути (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Розгорнути пристиковане вікно" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Відкрити Провідником" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Експортувати" @@ -4558,36 +4643,36 @@ msgstr "Експортувати" msgid "Export Zip File" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Експортувати також неверсійні файли" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Експортування..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Розширення" @@ -4603,7 +4688,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Зовнішня" @@ -4611,101 +4696,101 @@ msgstr "Зовнішня" msgid "External Program:" msgstr "Зовнішня програма:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Не вдалося відвернути" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Не вдалося з'єднатися.\nМожливо, посилання зіпсоване." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Не вдалося конвертувати об'єкт ActiveX." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Не вдалося створити порожній документ." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Не вдалося створти об'єкт. Переконайтеся, що прикладна програма зазначена в системному реєстрі." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Не вдалося запустити довідку." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Не вдалося запустити програму на сервері." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Не вдалося відкрити документ." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Не вдалося виконати операцію на сервері." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Не вдалося зберегти документ." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Невдача!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4713,62 +4798,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." -msgstr "" +msgstr "Видобувається стан..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Видобувається файл..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Видобувається %s модифікація файла:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Файл" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "Кодування файлу" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "" @@ -4777,27 +4862,27 @@ msgstr "" msgid "File changes each week:" msgstr "Змін файлів кожного тижня:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Відмінності файлів" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Файл порожній." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Список файлів порожній" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Латки файлів" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4809,7 +4894,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Розмір файла:\t\t%s (%s)\nШирина:\t\t\t%ld пікселів\nВисота:\t\t\t%ld пікселів\nРоздільна здатність по горизонталі:\t%.1f dpi\nРоздільна здатність по вертикалі:\t%.1f dpi\nГлибина:\t\t\t%d біт\nЗбільшення:\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4829,7 +4914,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Розмір файла:\t\t%s (%s)\nШирина:\t\t\t%ld пікселів\nВисота:\t\t\t%ld пікселів\nРоздільна здатність по горизонталі:\t%.1f dpi\nРоздільна здатність по вертикалі:\t%.1f dpi\nГлибина:\t\t\t%d біт\nЗбільшення:\t\t\t%d%%\n\nРозмір файла:\t\t%s (%s)\nШирина:\t\t\t%ld пікселів\nВисота:\t\t\t%ld пікселів\nРоздільна здатність по горизонталі:\t%.1f dpi\nРоздільна здатність по вертикалі:\t%.1f dpi\nГлибина:\t\t\t%d біт\nЗбільшення:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4841,7 +4926,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Розмір файла:\t\t\t%s (%s)\nШирина:\t\t\t%ld пікселів\nВисота:\t\t\t%ld пікселів\nРоздільна здатність по горизонталі:\t%.1f dpi\nРоздільна здатність по вертикалі:\t\t%.1f dpi\nГлибина:\t\t\t%d біт\nЗбільшення:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4861,7 +4946,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Розмір файла:\t\t\t%s (%s)\nШирина:\t\t\t%ld пікселів\nВисота:\t\t\t%ld пікселів\nРоздільна здатність по горизонталі:\t%.1f dpi\nРоздільна здатність по вертикалі:\t\t%.1f dpi\nГлибина:\t\t\t%d біт\nЗбільшення:\t\t\t%d%%\n\nРозмір файла:\t\t\t%s (%s)\nШирина:\t\t\t%ld пікселів\nВисота:\t\t\t%ld пікселів\nРоздільна здатність по горизонталі:\t%.1f dpi\nРоздільна здатність по вертикалі:\t\t%.1f dpi\nГлибина:\t\t\t%d біт\nЗбільшення:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Ім'я файла" @@ -4869,17 +4954,17 @@ msgstr "Ім'я файла" msgid "Files" msgstr "Файли" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Знаряддя заповнення\nЗаповнення" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Фільтрувати по" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Фільтрувати шляхи" @@ -4891,11 +4976,11 @@ msgstr "" msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Знайти" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4905,17 +4990,17 @@ msgstr "Знайти вказаний текст\nЗнайти" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4923,23 +5008,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Скінчили!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "" @@ -4948,18 +5033,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Каталог" @@ -4971,38 +5056,34 @@ msgstr "" msgid "Font" msgstr "Шрифт" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Щоб отримати Довідку, натисніть F1. Горизонтальна прокрутка за допомогою Ctrl + коліщатко прокрутки" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Для повної історії зніміть виділення зі 'Спинитися при копіюванні/перейменуванні'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Змусити" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5020,20 +5101,20 @@ msgstr "" msgid "Format Patch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Уперед" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5063,11 +5144,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5075,7 +5156,7 @@ msgstr "" msgid "From:" msgstr "Від:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "На повний екран" @@ -5083,7 +5164,7 @@ msgstr "На повний екран" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Цілком рекурсивно" @@ -5091,7 +5172,7 @@ msgstr "Цілком рекурсивно" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5099,24 +5180,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "GDI+ не ініціалізується!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ не вдалося створити растровий об'єкт. Мабуть пам'яті не вистачає." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Збирається інформація. Зачекайте..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5160,29 +5241,29 @@ msgstr "" msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Отримати логи злиття" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Отримується інформація..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Отримується необхідна інформація..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Отримуються об'єднані відмінності" @@ -5194,23 +5275,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "" @@ -5218,35 +5299,35 @@ msgstr "" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5258,31 +5339,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5303,7 +5384,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5315,47 +5396,47 @@ msgstr "Перейти до рядка" msgid "Go to line" msgstr "Перейти на рядок" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Перейти до наступного конфлікта\nНаступний конфлікт" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Перейти до наступної відмінності\nНаступна відмінність" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Перейти до попереднього конфлікта\nПопередній конфлікт" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Перейти до попередньої відмінності\nПопередня відмінність" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Перейти до рядка" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "" @@ -5371,11 +5452,11 @@ msgstr "Сірий" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Групувати списки змін" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5391,7 +5472,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5403,7 +5484,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Довідка" @@ -5427,11 +5508,11 @@ msgstr "Шістнадцятковий" msgid "Hide Menus for unversioned paths" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Заховати пристиковане вікно" @@ -5439,25 +5520,25 @@ msgstr "Заховати пристиковане вікно" msgid "Hide the script while running" msgstr "Ховати скрипт поки він виконується" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Сховати/Показати список файлів-латок\nХоває або показує список файлів-латок" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5467,7 +5548,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Порада: виберіть контекстне меню, перейдіть на сторінку 'Команди' та перетягніть кнопки з рядка знарядь у вікно меню." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Початок" @@ -5483,7 +5564,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Скрипти зачіпок::Інтеграція проблемобліку" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Тип зачіпки" @@ -5499,7 +5580,7 @@ msgstr "Вк&лючати шляхи:" msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5507,55 +5588,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5563,15 +5645,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5595,7 +5677,7 @@ msgstr "" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32809:V C +F" @@ -5603,7 +5685,7 @@ msgstr "ID:32809:V C +F" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32814:V C +L" @@ -5611,7 +5693,7 @@ msgstr "ID:32814:V C +L" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5619,16 +5701,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5639,17 +5721,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5661,7 +5743,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5725,7 +5807,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Перекривання піктограм" @@ -5737,62 +5819,62 @@ msgstr "Перекривання піктограм::Набір піктогра msgid "Icon Overlays::Overlay Handlers" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" -msgstr "" +msgstr "Піктограми (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Всі файли (*.*)|*.*||" #. Resource IDs: (65535) msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Піктограми/Дизайн/Код:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Якщо активовано, запобігає показу перекривань і контекстного меню в діалогах 'зберегти як...' і 'відкрити'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Якщо позначено, то подвійне клацання на модифікації у логовому списку порівнює її з попередньою модифікацією" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Якщо встановлено, то файли в неверсійних каталогах можуть бути показаними у контролі стану.\r\nКонтроль стану використовується, наприклад, у діалозі фіксації." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5805,16 +5887,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Ігнорувати" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Ігнорувати %d елементів за роз&ширенням" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "" @@ -5826,15 +5908,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Ігнорувати всі зміни пробілів" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5842,7 +5924,7 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Ігнорувати зміни &регістра" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5860,11 +5942,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Ігнорувати &кінцівки рядків (рекомендовано)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5872,29 +5954,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Ігнорувати зміни пробілів" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Ігнорує всі зміни пробілів під час порівнювання\nІгнорувати всі зміни пробілів" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5912,24 +5994,24 @@ msgstr "Зображення &і текст" msgid "Images" msgstr "Зображення" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Безпосередні нащадки, включно з каталогами" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Імпорт" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5938,16 +6020,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5971,24 +6053,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Включати лише наступний діапазон модифікацій:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Невірне ім'я файла" -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "" @@ -6000,25 +6082,25 @@ msgstr "Відмінності в рядках" msgid "Input" msgstr "Ввід" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Вставити вміст буфера обміну\nВклеїти" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Недостатньо пам'яті для виконання операції." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Внутрішня помилка програми." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Неправильна грошова одиниця." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6026,7 +6108,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6049,7 +6131,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6057,11 +6139,11 @@ msgstr "" msgid "Keep changelists" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6075,7 +6157,7 @@ msgstr "Клавіатура" msgid "Keyboard shortcuts:" msgstr "Гарячі клавіші:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Клавіші" @@ -6119,27 +6201,51 @@ msgstr "" msgid "Language:" msgstr "&Мова:" -#. Resource IDs: (85) -msgid "Last Author" +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" msgstr "" -#. Resource IDs: (68) -msgid "Last Commit" +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" msgstr "" -#. Resource IDs: (86) -msgid "Last Modified" +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" msgstr "" -#. Resource IDs: (65535) -msgid "Last Modified:" +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) +msgid "Last Author" +msgstr "Останній автор" + +#. Resource IDs: (1076) +msgid "Last Commit" +msgstr "Остання фіксація" + +#. Resource IDs: (1364) +msgid "Last Modified" +msgstr "" + +#. Resource IDs: (11030) +msgid "Last Modified:" msgstr "" #. Resource IDs: (1616) msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6147,17 +6253,17 @@ msgstr "" msgid "Least active author:" msgstr "Найменш активний автор:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Ліве подання:" @@ -6165,11 +6271,11 @@ msgstr "Ліве подання:" msgid "Left image" msgstr "Ліве зображення" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Граф рядків" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6183,12 +6289,12 @@ msgstr "Смуга відмінностей рядків" msgid "Line differences" msgstr "Відмінності рядків" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "" @@ -6201,26 +6307,26 @@ msgstr "" msgid "Line:" msgstr "Рядок:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Рядок: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" -msgstr "" +msgstr "Рядків додано" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" -msgstr "" +msgstr "Рядків видалено" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Список тем довідки\nТеми довідки" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6238,45 +6344,45 @@ msgstr "Завантажити зображення" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" #. Resource IDs: (65535) msgid "Local Branch" -msgstr "" +msgstr "Локальна гілка" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" -msgstr "" +msgstr "Локальний стан" #. Resource IDs: (65535) msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6286,7 +6392,7 @@ msgstr "" msgid "Locator Bar" msgstr "Пошукова смуга" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "" @@ -6326,12 +6432,12 @@ msgstr "Логові повідомлення (діалог показу лог msgid "Login:" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6342,26 +6448,22 @@ msgstr "" msgid "Lum" msgstr "Яскр" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL поштової системи непридатна." -#. Resource IDs: (156) -msgid "Main" -msgstr "" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6374,47 +6476,47 @@ msgstr "" msgid "Manage" msgstr "" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Позначити владнаним" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Позначити для порівняння" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Враховувати &реєстр" @@ -6438,7 +6540,7 @@ msgstr "Ме&ню показують першими нещодавно вико msgid "Menu" msgstr "Меню" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Рядок меню" @@ -6446,7 +6548,7 @@ msgstr "Рядок меню" msgid "Menu s&hadows" msgstr "&Тіні меню" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Злити" @@ -6454,34 +6556,34 @@ msgstr "Злити" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Злити переінтегрування" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Злито" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6489,22 +6591,22 @@ msgstr "" msgid "Merging" msgstr "Зливається" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Повідомлення" @@ -6516,7 +6618,7 @@ msgstr "" msgid "Message part &expression:" msgstr "" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Повідомлення" @@ -6524,11 +6626,11 @@ msgstr "Повідомлення" msgid "Min" msgstr "Мін" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Моє" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Мінімізувати Смужку" @@ -6540,7 +6642,11 @@ msgstr "" msgid "Misc" msgstr "Різне" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Змішане" @@ -6548,35 +6654,35 @@ msgstr "Змішане" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Дата модифікації" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Модифіковано" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Ще" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Ще кнопок" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Ще команд..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Ще кольорів..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Ще..." @@ -6596,41 +6702,41 @@ msgstr "Перемістити в&низ" msgid "Move &Up" msgstr "Перемістити в&гору" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Посунути елемент додолу" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Посунути елемент догори" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Перемістити та перейменувати" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Перенести до списку змін" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Перемістити/Перейменувати" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Перемістити: Нове ім'я для %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Переносить перед відверненням змінені файли до смітника." -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Переміщення..." @@ -6638,11 +6744,11 @@ msgstr "Переміщення..." msgid "My file:" msgstr "Мій файл:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "" @@ -6654,7 +6760,7 @@ msgstr "" msgid "Navigate" msgstr "" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6664,11 +6770,11 @@ msgstr "" msgid "Navigation Pane Options" msgstr "Параметри панелі навігіції" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Параметри панелі навігіції..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Вкладено" @@ -6680,7 +6786,7 @@ msgstr "Мережа" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Новий" @@ -6689,43 +6795,43 @@ msgid "New &name:" msgstr "&Нова назва:" #. Resource IDs: (309) -msgid "New Branch\\Tag" +msgid "New Branch/Tag" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Нове меню" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6733,33 +6839,29 @@ msgstr "" msgid "Next" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Наступна сторінка\nНаступна сторінка" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "" -#. Resource IDs: (73) -msgid "No" -msgstr "" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6771,102 +6873,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Відмінностей не знайдено!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Повідомлення про помилку нема в наявності." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Помилки не трапилось." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "За поточних налаштувань нема яких файлів показувати.\nПеревірте нижченаведені налаштування, щоб побачити неверсійні, ігноровані та/або немодифіковані файли.\nЩоб побачити віддалені зміни, натисніть 'Перевірити сховище'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." +"the last commit." msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Графа нема в наявності" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Не знайдено кодувальник зображень для %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Немає кеша стану. Тільки версійні каталоги отримують перекриття, а файли не отримують." -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Тезаурус припущень не має" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6874,11 +6981,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Жодного" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Нормальних" @@ -6890,30 +6997,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Не всі входження до системного реєстру (чи INI файлу) було видалено." -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Не достатньо пам'яті!\nСпробуйте зменшити розмір графу модифікацій\nзгортанням вузлів або зменшенням масштабу." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6921,7 +7028,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6940,26 +7047,26 @@ msgstr "Зауваження: каталог містить неверсійні msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Зауваження" @@ -6967,7 +7074,7 @@ msgstr "Зауваження" msgid "Number Commits" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "" @@ -6980,7 +7087,7 @@ msgstr "Кількість авторів:" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7052,41 +7159,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "Гаразд" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Кольори Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7094,15 +7201,15 @@ msgstr "" msgid "Older lines" msgstr "Давніші рядки" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Деяка кількість файлів у конфліктному стані." @@ -7114,29 +7221,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Лише нащадки файла" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Дозволяються тільки числа\n(можливо розділені комами)!" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Лише цей елемент" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Відкрити" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7146,51 +7253,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Відкрити з буфера обміну" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Відкрити файл з зображенням..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Відкрити батьківський каталог" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Відкрити за допомогою..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Відкриває Довідку\nТеми Довідки" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Параметр" @@ -7199,30 +7307,30 @@ msgid "Options" msgstr "Параметри" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "&Первісний розмір" +msgid "Ori&ginal size\tS" +msgstr "&Первісний розмір\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Інші панелі завдань" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Інші" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Не вистарчає пам`яті." @@ -7230,7 +7338,7 @@ msgstr "Не вистарчає пам`яті." msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7238,20 +7346,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "Перезаписати" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Сторінка %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7262,15 +7374,15 @@ msgstr "Сторінка %u\nСторінки %u-%u\n" msgid "Page :" msgstr "Сторінка :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Параметри" @@ -7278,25 +7390,25 @@ msgstr "Параметри" msgid "Parameters:" msgstr "Параметри:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7308,39 +7420,39 @@ msgstr "" msgid "Password" msgstr "" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Пароль:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Вставити" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Знаряддя вклеювання\nВклеїти" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Вставити список імен файлів" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Вклеює шлях svn з буфера обміну, внаслідок отримуючи операцію перміщення (вирізання) чи копіювання." -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7356,54 +7468,54 @@ msgstr "" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Шлях" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "" #. Resource IDs: (1580, 65535) msgid "Path:" -msgstr "" +msgstr "Шлях:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Шляхи" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Інструмент Олівець\nОлівець" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "" @@ -7411,24 +7523,24 @@ msgstr "" msgid "Personalized Menus and Toolbars" msgstr "Персоналізовані меню та рядки знарядь" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7438,56 +7550,56 @@ msgstr "Малюнок (метафайл)\nмалюнок" msgid "Picture:" msgstr "Малюнок:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Віяльцева діаграма" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Введіть скрипт зачіпки, який потрібно виконати" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Введіть шлях, до якого слід застосувати скрипт зачіпки." -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Виберіть тип скрипта зачіпки" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" -msgstr "" +msgstr "Виберіть гілку" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Зачекайте, відбувається скасування..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Зачекайте, поки отримуються відмінності..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Зачекайте..." @@ -7501,13 +7613,13 @@ msgstr "Порт:" #. Resource IDs: (1758) msgid "Port:" -msgstr "" +msgstr "Порт:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Зачіпка після фіксації" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7515,23 +7627,23 @@ msgstr "" msgid "Pre&v Page" msgstr "&Попередня сторінка" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Зачіпка перед фіксацією" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "" @@ -7543,11 +7655,11 @@ msgstr "Натисніть &нову Гарячу клавішу:" msgid "Press &new shortcut key:" msgstr "Натисніть &нову гарячу клавішу:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Попередній перегляд" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Попередній перегляд залатаного фалйа" @@ -7559,51 +7671,51 @@ msgstr "Попередній перегляд:" msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Попередня сторінка\nПопередня сторінка" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" -msgstr "" +msgstr "Попередня версія" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" -msgstr "" +msgstr "Попередній конфлікт" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" -msgstr "" +msgstr "Попередня відмінність" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "Друкувати" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "Друкувати документ\n&Друкувати" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "Друкувати ло файлу" @@ -7611,7 +7723,7 @@ msgstr "Друкувати ло файлу" msgid "Printer :" msgstr "Принтер :" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Файли принтера (*.prn)|*.prn|Усі файли (*.*)|*.*||" @@ -7619,11 +7731,11 @@ msgstr "Файли принтера (*.prn)|*.prn|Усі файли (*.*)|*.*||" msgid "Printing" msgstr "Друкується" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Програма" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Програми (*.exe)|*.exe|Усі файли (*.*)|*.*||" @@ -7631,11 +7743,11 @@ msgstr "Програми (*.exe)|*.exe|Усі файли (*.*)|*.*||" msgid "Progress" msgstr "Прогрес" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" -msgstr "" +msgstr "Проект" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Властивість" @@ -7643,7 +7755,7 @@ msgstr "Властивість" msgid "Property Page" msgstr "Сторінка властивостей" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Постачальник" @@ -7675,15 +7787,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7691,19 +7803,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "" @@ -7719,11 +7831,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7731,22 +7843,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Вийти з програми; пропонується зберегти документи\nВихід" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7764,11 +7876,15 @@ msgstr "R&AM диски" msgid "R&eset" msgstr "Пе&реініціалізувати" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "Пов&ернути до цієї модифікації" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7776,7 +7892,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7798,7 +7914,7 @@ msgstr "" msgid "Re&movable drives" msgstr "З&німні диски" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Пере&йменувати..." @@ -7814,15 +7930,15 @@ msgstr "Пе&реініціалізувати все " msgid "Re&store defaults" msgstr "&Відновити типові" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "По&вернути..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Почитайте 'Посібник зі щоденного користування' перш ніж влипнете..." @@ -7830,21 +7946,21 @@ msgstr "Почитайте 'Посібник зі щоденного корис msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Нещодавні" @@ -7856,21 +7972,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Нещодавно модифіковані рядки" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Тільки занотувати" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7884,17 +8000,21 @@ msgstr "" msgid "Recursive" msgstr "Рекурсивно" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Переробити попередньо скасовану дію\nПереробити" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Згорнути вікно у піктограму" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7902,31 +8022,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Оновити" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7938,7 +8058,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7957,7 +8077,7 @@ msgid "" "\\s : whitespaces" msgstr "Фільтр регулярних виразів:\r\n. : будь-який символ\r\nc+ : співпадає з символом c один або більше разів\r\nc* : співпадає з символом c нуль або більше разів\r\n^ : початок рядка\r\n$ : кінець рядка\r\n(string){n} : співпадає з рядком n разів\r\n(abcd) : підвираз\r\n[aei0-9] : співпадає з a,e,i та 0..9\r\n[^aei0-9] : будь-що, крім a,e,i та 0..9\r\n\r\n\\w : співпадає з a-z,A-Z,0-9 та _\r\n\\W : будь-який не буквоцифровий символ\r\n\\d : цифри 0-9\r\n\\s : пробіли" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "" @@ -7970,7 +8090,7 @@ msgstr "" msgid "Reload" msgstr "Перевантажити" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8004,21 +8124,21 @@ msgstr "" msgid "Remote Branch" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" -msgstr "Віддалений статус" +msgstr "Віддалений стан" #. Resource IDs: (65535) msgid "Remote:" @@ -8028,12 +8148,12 @@ msgstr "" msgid "Remove" msgstr "Видалити" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Видалити %ld елементів" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Видалити %s" @@ -8042,7 +8162,7 @@ msgstr "Видалити %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8050,21 +8170,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Видалити зі списку &ігнорованих" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Видалити з Панелі швидкого доступу" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Видалити зі списку змін" @@ -8076,7 +8196,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8084,11 +8204,11 @@ msgstr "" msgid "Removed" msgstr "Видалено" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Видалено зі списку змін" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8096,7 +8216,7 @@ msgid "" "from the ignore list." msgstr "Видалено шаблон(и) файлів\n%s\nзі списку ігнорованих" -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Видалає файл або маску файла зі списку ігнорованих елементів" @@ -8104,11 +8224,11 @@ msgstr "Видалає файл або маску файла зі списку msgid "Rena&me..." msgstr "Перей&менувати..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Перейменувати" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "" @@ -8117,20 +8237,20 @@ msgstr "" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Перейменувати/перемістити" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8140,7 +8260,7 @@ msgstr "Повторити останню дію\nПоторити" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8154,12 +8274,12 @@ msgstr "" msgid "Replace:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Замінюється" @@ -8183,11 +8303,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Питає ім'я та пароль" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "" @@ -8199,25 +8319,25 @@ msgstr "Переініціалізувати &все" msgid "Reset Type" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Переініціалізувати стовпці" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Владнати" @@ -8225,126 +8345,122 @@ msgstr "Владнати" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Владнати конфлікт використовуючи 'моє'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Владнати конфлікт використовуючи 'їхнє'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Владнано" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Владнано:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Владнує конфліктні файли" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Відновити" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Відновити типове" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Відновити вікно до нормального розміру" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Відновлено" -#. Resource IDs: (73) -msgid "Retry" -msgstr "" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Відвернути" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Відвернено" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Відвертає всі зміни, внесені пілся останнього оновлення" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Відвертає додаток до керування версіями" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Модифікація" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "&Граф модифікацій" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8360,31 +8476,31 @@ msgstr "Фільтр графу модифікацій" msgid "Revision graph" msgstr "Граф модифікацій" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Розкішний текст (RTF)\nтекст з форматуванням шрифтів і абзаців" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Праве подання:" @@ -8392,21 +8508,21 @@ msgstr "Праве подання:" msgid "Right image" msgstr "Праве зображення" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Рядок %d з %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Рядки %d-%d з %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "" @@ -8414,11 +8530,11 @@ msgstr "" msgid "S&elect..." msgstr "В&ибрати..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "По&казати кнопки в одному рядку" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "По&казати кнопки у двох рядках" @@ -8426,25 +8542,33 @@ msgstr "По&казати кнопки у двох рядках" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "По&казувати Панель швидкого доступу під Смужкою" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "С&татистика" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8454,7 +8578,7 @@ msgstr "" msgid "SMTP Server:" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8462,31 +8586,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8498,15 +8622,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8524,35 +8648,39 @@ msgstr "" msgid "Sample text:" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Зберегти" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Зберегти &як..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Зберегти &як...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Зберегти Як" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "Зберегти файл" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8560,13 +8688,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8574,74 +8702,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Зберегти як" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Зберегти як..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Зерегти зміни у %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Зберегти модифікацію &у..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8663,13 +8791,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8681,12 +8809,12 @@ msgstr "" msgid "Saved Data" msgstr "Збережені дані" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" @@ -8698,11 +8826,11 @@ msgstr "Сканувати" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Прокрутити ліворуч" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Прокрутити праворуч" @@ -8710,7 +8838,7 @@ msgstr "Прокрутити праворуч" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Пошук &логових повідомлень..." @@ -8722,20 +8850,20 @@ msgstr "" msgid "Search for:" msgstr "Що шукати:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Триває пошук кращого шляху куди б прикласти латку..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Пошук зазнав невдачі на %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Вибрати &все" @@ -8751,59 +8879,59 @@ msgstr "Вибрати &контекстне меню" msgid "Select &window:" msgstr "Вибрати вікн&о" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Вибрати знаряддя для кольору\nВибрати колір" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Вибрати файл..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Вибрати клієнт SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Вибрати кнопку" -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Вибрати об'єкт, про який потрібна довідка" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Вибрати список змін" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Виберіть програму для відмінностей" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Виберіть каталог, який пов'язати з цим проблемобліком" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Виберіть каталог, куди експортувати.\nМожливо перед експортуванням слід створити новий каталог." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Вибрати каталог, для якого слід запустити скрипт" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Вибрати каталог для збереження виділених файлів" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Виберіть файл скрипта зачіпки" @@ -8811,20 +8939,20 @@ msgstr "Виберіть файл скрипта зачіпки" msgid "Select items automatically" msgstr "Вибрати елементи автоматично" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Вибрати програму для злиття" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Вибрати ціль злиття" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "Виберіть поведінку діалога поступу наприкінці операції." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8836,15 +8964,19 @@ msgid "" "checker used for commit messages." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Виберіть переглядач для файлів відмінностей" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8854,7 +8986,7 @@ msgstr "" msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8862,7 +8994,7 @@ msgstr "" msgid "Send" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "" @@ -8870,11 +9002,11 @@ msgstr "" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Send Mail не зміг відправити повідомлення." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "" @@ -8882,19 +9014,19 @@ msgstr "" msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Надсилається вміст" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "" @@ -8914,28 +9046,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Встановлюються властивості..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Налаштування" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Оболонка" @@ -8943,7 +9075,7 @@ msgstr "Оболонка" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Кеш піктограм оболонки перебудовано!" @@ -8955,7 +9087,7 @@ msgstr "" msgid "Short &date/time format in log messages" msgstr "Короткий формат &дати/часу у повідомленнях логу" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Скоротити список властивостей" @@ -8967,7 +9099,7 @@ msgstr "Показати" msgid "Show &Accelerator for:" msgstr "Показати &Прискорювач для:" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8975,15 +9107,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Показати &зміни" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Показати &лог" @@ -8991,15 +9123,19 @@ msgstr "Показати &лог" msgid "Show &log..." msgstr "Показати &лог..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Показувати пе&рекриття та контекстні меню тільки у провіднику" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Показати над Смужкою" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Показати під Смужкою" @@ -9007,35 +9143,35 @@ msgstr "Показати під Смужкою" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Показати менше кнопок" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Показувати вузли HEAD-модифікації" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Показувати відмінності в рядках слово за словом\nДослівні відмінності в рядках" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Показати більше кнопок" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Показувати Панель швидкого доступу над Смужкою" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Показувати Панель швидкого доступу під Смужкою" @@ -9043,11 +9179,11 @@ msgstr "Показувати Панель швидкого доступу під msgid "Show Screen&Tips on toolbars" msgstr "Показувати Екранні &підказки на рядках знарядь" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Показати огляд цілого графа" @@ -9055,7 +9191,7 @@ msgstr "Показати огляд цілого графа" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9063,11 +9199,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Показати зміни як &об'єднані відмінності" @@ -9087,15 +9223,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9107,11 +9243,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "Показати &повні меню після короткої затримки" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9127,7 +9267,7 @@ msgstr "" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9135,90 +9275,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Показати &номери рядків" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Показувати найстарший вузол угорі" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Показати або заховати смугу відмінності рядків\nПеремкнути смугу відмінності рядків" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Показати або заховати пошукову смугу\nПеремкнути пошукову смугу" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Показати або заховати рядок стану\nПеремкнути рядок стану" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Показати або заховати рядок знарядь\nПеремкнути рядок знарядь" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Показати властивості модифікації" @@ -9226,7 +9366,7 @@ msgstr "Показати властивості модифікації" msgid "Show shortcut &keys in ScreenTips" msgstr "Показувати гарячі &клавіші в Екранних підказках" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9236,7 +9376,7 @@ msgstr "" msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9248,45 +9388,43 @@ msgstr "" msgid "Show un&versioned files" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Показати/Приховати" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Показує графічне представлення копій/зрізів/гілок" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Показує всі файли, які було змінено з часу останнього оновлення, локально та у сховищі" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Показує файл з логом дій у типовому текстовому редакторі" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9298,7 +9436,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "" @@ -9306,20 +9444,20 @@ msgstr "" msgid "Since" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Розмір" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9327,23 +9465,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Пропущено" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Пропущено відсутню ціль" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9351,13 +9489,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9371,7 +9509,7 @@ msgstr "Сортувати за кількістю фіксацій" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9381,49 +9519,53 @@ msgstr "Вказує, скільки елементів залишати у ді msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Розділити рядки" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Розділити активне вікно на панелі\nРозділити" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Стосова гістограма" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Стосова лінійна діаграма" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Стандартно" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Зачіпка початку фіксації" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" @@ -9431,7 +9573,7 @@ msgstr "" msgid "Start registry editor" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9443,39 +9585,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Статичний" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Статистика" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Стан" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Конфігурація стрічки стану" @@ -9487,32 +9637,32 @@ msgstr "Кольори станів та дій" msgid "Status cache" msgstr "Кеш стану" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" -msgstr "" +msgstr "Кеш стану лише для одного каталогу, з повним станом та рекурсивними перекриваннями" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Кеш стану лише для одного каталогу, без рекурсивних перекривань" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9520,15 +9670,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Стиль" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "" @@ -9536,7 +9686,7 @@ msgstr "" msgid "Submodule" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9544,7 +9694,7 @@ msgstr "" msgid "Submodule Add" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9552,15 +9702,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9568,7 +9718,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9583,15 +9733,15 @@ msgstr "" msgid "Submodules" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Перемкнути" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "" @@ -9600,43 +9750,43 @@ msgstr "" msgid "Switch To" msgstr "" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Повернутися на панель попереднього вікна\nПопередня панель" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Переключитися між одно та двопанельним поданням\nПереключитися між одно та двопанельним поданням" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Поміняти місцями вміст лівого і правого подання\nПоміняти місцями ліве і праве подання" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Перейти до вікна наступного документа" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Переключитися на панель наступного вікна\nНаступна панель" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Перейти до вікна попереднього документа" @@ -9644,19 +9794,19 @@ msgstr "Перейти до вікна попереднього документ msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "Переключає порівняння ліве<->праве" @@ -9668,23 +9818,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9694,13 +9844,13 @@ msgstr "Входження до системного реєстру видале msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9714,7 +9864,7 @@ msgstr "Місце для вкладки" msgid "Tab size:" msgstr "Розмір табуляції:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "" @@ -9722,16 +9872,16 @@ msgstr "" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "" @@ -9739,11 +9889,11 @@ msgstr "" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Завдання" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Панель завдань" @@ -9755,11 +9905,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Лише тест" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9767,13 +9917,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9781,64 +9937,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Розмір кавалка не співпадає з кількістю доданих/видалених рядків!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Механізм пошуку відмінностей аварійно зупинився через помилку:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Файл %s не існує!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Файл %s не знайдено у файлі-латці!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9847,15 +10017,15 @@ msgid "" "Do you want to remove the file?" msgstr "Файл \n%s\nпорожній.\nВидалити його?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Файл занадто великий" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Файл надто великий, щоб його відкрити ." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9863,7 +10033,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Файл\n%s\nвже існує! Хочете його перезаписати?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9871,14 +10041,14 @@ msgid "" "is not a valid text file!" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Каталог %s\nмістить неверсійні та/або модифіковані файли. Видалити його не зважаючи на це?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9887,78 +10057,78 @@ msgid "" "Would you like to create it first?" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Скрипт зачіпки повернув помилку:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Не можна це зображення показати." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Не вдалося створити постачальника проблемобліку. Перевірте, чи коректно він встановлений." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Постачальник проблемобліку не зміг перевірити рядок параметрів" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "У рядку %d мав би бути рядок, який вказує на новий файл!" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Максимальна кількість збережених рядків логу дій.\nРядки додані поверх цього ліміту витіснятимуть з файлу найдавніші рядки." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Операція зазнала невдачі." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Параметри '/path' і '/pathfile' взаємовиключні.\nНеобхідно вказувати тільки одного з них." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9968,7 +10138,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9979,7 +10149,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9990,36 +10160,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Вибраний файл ще ніби-то має позначки конфліктів.\nЧи дійсно потрібно позначити його вирішеним?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10027,7 +10204,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10036,7 +10213,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10045,26 +10222,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Час у секундах, після якого синтаксичний аналіз вибраних файлів припиняється.\r\nМенше значення швидше зробить список автодоповнення доступним,\r\nале може не встигнути просканувати всі файли." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Обидва вибрані URL не створені зі спільного кореня.\nПоказувати логові повідомлення між ними неможливо!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10074,34 +10251,34 @@ msgstr "" msgid "Their file:" msgstr "Їхній файл:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Їхнє" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Немає доступних постачальників проблемобліку." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10110,85 +10287,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "У рядку %d ще є невладнані конфлікти!\nПеред збереженням їх варто владнати.\nЧи може зберегти файл з конфліктами?\nЯкщо натиснете ТАК, доведеться вручну владнувати конфлікти в іншому редакторі!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Є незбережені зміни!\nХочете їх зберегти?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Тезаурус" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Це недопустимий URL.\nВведіть URL сюди." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Ця програма пов'язана з відсутнім експортом %s у файлі %s. Ця машина може мати несумісну версію %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Цій програмі потрібен файл %s, який у системі відсутній." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Ця властивість дозволена лише для каталогів, а не для файлів." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Це знищить занотовані команди, що використовувались у цій програмі, та відновить типовий набір видимих команд у меню та смугах знарядь. Це не скасує явні адаптування. Дійсно зробити це?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10204,14 +10381,14 @@ msgstr "" msgid "To" msgstr "" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10223,13 +10400,13 @@ msgstr "" msgid "To:" msgstr "До:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Перемкнути відображення Одної/Двох сторінок\nПеремкнути відображення Одної/Двох сторінок" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10241,11 +10418,11 @@ msgstr "Рядок знаряддь" msgid "Toolbar Name" msgstr "Ім'я рядка знаряддь" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Параметри рядка знарядь" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Внутрішня помилка рядка знаряддь. Погутарте з виробником своєї програми." @@ -10261,16 +10438,16 @@ msgstr "Знаряддя" msgid "Tools:" msgstr "Знаряддя:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10280,40 +10457,40 @@ msgstr "" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" -msgstr "" +msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10329,7 +10506,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10337,7 +10514,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10351,36 +10528,36 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10419,11 +10596,11 @@ msgstr "" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Передається при %s" @@ -10432,39 +10609,35 @@ msgstr "Передається при %s" msgid "Transparent &color..." msgstr "Прозорий &колір..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Спробуйте 'Прибрати'. Якщо це не спрацює, доведеться зробити свіжу вивірку." -#. Resource IDs: (73) -msgid "Try again" -msgstr "" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "Тип" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10488,24 +10661,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Нездатен завантажити підтримку поштової системи." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Нездатен обробити команду, сервер зайнятий." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Нездатен прочитати з %1, його відкрито кимось іншим." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Нездатен прочитати властивість лише-для-запису" -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10513,91 +10686,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Нездатен записати властивість лише-для-читання" -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Нездатен писати у %1, він лише-для-читання або відкритий кимось іншим." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Зняти позначку" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Скасувати %d дій" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Скасувати 1 дію" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Неочікуваний формат файла" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Неформатований текст\nтекст без форматування" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "Об'єднані ві&дмінності HEAD-модифікацій" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Глибина невідома" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Невирішені конфлікти!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Безіменний" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Неверсійні" @@ -10605,7 +10782,7 @@ msgstr "Неверсійні" msgid "Unversioned files mark parent folder as modified" msgstr "Неверсійні файли позначають батьківських каталог як модифікований" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "" @@ -10618,23 +10795,23 @@ msgstr "" msgid "Update" msgstr "Оновити" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Оновлено" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Оновлюються об'єкти ActiveX " -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10646,30 +10823,26 @@ msgstr "Використати &типове зображення:" msgid "Use &one-pane view as default for 2-file diff" msgstr "Використовувати &однопанельне подання як типове для відмінностей двох файлів" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Використати &інший текстовий блок" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Використати \"мій\" блок" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "Спочатку використати \"мій\" блок, потім \"їхній\"" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Використати \"їхній\" блок" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "Спочатку використати \"їхній\" блок, потім \"мій\"" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10690,15 +10863,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Використати Об'єднані відмінності з &буфера обмігу" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10708,7 +10881,7 @@ msgstr "Використати увесь вміст лівого подання msgid "Use block from left before right" msgstr "Використати лівий блок перед правим" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10718,25 +10891,25 @@ msgstr "Використати блок з лівого подання пере msgid "Use block from right before left" msgstr "Використати правий блок перед лівим" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Використати блок з правого подання перед блоком з лівого\nВикористати правий блок перед лівим" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Використати обидва текстові блоки (цей першим)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Використати обидва текстові блоки (цей останнім)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "Використати налаштований сервер" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Використати лівий блок" @@ -10752,15 +10925,15 @@ msgstr "Використовувати колір локальної гілки msgid "Use recycle bin when reverting" msgstr "Використовувати смітник під час відвертання" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Використати регулярний вираз" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "Використати правий блок" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "Використовувати пробіли" @@ -10768,61 +10941,61 @@ msgstr "Використовувати пробіли" msgid "Use system locale for date/time" msgstr "Викорстовувати системну локаль для дати/часу" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Використати блок тексту з '&мого'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Використати блок тексту з '&їхнього'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Використати блок тексту з 'м&ого' перед 'їхнім'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Використати блок тексту з 'мого' перед 'їхнім'\nВикористати 'мій' блок тексту, а потім 'їхній'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Використати блок тексту з 'мого'\nВикористати 'мій' блок тексту" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Використати блок тексту з 'ї&хнього' перед 'моїм'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Використати блок тексту з 'їхнього' перед 'моїм'\nВикористати 'їхній' блок тексту, а потім 'мій'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Використати блок тексту з 'їхнього'\nВикористати 'їхній' блок тексту" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Використати блок тексту з лівого подання\nВикористати лівий блок" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Використати це&й текстовий блок" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10830,7 +11003,7 @@ msgid "" "%s" msgstr "Використати знайдений шлях.\nЗастосувати патч до\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10842,19 +11015,19 @@ msgstr "Використати оригінальний шлях.\nЗастос msgid "Use this" msgstr "Використати це" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Використати цей файл &цілком" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "Використати цей блок зліва" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Використати інший &файл цілком" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10870,11 +11043,11 @@ msgstr "Інформація про користувача" msgid "User Name:" msgstr "Ім'я:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Скасовано користувачем" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10884,11 +11057,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Ім'я користувача:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10907,7 +11080,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Значення" @@ -10915,24 +11088,24 @@ msgstr "Значення" msgid "Version" msgstr "Версія" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "Версія 1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "Версія 1 (Новіший час фіксації)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "Версія 2 (Базова)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "Версія 2 (Базова) (Новіший час фіксації)" @@ -10940,11 +11113,11 @@ msgstr "Версія 2 (Базова) (Новіший час фіксації)" msgid "Version Information" msgstr "Інформація про версію" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Версія:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Версійний" @@ -10956,23 +11129,27 @@ msgstr "В'єтнамський" msgid "View" msgstr "Вигляд" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "Переглянути патч" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "Переглянути патч>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Переглянути модифікацію для шляху у &веб-переглядачі" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "Переглянути ревізію в сторонньому редакторі" @@ -10984,11 +11161,11 @@ msgstr "Переглянути загально&системний gitconfig" msgid "Visit our website" msgstr "Відвідати наш вебсайт" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10999,7 +11176,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "УВАГА:\r\nЗмінюйте ці налаштування тільки якщо ви розумієте, що робите!\r\nЩоб повернути значення до типових, витріть їх." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Зачекати" @@ -11007,7 +11184,7 @@ msgstr "Зачекати" msgid "Wait for the script to finish" msgstr "Почекати завершення скрипта" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "Очікується ввід даних" @@ -11015,15 +11192,15 @@ msgstr "Очікується ввід даних" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Попередження" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Увага!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11031,7 +11208,7 @@ msgid "" "Do you really want to continue?" msgstr "Попередження: \"%s\" буде остаточно видалено. Його не може буде відновлено! \r\n\r\nВи дійсно бажаєте продовжити?" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "" @@ -11039,56 +11216,56 @@ msgstr "" msgid "Western European" msgstr "Західно-Європейський" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "Ігнорувати відмінності в недрукованих символах коментарів, якщо необхідно, при застосуванні патчу" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "Перепитувати при закриванні діалогу прогресу, якщо git ще не завершив роботу" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "Якщо ввімкнути цю опцію, то контекстне меню TortoiseGit буде доступне при перетягуванні файлів та каталогів" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "Якшо ввімкнути цю опцію, то файли з більшими номерами версії будуть першими. Тому що зазвичай використовуються новіші версії " -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Якщо уможливлено, версійні елементи зі списку діалогу фіксації вибираються автоматично" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "Якщо патч неможливо застовувати чисто, то перейти до 3-стороннього злиття (якщо патч містить інформацію про ідентифікацію блоків байт, які він мав застосувати, і ці блоки доступні локально)" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11098,15 +11275,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "Зміни в недрукованих символах (таби, пробіли)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Недруковані символи" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Розтшування вікна" @@ -11114,15 +11291,15 @@ msgstr "Розтшування вікна" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11166,11 +11343,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11178,29 +11355,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "" -#. Resource IDs: (73) -msgid "Yes" -msgstr "" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "У вас уже встановлено найновішу версію." @@ -11210,51 +11383,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Можна вклеїти растр тільки розміру (%d x %d) !" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Не можна створити більш ніж %d визначених користувачем рядків знарядь!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Цю властивість не можна задати для каталогів, лише для файлів!\nЩоб встановити його для всіх файлів із цього каталога,\nпотрібно встановити прапорець 'рекурсивно'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Ви змінили властивості, попередньо їх не зберігши.\nЗберегти їх зараз?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11262,67 +11435,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Номер проблеми не введено!\nДійсно зафіксувати без номера проблеми?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Можна визначити до %d знаряддь" -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Необхідно перезапустити систему, щоб внесені зміни подіяли." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Слід ввести текст!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Слід вибрати зображення!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11332,7 +11505,7 @@ msgstr "Ваші попередньо введені логові повідом msgid "Your version is:" msgstr "Ваша версія:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Ваша версія: %d.%d.%d.%d" @@ -11342,10 +11515,10 @@ msgid "Zip File" msgstr "" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "З&меншити" +msgid "Zoo&m out\t-" +msgstr "З&меншити\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Збільшення" @@ -11357,80 +11530,80 @@ msgstr "З&більшити" msgid "Zoom &Out" msgstr "З&меншити" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Масштаб 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Збільштти\nЗбільшити" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Зменшити\nЗменшити" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "З&більшити" +msgid "Zoom i&n\t+" +msgstr "З&більшити\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Збільшити" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Зменшити" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Масштабувати щоб умістилось" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Масштабувати щоб умістилось по висоті" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Масштабувати щоб умістилось вшир" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Типове]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Не призначено]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11444,7 +11617,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "додано" @@ -11452,7 +11625,7 @@ msgstr "додано" msgid "added files" msgstr "додані файли" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "неіменований файл" @@ -11460,14 +11633,19 @@ msgstr "неіменований файл" msgid "and support the developers" msgstr "та підтримайте розробників" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "автор" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11500,30 +11678,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "фіксувань" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "конфліктних" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "день" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "знищено" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11535,7 +11713,7 @@ msgstr "фіктивний" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11544,16 +11722,16 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "зовнішній" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "ігноровано" @@ -11561,15 +11739,15 @@ msgstr "ігноровано" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "незавершено" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "" @@ -11577,7 +11755,7 @@ msgstr "" msgid "keep the file lists in English" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11586,7 +11764,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11599,13 +11777,13 @@ msgstr "" #. Resource IDs: (1494) msgid "master" -msgstr "" +msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "злито" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "відсутні" @@ -11613,7 +11791,7 @@ msgstr "відсутні" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "змінено" @@ -11621,7 +11799,7 @@ msgstr "змінено" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "місяць" @@ -11629,40 +11807,44 @@ msgstr "місяць" msgid "new branch" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "ні" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "для цієї команди нема опису" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "неверсійних" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "нормально" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "заважає" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "на %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "пікселі" @@ -11670,11 +11852,11 @@ msgstr "пікселі" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "квартал" @@ -11682,35 +11864,35 @@ msgstr "квартал" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "замінено" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "сканується шлях:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "переключено на\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "до %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "" @@ -11719,35 +11901,35 @@ msgstr "" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "тиждень" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "рік" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "так" diff --git a/Languages/Tortoise_vi.po b/Languages/Tortoise_vi.po index b9c04d51f..ecfd92a1e 100644 --- a/Languages/Tortoise_vi.po +++ b/Languages/Tortoise_vi.po @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 18:53+0000\n" +"PO-Revision-Date: 2015-08-02 16:58+0000\n" "Last-Translator: Sven Strickroth \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/tortoisegit/language/vi/)\n" "MIME-Version: 1.0\n" @@ -24,7 +24,7 @@ msgstr "" "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -46,138 +46,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# hiển thị từng tác giả:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "" +msgstr "%.2f MiB được truyền tải" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 chứa một đối tượng không phù hợp." -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 chứa một đường dẫn không hợp lệ." -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 chứa một giản đồ không hợp lệ." -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 có định dạng xấu." -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "Không tìm thấy %1 ." -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d! Ngày trước" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d! Ngày trước" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d! Giờ trước" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d! Giờ trước" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d! Phút trước" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d! Tháng trước" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d! Tháng trước" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d! Giây trước" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d! Giây trước" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d! Tuần trước" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d! Tuần trước" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d! Năm trước" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d! Năm trước" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "Đã chọn %'d mục" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d! phút trước" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1 !s !" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1! s!\r\nĐang hiển thị %2! d! tập tin, %3! d! mô-đun con và %4! d! thư mục, %5!d! mục trong tổng số" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1 !s !\r\nKích thước %2 !s !" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\nTiếp tục thi hành mã lệnh?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -185,52 +185,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\nKhông tìm thấy tập tin này.\nXác nhận lại đường dẫn và tên tập tin xem có chính xác hay chưa." -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "Đã truyền tải %I64d Byte" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "" +msgstr "%I64d KiB được truyền tải" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d đệ trình phía trước \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d tập tin đã bị thay đổi" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." msgstr "%d tập tin bị loại bỏ." -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d tập tin trở lại thành %s." -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "đã chọn %d tập tin, tổng cộng %d tập tin" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d (các) tác giả hoạt động nhiều nhất với ít nhất %d mức độ tham gia mỗi (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -238,78 +238,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\nnhấp chuột để chuyển đổi alpha\nnhấp đúp chuột vào để tự động chuyển đổi alpha" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld phút và %ld giây" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld của %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - tại phiên bản: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [Phục hồi]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s trong %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s, tại %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s : Cây đang thao tác" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\Xuất dữ liệu (%d) của %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\Xuất dữ liệu của %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\nKhông thể áp dụng bản vá hoàn toàn." -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\nBạn vẫn muốn loại bỏ đối tượng này?" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -325,6 +325,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "&3 cách xác nhập" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "&Thông tin về TortoiseGitBlame" @@ -353,15 +357,15 @@ msgstr "&Thêm bộ lọc" msgid "&Add New/Save" msgstr "&Thêm mới/Lưu" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "&Thêm phần này" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "&Thêm hoặc loại bỏ các Nút Bấm" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." msgstr "&Thêm..." @@ -401,7 +405,7 @@ msgstr "&Gán" msgid "&Associate double-click event with:" msgstr "&Gán sự kiện click chuột hai lần với thao tác:" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "&Tự động ẩn" @@ -417,15 +421,15 @@ msgstr "&Tự động tải các khóa nhập vào" msgid "&Backup original file" msgstr "&Sao lưu tập tin gốc" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "&Viện dẫn lý do" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "&Trách cứ thay đổi" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "&Trách cứ các chỉnh sửa" @@ -449,7 +453,7 @@ msgstr "&Nhánh:" msgid "&Browse Dir" msgstr "&Duyệt thư mục" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "&Duyệt Kho Chứa" @@ -485,7 +489,7 @@ msgstr "&Phân loại:" msgid "&Choose commands from:" msgstr "&Chọn lệnh từ:" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "&Dọn dẹp..." @@ -509,7 +513,7 @@ msgstr "&Đóng (các)cửa sổ" msgid "&Command:" msgstr "&Lệnh:" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "&Đệ trình" @@ -517,23 +521,27 @@ msgstr "&Đệ trình" msgid "&Commit submodule..." msgstr "&Đệ trình mô-đun con..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "&Đệ trình w/o" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "&Khẳng định..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "&So sánh các bản chỉnh sửa" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "&Sao chép" @@ -543,7 +551,7 @@ msgstr "&Sao chép ảnh của nút bấm" #. Resource IDs: (57634) msgid "&Copy\tCtrl+C" -msgstr "&Sao chép Ctrl + C" +msgstr "&Sao chép\tCtrl+C" #. Resource IDs: (1662) msgid "&Custom" @@ -553,11 +561,11 @@ msgstr "&Tùy biến" msgid "&Default" msgstr "&Mặc định" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "&Xóa" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "&Xóa (giữ bản trên máy)" @@ -565,7 +573,7 @@ msgstr "&Xóa (giữ bản trên máy)" msgid "&Delete Filter" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "&Xóa phần từ xa && địa phương" @@ -577,11 +585,11 @@ msgstr "" msgid "&Detect moved or copied lines:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "&So sánh" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "&So sánh với phiên bản trước" @@ -593,7 +601,7 @@ msgstr "&Thư mục:" msgid "&Disabled" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "&Bỏ qua" @@ -601,7 +609,7 @@ msgstr "&Bỏ qua" msgid "&Do the same for the rest" msgstr "&Làm tương tự cho phần còn lại" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "&Gắn vào" @@ -609,11 +617,15 @@ msgstr "&Gắn vào" msgid "&Don't ask me again" msgstr "" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "" + #. Resource IDs: (1384) msgid "&Down" msgstr "&Xuống" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "&Tải về" @@ -621,11 +633,11 @@ msgstr "&Tải về" msgid "&Edit" msgstr "&Biên tập" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "&Chỉnh sửa .git/config" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "&Chỉnh sửa TẤT CẢ" @@ -633,7 +645,7 @@ msgstr "&Chỉnh sửa TẤT CẢ" msgid "&Edit Filter" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "&Biên tập các mâu thuẫn" @@ -658,10 +670,10 @@ msgid "&Enable edit" msgstr "&Cho phép chỉnh sửa" #. Resource IDs: (32771) -msgid "&Exit" +msgid "&Exit\tCtrl+W" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "&Xuất lựa chọn sang..." @@ -673,27 +685,27 @@ msgstr "&Bên ngoài" msgid "&File" msgstr "&Tập tin" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "&Tìm" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" -msgstr "&Tìm kiếm Ctrl + F" +msgstr "&Tìm kiếm\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "&Làm vừa các hình ảnh trong cửa sổ" +msgid "&Fit images in window\tF" +msgstr "&Làm vừa các hình ảnh trong cửa sổ\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "&Ổ đĩa được sửa" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "&Trôi nổi" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "" @@ -705,7 +717,7 @@ msgstr "&Phông chữ cho các thông điệp tường trình:" msgid "&Font:" msgstr "&Phông chữ:" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "&Bắt buộc" @@ -725,7 +737,7 @@ msgstr "&Mẫu đệ trình Git (--rmdir)" msgid "&Go to\tCtrl+G" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "" @@ -737,7 +749,7 @@ msgstr "&Xanh lá cây:" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "&Giúp đỡ" @@ -745,7 +757,7 @@ msgstr "&Giúp đỡ" msgid "&Help Topics" msgstr "Các tiêu đề &giúp đỡ" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "&Ẩn" @@ -753,11 +765,11 @@ msgstr "&Ẩn" msgid "&Icon Set:" msgstr "&Bộ biểu tượng:" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "&Bỏ qua %d món bằng tên" @@ -771,14 +783,14 @@ msgid "&Image" msgstr "&Ảnh" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "&Thông tin về hình ảnh " +msgid "&Image info\tI" +msgstr "&Thông tin về hình ảnh \tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "&Chỉ có ảnh" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "&Nhập..." @@ -790,7 +802,7 @@ msgstr "&Thư mục khởi đầu:" msgid "&Initialize submodules (--init)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "" @@ -802,11 +814,11 @@ msgstr "&Nhảy tới khác biệt đầu tiên khi tải" msgid "&Keep CR" msgstr "&Giữ CR" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "" @@ -828,13 +840,13 @@ msgstr "&Tìm kiếm giới hạn trong các dòng bị thay đổi" #. Resource IDs: (65535) msgid "&Limit:" -msgstr "" +msgstr "&Giới hạn" #. Resource IDs: (1078) msgid "&Line number" msgstr "&Số dòng" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "&Số dòng (%d - %d)" @@ -851,7 +863,7 @@ msgstr "&Xem theo danh sách" msgid "&Local Branch:" msgstr "&Nhánh nội bộ:" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "" @@ -875,11 +887,11 @@ msgstr "&Hoạt ảnh cho thực đơn" msgid "&Menu contents:" msgstr "&Nội dung thực đơn" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "&Nhập" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "&Nhập..." @@ -929,12 +941,16 @@ msgstr "&Mới..." #. Resource IDs: (1014) msgid "&Next >" -msgstr "" +msgstr "&Tiếp >" #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Trang tiếp theo" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "&Không có sự kiện nháy kép chuột" @@ -951,11 +967,11 @@ msgstr "&Không" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "&OK" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "&Một Trang" @@ -963,19 +979,15 @@ msgstr "&Một Trang" msgid "&Onto" msgstr "" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "&Mở" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "" - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -988,18 +1000,18 @@ msgid "&Overlay Icon:" msgstr "" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "&Ảnh nạp chồng" +msgid "&Overlay images\tO" +msgstr "&Ảnh nạp chồng\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "&Mật khẩu:" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "&Dán" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "&Chọn tất cả" @@ -1007,7 +1019,7 @@ msgstr "&Chọn tất cả" msgid "&Port:" msgstr "&Cổng:" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "&Xem trước bản in" @@ -1015,11 +1027,15 @@ msgstr "&Xem trước bản in" msgid "&Print..." msgstr "&In..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "&In...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "" @@ -1027,10 +1043,14 @@ msgstr "" msgid "&Push all branches" msgstr "&Đẩy tất cả nhánh" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "&Các thông điệp gần đây" @@ -1043,7 +1063,7 @@ msgstr "" msgid "&Red:" msgstr "&Đỏ:" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "&Làm lại" @@ -1059,7 +1079,7 @@ msgstr "&Thể hiện lại" msgid "&Regular Expression" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "" @@ -1067,7 +1087,7 @@ msgstr "" msgid "&Remote Branch:" msgstr "&Nhánh từ xa:" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "" @@ -1075,7 +1095,7 @@ msgstr "" msgid "&Remote:" msgstr "&Từ xa:" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "&Loại bỏ" @@ -1087,7 +1107,7 @@ msgstr "" msgid "&Replace" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "&Duyệt Kho Chứa" @@ -1095,7 +1115,7 @@ msgstr "&Duyệt Kho Chứa" msgid "&Reset" msgstr "&Làm lại từ đầu" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "&Cài đặt lại thanh công cụ theo mặc định" @@ -1111,23 +1131,27 @@ msgstr "&Cài đặt lại thông tin sử dụng của tôi về ban đầu" msgid "&Reset to Default" msgstr "&Cài đặt lại mọi thứ về mặc định" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "&Chuyển đổi ngược bằng đệ trình này" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "&Chuyển đổi ngược bởi những đệ trình này" @@ -1139,7 +1163,7 @@ msgstr "&Máy trạm SSH:" msgid "&Saturation:" msgstr "&Bão hòa:" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "&Lưu" @@ -1147,15 +1171,19 @@ msgstr "&Lưu" msgid "&Save authentication" msgstr "&Lưu lại thông tin xác thực" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "&Lưu biểu đồ như..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "&Lưu danh sách của các tập tin được chọn đến..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "&Lưu\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "" @@ -1163,7 +1191,7 @@ msgstr "" msgid "&Set upstream/track remote branch" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "&Thiết lập" @@ -1183,7 +1211,7 @@ msgstr "&Trình bày nhãn bằng chữ" msgid "&Signing key ID:" msgstr "&Gán chỉ mục khóa:" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "" @@ -1191,7 +1219,7 @@ msgstr "" msgid "&Squash" msgstr "&Nén chặt" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "&Nén chặt tất cả" @@ -1203,7 +1231,7 @@ msgstr "&Bắt đầu" msgid "&Start Group" msgstr "&Bắt đầu Nhóm" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "" @@ -1223,7 +1251,7 @@ msgstr "&Xem dấu hiệu" msgid "&Tab size:" msgstr "&Kích cỡ thanh Tab:" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "&Tài liệu theo mục" @@ -1231,9 +1259,9 @@ msgstr "&Tài liệu theo mục" msgid "&Tag" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" -msgstr "" +msgstr "&Các thẻ" #. Resource IDs: (65535) msgid "&Tags:" @@ -1267,7 +1295,7 @@ msgstr "" msgid "&Toolbars:" msgstr "&Các thanh công cụ:" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1279,7 +1307,11 @@ msgstr "&TortoiseGitMerge" msgid "&Trunk:" msgstr "&Trunk:" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "&Hai Trang" @@ -1287,15 +1319,15 @@ msgstr "&Hai Trang" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "&Khôi phục" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "&So sánh thống nhất" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "&Hợp nhất điểm khác nhau với" @@ -1307,7 +1339,7 @@ msgstr "&Ổ đĩa không nhận ra" msgid "&Up" msgstr "&Lên" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "&Cập nhật món vào bản chỉnh sửa" @@ -1319,11 +1351,11 @@ msgstr "" msgid "&Use auto-completion of file paths and keywords" msgstr "&Sử dụng tự điền đủ cho đường dẫn và từ khóa" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "&Tên đăng nhập:" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "&Xem" @@ -1331,7 +1363,7 @@ msgstr "&Xem" msgid "&View:" msgstr "&Xem" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" msgstr "&Cảnh báo dựa trên đệ trình với các phần Signed-Off-By còn thiếu" @@ -1347,6 +1379,10 @@ msgstr "&Nguyên một từ" msgid "&Within file" msgstr "" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "&bỏ qua sự thay đổi trên khoảng trắng" @@ -1355,46 +1391,46 @@ msgstr "&bỏ qua sự thay đổi trên khoảng trắng" msgid "&known changes" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(không có danh sách các thay đổi)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(không đánh số dòng)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(không giá trị)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(không tìm thấy)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(không biết)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "" @@ -1402,13 +1438,14 @@ msgstr "" msgid "--&all" msgstr "--&all" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1416,7 +1453,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "" @@ -1432,7 +1469,7 @@ msgstr "" msgid ".gitignore in the repository root" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "" @@ -1448,31 +1485,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1481,66 +1518,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit là một phần mở rộng shell.\nĐiều này có nghĩa rằng chương trình có thể được tích hợp vào bên trong trình quản lý tập tin của Windows.\nĐể sử dụng TortoiseGit vui lòng mở trình duyệt tập tin ra và click phải chuột trên bất kỳ thư mục nào mà bạn thích\nđể hiển thị menu nugữ cảnh ở ngay nơi mà bạn muốn tìm kiếm toàn bộ các dòng lệnh trong TortoiseGit.\nVà hãy nhớ đọc phần hướng dẫn nhél!" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "" @@ -1548,7 +1585,7 @@ msgstr "" msgid "" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "" @@ -1560,71 +1597,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "Một dòng mới được tách biệt danh sách các đường dẫn ở nơi mà biểu tượng được hiển thị.\nNếu bạn thêm vào ký tự '*' ở cuối đoạn đường dẫn, thì toàn bộ các tập tin và các thư mục con bên trong đường dẫn đó cũng sẽ được thêm vào." -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "Một danh sách ngăn cách từng dòng của các đường dẫn mà các thực đơn ngữ cảnh không được thể hiện.\nNếu bạn thêm dấu '*' vào cuối đường dẫn, thì tất cả tập tin và thư mục con trong đường dẫn đó cũng được loại trừ.\nMột danh sách trống sẽ cho phép thực đơn ngữ cảnh trên tất cả đường dẫn." -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "Một dòng mới được tách biệt danh sách các đường dẫn ở nơi mà biểu tượng không được hiển thị.\nNếu bạn thêm vào ký tự '*' ở cuối đoạn đường dẫn, thì toàn bộ các tập tin và các thư mục con bên trong đường dẫn đó cũng sẽ không được thêm vào.\nMột danh sách rỗng sẽ được cho phép hiển thị trên mọi đường dẫn." -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "Một tài nguyên cần thiết không có được" -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "Một chương trình xem cho GNU so sánh tập tinh (và tập tin).\nNếu bạn không có thì dùng NotePad." -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "D&ịch bởi Phan Anh" @@ -1640,23 +1677,23 @@ msgstr "" msgid "Abbreviated size" msgstr "" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "Bỏ" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "" +msgstr "Bỏ &Hợp nhất" #. Resource IDs: (4592) msgid "Abort Merge" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "Về" @@ -1676,12 +1713,12 @@ msgstr "" msgid "Accept certificate" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "Truy cập vào %1 bị từ chối." -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "Hành động" @@ -1689,26 +1726,26 @@ msgstr "Hành động" msgid "Action log" msgstr "Tường tình cho các hành động" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "Các hành động" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "Danh sách nhiệm vụ đang có hiệu lực" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "Các tập tin có hiệu lực" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "Đối tượng ActiveX không thể được lưu trong khi đang thoát Windows!\nHủy mọi thay đổi sang %1?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "Thêm" @@ -1716,7 +1753,7 @@ msgstr "Thêm" msgid "Add &Signed-off-by" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" msgstr "Thêm '%s' vào tự điển" @@ -1729,15 +1766,15 @@ msgstr "Thêm phần điều khiển từ xa" msgid "Add \"&Signed-off-by\"" msgstr "Thêm \"&Signed-off-by\"" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "Thêm chương trình so sánh cho mở rộng xác định" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "Thêm chương trình hợp nhất cho mở rộng xác định" @@ -1745,15 +1782,15 @@ msgstr "Thêm chương trình hợp nhất cho mở rộng xác định" msgid "Add new files automatically to Git" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "Thêm vào danh sách &bỏ qua" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "Thêm vào Thanh Công Cụ Truy Cập Nhanh" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "Thêm..." @@ -1761,11 +1798,11 @@ msgstr "Thêm..." msgid "Add/Edit Extension Specific Diff/Merge Program" msgstr "Thêm/Biên tập chương trình So sánh/Hợp nhất cho mở rộng xác định" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "Đã thêm" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" @@ -1773,25 +1810,25 @@ msgid "" "to the ignore list." msgstr "Đã thêm mẫu tập tin\n%s\nvào danh sách bỏ qua." -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "Đang thêm" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "Thêm (các) tập tin vào điều khiển Git" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Thêm tập tin được lựa chọn hoặc tập tin mặt nạ vào danh sách 'bỏ qua'" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "Điều chỉnh thiết lập\nCác thiết lập" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "Cao cấp" @@ -1799,43 +1836,43 @@ msgstr "Cao cấp" msgid "Advanced Diff/Merge Settings" msgstr "Các thiết lập cao cấp cho So Sánh/Hợp Nhất" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "Các thiết lập cao cấp cho so sánh" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "Các thiết lập cao cấp cho hợp nhất" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "Tất cả" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "Tất cả lệnh" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "Tất cả tập tin (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "Tất cả tập tin (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "" @@ -1843,47 +1880,47 @@ msgstr "" msgid "All tags only" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "Tất cả thay đổi sẽ mất! Bạn có thật sự muốn đặt lại tất cả thanh cộng cụ và thực đơn?" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "Tất cả thay đổi sẽ mất! Bạn có thật sự muốn đặt lại các thiết lập bàn phím?" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "Tất cả thay đổi sẽ mất! Bạn có thật sự muốn đặt lại thực đơn '%s'?" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "Tất cả thay đổi sẽ mất! Bạn có thật sự muốn đặt lại thanh cộng cụ '%s'?" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "" @@ -1899,11 +1936,11 @@ msgstr "" msgid "Always show long format" msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "Luôn luôn dùng những thiết lập địa phương về hệ thống để thiể hiện ngày giờ" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "" @@ -1911,12 +1948,12 @@ msgstr "" msgid "Amend &Last Commit" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "Đây là một phần trình chỉnh sửa thay thế. Sẽ hỗ trợ phần cuối dòng *nix." -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1927,7 +1964,7 @@ msgid "" "%mine: the modified file" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1940,34 +1977,34 @@ msgid "" "%base: the original file without your changes" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "Một tay cầm cho tập tin không đúng được liên kết với %1." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "Một lỗi không xác định đã xảy ra." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "Một lỗi không xác định đã xảy ra khi đang truy cập %1." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "Một kiểu dòng không xác định được tìm thấy trên dòng %d !" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "" @@ -1979,11 +2016,11 @@ msgstr "Thực đơn cho khung ứng dụng:" msgid "Apply &Patch..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "Áp dụng mã số vá..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "Áp dụng vá..." @@ -1991,7 +2028,7 @@ msgstr "Áp dụng vá..." msgid "Apply Patches" msgstr "Áp dụng các bản vá lỗi" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "Áp dụng chuỗi bản vá lỗi từ hộp thư" @@ -1999,7 +2036,7 @@ msgstr "Áp dụng chuỗi bản vá lỗi từ hộp thư" msgid "Apply unified diff" msgstr "Áp dụng so sánh thống nhất" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "Kiểu Aqua" @@ -2007,39 +2044,39 @@ msgstr "Kiểu Aqua" msgid "Arabic" msgstr "" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "&Đường dẫn tùy ý:" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "Bạn có chắc là bạn muốn đánh dấu những tập tin bị mâu thuẫn là đã được giải quyết?" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "Bạn có chắc muốn đảo ngược %d (các) đối tượng? Bạn sẽ mất tất cả các thay đổi kể từ lần cập nhật mới nhất!" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "Sắp xếp theo chiều &dọc" +msgid "Arrange &vertical\tV" +msgstr "Sắp xếp theo chiều &dọc\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "Gán cho danh sách thay đổi '%s'" @@ -2048,11 +2085,11 @@ msgstr "Gán cho danh sách thay đổi '%s'" msgid "Assigned to:" msgstr "Gán vào:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "" @@ -2064,34 +2101,34 @@ msgstr "" msgid "At file &creation" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "Tại bản sửa chửa: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "Thử một thao tác không được hỗ trợ." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "Thử truy cập %1 quá phần cuối của nó." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "Thử đọc từ bản viết %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "Thử viết vào bản đọc %1." @@ -2108,11 +2145,11 @@ msgstr "Chứng thực" msgid "Authentication data" msgstr "Dữ liệu chứng thực" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "Tác giả" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "" @@ -2120,7 +2157,7 @@ msgstr "" msgid "Author:\t\t\t\tStefan Kueng" msgstr "Tác giả:»»»»Stefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "Các tác giả" @@ -2142,11 +2179,11 @@ msgstr "Tự động chuyển đổi CrLf" msgid "Auto Crlf:" msgstr "Crlf tự động:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "Tự động ẩn" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "Tự động ẩn tất cả" @@ -2154,23 +2191,23 @@ msgstr "Tự động ẩn tất cả" msgid "Auto&Crlf" msgstr "Crlf&Tự động" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "Tự động đóng nếu không có mâu thuẫn" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "Tự động đóng nếu không có lỗi" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" msgstr "Tự động đóng nếu không có hợp nhất, thêm, hay xóa" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2184,7 +2221,7 @@ msgstr "Tự động tải &khóa Putty" msgid "Autoload Putty &Key" msgstr "&Tự động tải các khóa nhập vào" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "Tự động" @@ -2194,7 +2231,7 @@ msgstr "Tự động kiểm tra phiên bản &mỗi mỗi tuần" #. Resource IDs: (306) msgid "Autotext Tester" -msgstr "" +msgstr "Người kiểm tra Autotext" #. Resource IDs: (1157) msgid "Average" @@ -2204,19 +2241,19 @@ msgstr "Trung bình" msgid "B&rowse..." msgstr "&Duyệt..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "Lui" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Nền" #. Resource IDs: (65535) msgid "Baltic" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "Biểu đồ thanh" @@ -2236,7 +2273,7 @@ msgstr "Tập tin gốc:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "" @@ -2248,45 +2285,45 @@ msgstr "" msgid "Big5 (Traditional)" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "Phần chia đôi bị lỗi" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "Phần chia đôi hợp lệ" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "Cài đặt lại phần chia đôi" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "Bắt đầu phần chia đôi" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "Ảnh\nmột cái ảnh" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "Kiểu Màu Đen" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "Trách cứ" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "Trách cứ mỗi dòng của một tập tin của tác giả" @@ -2294,26 +2331,30 @@ msgstr "Trách cứ mỗi dòng của một tập tin của tác giả" msgid "Blend alpha" msgstr "Trộn alpha" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "Kiểu Màu Xanh Dương" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "Cả 2 /logmsg và /logmsgfile đã được xác định!\nChỉ có một trong số đó có thể xác định." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "Cả hai đường dẫn đến tập tin vá lỗi và đường dẫn mục tiêu phải là đường dẫn tuyệt đối!" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "" @@ -2325,30 +2366,30 @@ msgstr "&Duyệt..." msgid "Branc&h:" msgstr "" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "Nhánh" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "Nhánh %s ở phía sau %s\n%s sẽ chuyển tới trước đến %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "Tên Nhánh/Thẻ đánh dấu không hợp lệ." -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "Tên Nhánh/Thẻ đánh dấu không được để trống hoặc phải hợp lệ theo quy định." @@ -2360,11 +2401,11 @@ msgstr "Nhánh:" msgid "Bro&wse" msgstr "Du&yệt tìm" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "Duyệt tìm đến cho chương trình so sánh bên ngoài" @@ -2376,19 +2417,19 @@ msgstr "" msgid "Browse..." msgstr "Duyệt..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Lỗi-ID" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" -msgstr "" +msgstr "Ngữ &lỗi-ID " #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" msgstr "Chỉ số Lỗi/Chỉ số vấn đề lỗi:" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Những lỗi-ID" @@ -2404,7 +2445,7 @@ msgstr "" msgid "Button Appearance" msgstr "Giao diện nút bấm" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2420,7 +2461,7 @@ msgstr "&Kiểm tra ngay" msgid "C&ommands:" msgstr "&Lệnh:" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "&Tạo nhánh/thẻ từ bản chỉnh sửa" @@ -2428,11 +2469,11 @@ msgstr "&Tạo nhánh/thẻ từ bản chỉnh sửa" msgid "C&urrent Keys:" msgstr "&Các khóa hiện tại:" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "&Cắt" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2448,11 +2489,11 @@ msgstr "" msgid "Can double-click in log list to compare with previous revision" msgstr "Có thể nháy kép chuột vào danh sách các tường trình để so sánh với bản tường trình trước" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "Không thể kích hoạt một đối tượng ActiveX tĩnh." -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2461,80 +2502,80 @@ msgid "" "%s" msgstr "Không thể sao chép\n%s\nđến\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "Không thể sao chép ảnh vào bộ đệm!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "Không thể tạo ảnh mới!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" msgstr "Không thể tuỳ biến các thực đơn!" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "Không thể dán ảnh từ bộ đệm!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "Hủy" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "Hủy bỏ\nĐừng chuyển chế độ xem" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "Hủy bỏ\nGiữ tập tin trống." -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "Hủy bỏ\nGiải quyết các mâu thuẫn trước." -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "Không thể hiện được khác biệt bởi vì những dòng mới không đồng đều trong tập tin." @@ -2546,9 +2587,9 @@ msgstr "&Chồng lớp" msgid "Cascaded context menu" msgstr "Chồng lớp thực đơn ngữ cảnh" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" -msgstr "" +msgstr "Phân biệt chữ hoa" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2570,33 +2611,33 @@ msgstr "" msgid "Change log" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "Thay đổi phong cách của ứng dụng\nThay đổi phong cách" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "Thay đổi vị trí cửa sổ" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "Thay đổi kích thước cửa sổ" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "" @@ -2604,38 +2645,38 @@ msgstr "" msgid "Changed Files" msgstr "Những tập tin bị thay đổi" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "Các tập tin được thay đổi giữa %s, %s và %s, %s" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "Những tập tin bị thay đổi: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" msgstr "" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "Danh sách thay đổi %s được di dời" @@ -2644,15 +2685,15 @@ msgstr "Danh sách thay đổi %s được di dời" msgid "Changes made (double-click on file for diff):" msgstr "Những thay đổi được thực hiện (nháy kép trên tập tin để xem khác biệt):" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "Thay đổi phong cách của ứng dụng" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "" +msgstr "Vị trí ký tự để thể hiện đường viền trong hộp văn bản cho cam kết:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "Kiểm tra" @@ -2664,31 +2705,31 @@ msgstr "" msgid "Check For Updates..." msgstr "Kiểm Tra Cập Nhật..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "Kiểm tra xem có sửa đổ&i" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "Kiểm tra đường dẫn và/hoặc URL bạn vừa nhập vào" -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "Chọn các khung thông tin menu nào mà bạn muốn xuất hiện trong menu ngữ cảnh trên cùng thay vì sử dụng menu con của TortoiseGit" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "Chọn các khung thông tin menu nào mà bạn chỉ muốn xuất hiện trong menu ngữ cảnh (SHIFT + click chuột trái)" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "Chọn để hiển thị các thời gian liên quan trong thông điệp nhật trình" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "Kiểm tra để dùng định dạng cho ngày và giờ bớt dài dòng trong các thông điệp tường trình" @@ -2696,31 +2737,31 @@ msgstr "Kiểm tra để dùng định dạng cho ngày và giờ bớt dài dò msgid "Check:" msgstr "Kiểm tra:" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "Lấy ra" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "" @@ -2728,11 +2769,11 @@ msgstr "" msgid "Chinese" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "" @@ -2744,78 +2785,78 @@ msgstr "" msgid "Clean Type" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "Đang dọn dẹp" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "Dọn dẹp." -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "Dọn dẹp thất bại khi xử lý các đường dẫn sau:\n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "Dọn dẹp đã thành công khi xử lý các đường dẫn sau:\n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "Dọn dẹp" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "Công cụ dọn dẹp\nDọn dẹp" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "Dọn dẹp các cặp %ld tên người dùng/mật khẩu, %ld chứng chỉ ssl và %ld tên người dùng" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "Dọn dẹp tường trình lưu tạm từ %ld các kho chứa" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "Dọn dẹp các xác nhận đã lưu.\nBạn sẽ phải nhập lại tên đăng nhập/mật khẩu cho tất cả các kho chứa." -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "Dọn dẹp các kích thước và vị trí đã lưu của %ld hội thoại" @@ -2824,7 +2865,7 @@ msgstr "Dọn dẹp các kích thước và vị trí đã lưu của %ld hội msgid "Click here to go to the website" msgstr "Nhấn vào đây để đi tới trang web" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "Nhấn vào đây để chọn một thông điệp vừa đánh vào" @@ -2840,17 +2881,17 @@ msgid "" "extension" msgstr "Nhấn vào \"Cao cấp\" để chỉ định một chương trình hợp nhất khác dựa trên phần mở rộng của tập tin" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "Nhấn chuột để xem các lệnh di chuyển khối văn bản\nSử dụng khối văn bản" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "Bảng kẹp tạm" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "" @@ -2858,7 +2899,7 @@ msgstr "" msgid "Clone Existing Repository" msgstr "Nhân bản từ phần tài nguyên hiện tại" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "" @@ -2866,49 +2907,49 @@ msgstr "" msgid "Clone into Bare Repo" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "Nhân bản..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "Đóng" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "Đóng chế độ toàn màn hình" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "Đóng xem trước bản in\n&Đóng" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "Đóng bằng tay" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "Đóng cửa sổ đang hoạt động và hiện yêu cầu lưu các tài liệu" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "Thu gọn" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2934,7 +2975,7 @@ msgstr "Các màu:" msgid "Combine One Mail" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "" @@ -2942,11 +2983,11 @@ msgstr "" msgid "Comman&ds:" msgstr "&Lệnh:" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "Lệnh" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "Dòng lệnh" @@ -2954,7 +2995,7 @@ msgstr "Dòng lệnh" msgid "Command Line To Execute:" msgstr "Dòng lệnh để thi hành" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "Lệnh thất bại" @@ -2962,41 +3003,41 @@ msgstr "Lệnh thất bại" msgid "Commands" msgstr "Các lệnh" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "Cam kết" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "" @@ -3004,7 +3045,7 @@ msgstr "" msgid "Commit Ordering:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "" @@ -3012,19 +3053,19 @@ msgstr "" msgid "Commit to:" msgstr "Cam kết tới:" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "Cam kết..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "Các cam kết bởi tác giả" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "Các cam kết theo ngày" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "Các cam kết mỗi %s" @@ -3033,15 +3074,15 @@ msgstr "Các cam kết mỗi %s" msgid "Commits each week:" msgstr "Các cam kết mỗi tuần:" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "Cam kết những thay đổi của bạn vào kho chứa" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" @@ -3053,52 +3094,52 @@ msgstr "Cam kết một thư mục chưa được tạo phiên bản sẽ không msgid "Common Name:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "So sánh các bản chỉnh sửa &CHÍNH" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "So sánh hai tập tin" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "So sánh khoảng trắng" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "So sánh với bản &gốc" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "So sánh với bản trước đó" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "So sánh tất cả khoảng trắng khi tìm khác biệt\nSo sánh khoảng trắng" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "So sánh tập tin với bản chỉnh sửa cuối cùng được cam kết để cho thấy các thay đổi mà bạn làm" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "Đang so sánh %s với %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "Đã hoàn tất" @@ -3114,7 +3155,7 @@ msgstr "" msgid "Config type:" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "" @@ -3148,11 +3189,11 @@ msgstr "" msgid "Confirm to kill running git process" msgstr "" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "" @@ -3160,15 +3201,15 @@ msgstr "" msgid "Conflict resolved" msgstr "Mâu thuẫn được giải quyết" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "Mâu thuẫn" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "Mâu thuẫn: %d" @@ -3181,124 +3222,124 @@ msgstr "Thực đơn ngữ cảnh:" msgid "Context lines for patches" msgstr "" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "Tiếp tục" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "Hợp đồng gắn cửa sổ" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "&Sao chép" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "Đã sao chép" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "Sao chép" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "Sao chép %s đến %s, Duyệt lại %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "Công cụ sao chép\nSao chép" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "Sao chép tất cả thông tin sang bảng kẹp tạm" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "Sao chép và đổi tên" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "Sao chép các đường dẫn sang bảng kẹp tạm" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "Sao chép lựa chọn sang bảng &kẹp tạm" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "Sao chép lựa chọn và đặt nó vào bảng kẹp tạm\nSao chép" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "Sao chép vào clipboard" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "Sao chép: Tên mới cho %s" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "Đang sao chép %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "Đang sao chép..." #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" -msgstr "" +msgstr "Copyright (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "Các sửa lỗi" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "Không thể thêm %s vào danh sách bỏ qua!" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "Không thể kiểm tra phiên bản mới!" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3306,76 +3347,76 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "Không thể tạo %1 bởi vì thư mục đã đầy." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "Không thể xác định được bản chỉnh sửa cuối cùng!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "Không thể lấy trạng thái!" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "Không thể mở %1 bởi vì có quá nhiều tập tin đang mở." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "Không thể mở tập tin\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "Không thể loại bỏ %1 bởi vì nó là thư mục hiện thời." -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "Không thể loại bỏ %s khỏi danh sách bỏ qua" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "Không thể lấy về URL của tập tin!\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3383,7 +3424,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3391,7 +3432,7 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3399,11 +3440,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "Không thể bắt đầu công việc in ấn." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3411,11 +3452,11 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "Không thể bắt đầu mạch!" @@ -3423,7 +3464,7 @@ msgstr "Không thể bắt đầu mạch!" msgid "Coun&t" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "" @@ -3436,15 +3477,15 @@ msgstr "Tạo &thư viện" msgid "Create .gitignore file" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "" @@ -3456,29 +3497,29 @@ msgstr "Tạo danh sách thay đổi" msgid "Create New Branch" msgstr "Tạo một nhánh mới" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3487,49 +3528,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "Tạo tập tin vá" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "Tạo một tập tin chứa bản vá từ các khác biệt của hai tập tin\nTạo tập tin chứa bản vá" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "Tạo cơ sở dữ liệu kho chứa tại vị trí hiện tại" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "Tạo tập tin chứa khác biệt thống nhất với tất cả thay đổi bạn tạo ra" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "" @@ -3541,7 +3582,7 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "&Cắt" @@ -3549,7 +3590,7 @@ msgstr "&Cắt" msgid "Current" msgstr "Hiện tại" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "Nhánh hiện tại" @@ -3557,7 +3598,7 @@ msgstr "Nhánh hiện tại" msgid "Current Branch:" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3569,7 +3610,7 @@ msgstr "" msgid "Current version is:" msgstr "Phiên bản hiện tại là:" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "Phiên bản hiện tại là: %s" @@ -3582,7 +3623,7 @@ msgstr "&Tuỳ biến..." msgid "Custom" msgstr "Thay đổi" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "Tuỳ biến" @@ -3590,19 +3631,19 @@ msgstr "Tuỳ biến" msgid "Customize Keyboard" msgstr "Tuỳ biến bàn phím" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "Tuỳ biến thanh công cụ truy xuất nhanh" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "Tuỳ biến thanh công cụ truy xuất nhanh..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3616,88 +3657,92 @@ msgstr "" msgid "DCommit Type" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "Ngày tháng" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "Mặc định" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "Thực đơn mặc định" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "Thực đơn chương trình mặc định. Xuất hiện khi không có tài liệu nào đang mở." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "Mã hoá UTF-8 mặc định" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "Xoá" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "Xoá và &bỏ qua %d món thông qua tên" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "Xoá và bỏ qua %d món thông qua phần &mở rộng" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "" @@ -3705,34 +3750,34 @@ msgstr "" msgid "Delete remote tag - TortoiseGit" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "Xóa bỏ\nTập tin đã được loại bỏ." -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "Xoá" @@ -3740,36 +3785,36 @@ msgstr "Xoá" msgid "Deleted merge conflict" msgstr "" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "Xoá và thêm các tập tin được lựa chọn hoặc tập tin mặt nạ vào danh sách 'bỏ qua'" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "Xoá tập tin chứa các tường trình về hành động" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "Đang xoá" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" -msgstr "" +msgstr "Đang xoá dữ liệu lưu tạm" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" -msgstr "" +msgstr "Đang xoá tập tin" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "" @@ -3779,7 +3824,7 @@ msgstr "" #. Resource IDs: (1646) msgid "Depth" -msgstr "" +msgstr "Độ sâu" #. Resource IDs: (65535) msgid "Describe" @@ -3789,7 +3834,7 @@ msgstr "" msgid "Describe Strategy" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "Mô tả" @@ -3797,7 +3842,7 @@ msgstr "Mô tả" msgid "Description:" msgstr "Mô tả:" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "Bỏ chọn danh sách thay đổi" @@ -3805,33 +3850,33 @@ msgstr "Bỏ chọn danh sách thay đổi" msgid "Destination" msgstr "Đích đến" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "Ổ đĩa đích đã đầy." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "Phát hiện và làm nổi các khối bị di chuyển" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3845,11 +3890,15 @@ msgstr "Kích thước và vị trí của hộp thoại" msgid "Dialogs" msgstr "" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "" +msgstr "Tùy chọn khác biệt" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "" @@ -3881,7 +3930,7 @@ msgstr "Tập tin chứa khác biệt:" msgid "Diff header" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "" @@ -3893,12 +3942,12 @@ msgstr "" msgid "Diff removed lines" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "" @@ -3911,19 +3960,19 @@ msgstr "Khác biệt giữa" msgid "Diffing" msgstr "Tách biệt" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "" @@ -3935,26 +3984,26 @@ msgstr "Thư mục:" msgid "Disable sounds" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "Đĩa đầy khi đang truy cập %1." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "Phái cá biệt: %1" @@ -3963,44 +4012,52 @@ msgstr "Phái cá biệt: %1" msgid "Display &buttons in this order" msgstr "Hiện &nút bấm theo trình tự này" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "Hiện giúp đỡ khi bấm vào các nút bấm, thực đơn và cửa sổ\nGiúp đỡ" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "Hiện giúp đỡ cho nhiệm vụ hiện thời hoặc lệnh\nGiúp đỡ" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "Hiện hướng dẫn làm sao để sử dụng giúp đỡ\nGiúp đỡ" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "Hiện thông tin về chương trình, số phiên bản và bản quyền\nNói về" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "" @@ -4013,54 +4070,71 @@ msgstr "Không hiện thực đơn ngữ cảnh cho các đường dẫn sau:" msgid "Do not use recycle bin" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "Bạn có thật sự muốn xoá thanh công cụ '%s'?" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "Bạn có thật sự muốn di chuyển tập tin hay thư mục này?" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4068,7 +4142,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4076,21 +4150,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "Bạn có muốn tải những tập tin bị thay đổi?" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4098,21 +4172,21 @@ msgid "" "as resolved?" msgstr "Bạn có muốn đánh dấu tập tin\n%s\nlàm đã được giải quyết?" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "Bạn có muốn khôi phục các tài liệu được lưu tự động?" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "Bạn có muốn tải lại các tài liệu để phản ánh các thay đổi trong thiết lập?\nGhi chú: bạn sẽ mất tất cả các thay đổi đã làm!" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "" @@ -4120,28 +4194,28 @@ msgstr "" msgid "Document :" msgstr "Tài liệu :" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "Đừng khôi phục các tài liệu được tự động lưu\nSử dụng các phiên bản của tài liệu được lưu một cách rõ ràng" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4151,11 +4225,11 @@ msgstr "Đừng lưu\nTải lại trình xem mà không lưu các sửa đổi" msgid "Don't show the selected items: (press shift key to show them)" msgstr "" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "Đừng hiện lại thông điệp này nữa" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "" @@ -4167,7 +4241,7 @@ msgstr "Xuống" msgid "Download" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "Kéo lê để làm thực đơn này nổi" @@ -4195,6 +4269,10 @@ msgstr "" msgid "Dumy Group For locat TabCtr" msgstr "" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "&Các đường dẫn không bao gồm:" @@ -4203,7 +4281,7 @@ msgstr "&Các đường dẫn không bao gồm:" msgid "E&xit" msgstr "&Thoát" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "&Xuất khẩu..." @@ -4223,11 +4301,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "Biên tập" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "" @@ -4243,23 +4321,23 @@ msgstr "" msgid "Edit Button Image" msgstr "Biên tập ảnh của nút bấm" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "Biên tập tác giả" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "Biên tập chương trình tìm khác biệt làm việc với phần mở rộng xác định" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "Biên tập chương trình hợp nhất làm việc với phần mở rộng xác định" @@ -4271,11 +4349,11 @@ msgstr "" msgid "Edit global &XDG git/config" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "Biên tập thông điệp tường trình" @@ -4295,25 +4373,25 @@ msgstr "" msgid "Effective" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "Tên hoặc IP của máy chủ proxy" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "Công cụ ellip\nEllip" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "" @@ -4321,7 +4399,7 @@ msgstr "" msgid "Empty" msgstr "Trống" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "" @@ -4337,7 +4415,7 @@ msgstr "" msgid "Enable drag context menu" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "" @@ -4346,10 +4424,14 @@ msgstr "" msgid "Enable log cache" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "Cho phép xử lý nạp chồng" @@ -4358,35 +4440,35 @@ msgstr "Cho phép xử lý nạp chồng" msgid "Encode" msgstr "" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "Gặp lỗi phần cứng về xuất/nhập khi đang truy cập %1." -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "Gặp vi phạm về khoá khi đang truy cập %1." -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "Gặp vi phạm về chia sẻ khi đang truy cập %1." -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "Gặp thông số không hợp lệ." -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "Gặp lỗi không xác định được khi đang đọc %1." -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "Gặp lỗi không xác định được khi đang ghi %1." @@ -4399,11 +4481,11 @@ msgstr "" msgid "End" msgstr "" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "Phóng to cửa sổ đến kích thước đầy đủ" @@ -4411,23 +4493,23 @@ msgstr "Phóng to cửa sổ đến kích thước đầy đủ" msgid "Enter Log Message" msgstr "Nhập vào thông điệp tường trình" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "Nhập vào URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "Nhập vào GUID." -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "Nhập vào một tiền tệ." -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "Nhập vào một ngày tháng và/hoặc giờ." -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "Nhập vào một ngày tháng." @@ -4435,90 +4517,90 @@ msgstr "Nhập vào một ngày tháng." msgid "Enter a name for the changelist:" msgstr "Điền vào tên dành cho danh sách thay đổi:" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "Nhập vào một số giữa %1 và %2." -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "Nhập vào một số." -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "Nhập vào một số nguyên dương." -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "Nhập vào thời gian." -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "Nhập vào một số nguyên giữa %1 và %2." -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "Nhập vào một số nguyên giữa 0 và 255." -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "Nhập vào một số nguyên." #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "" +msgstr "Nhập vào nội dung tập tin để kiểm tra cho phía dưới:" #. Resource IDs: (1065) msgid "Enter log &message:" msgstr "Nhập vào &thông điệp tường trình:" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "Nhập vào không nhiều hơn %1 ký tự." #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "" +msgstr "Nhập vào chuỗi regex bên dưới:" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "Xóa mọi thứ\nXóa tất cả" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "Xóa lựa chọn\nXóa" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "Lỗi" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "Lỗi khi đang tạo lại bản tạm của biểu tượng Shell!" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "Xảy ra lỗi khi đang đọc/ghi dữ liệu lên khóa registry %s\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4528,28 +4610,28 @@ msgstr "Thi hành được (*.exe)|*.exe|Lệnh (*.com)|*.com|Thông tin (*.pdf) msgid "Executable (+x)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "Tồn tại" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "Thoát" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "Mở rộng (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "Mở rộng cửa sổ gắn buộc" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "Tìm hiểu đến" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "Xuất" @@ -4557,36 +4639,36 @@ msgstr "Xuất" msgid "Export Zip File" msgstr "Xuất dữ liệu ra tập tin dạng Zip" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "Xuất thư mục:" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "Xuất các tập tin không tạo phiên bản luôn" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "Đang xuất dữ liệu %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "Đang xuất..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "Phần mở rộng" @@ -4602,7 +4684,7 @@ msgstr "" msgid "Extern DLL Path:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "Bên ngoài" @@ -4610,101 +4692,101 @@ msgstr "Bên ngoài" msgid "External Program:" msgstr "Chương trình bên ngoài:" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "Nhạt dần" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "Việc quay lại bị thất bại" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "Thất bại khi kết nối\nLiên kết có thể bị vỡ." -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "Thất bại trong việc chuyển đổi đối tượng ActiveX" -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "Thất bại trong việc tạo tài liệu trống." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "Thất bại trong việc tạo đối tượng. Hãy bảo đảm rằng ứng dụng được nhập vào có trong registry hệ thống." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "Thất bại trong việc hiện giúp đỡ." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "Thất bại trong việc chạy ứng dụng máy chủ." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "Thất bại trong việc mở tài liệu." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "Thất bại trong việc thực hiện tác vụ máy chủ." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "Thất bại trong việc lưu tài liệu." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "Thất bại trong việc bật/bỏ danh sách thay đổi '%s'" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "Xảy ra lỗi khi bắt đầu phần truy tìm vấn đề từ nhà cung cấp COM '%s'.\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "Thất bại!" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "" @@ -4712,62 +4794,62 @@ msgstr "" msgid "Fast Forward o&nly" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "Trải ra" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "Đang nạp tập tin..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "Đang nạp bản chỉnh sửa %s của tập tin:" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "Tập tin" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "Thay đổi của tập tin mỗi %s" @@ -4776,27 +4858,27 @@ msgstr "Thay đổi của tập tin mỗi %s" msgid "File changes each week:" msgstr "Thay đổi của tập tin mỗituần:" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "Khác biệt của tập tin" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "Tập tin không có mâu thuẫn nào" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "Tập tin trống." -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "Danh sách tập tin đang trống" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "Các bản vá tập tin" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4808,7 +4890,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Kích thước tập tin:»»%s (%s)\nChiều rộng:»»»%ld pixel\nChiều cao:»»»%ld pixel\nĐộ phân giải ngang:»%.1f dpi\nĐộ phân giải dọc:»%.1f dpi\nĐộ sâu:»»»%d bit\nPhóng:»»»%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4828,7 +4910,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Kích thước tập tin:»»%s (%s)\nĐộ rộng:»»»%ld pixel\nChiều cao:»»»%ld pixel\nĐộ phân giải ngang:»%.1f dpi\nĐộ phân giải dọc:»%.1f dpi\nĐộ sâu:»»»%d bit\nPhóng:»»»%d%%\n\nKích thước tập tin:»»%s (%s)\nĐộ rộng:»»»%ld pixel\nChiều cao:»»»%ld pixel\nĐộ phân giải ngang:»%.1f dpi\nĐộ phân giải dọc:»%.1f dpi\nĐộ sâu:»»»%d bit\nPhóng:»»»%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4840,7 +4922,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Kích thước tập tin:»»»%s (%s)\nĐộ rộng:»»»%ld pixel\nChiều cao:»»»%ld pixel\nĐộ phân giải ngang:»%.1f dpi\nĐộ phân giải dọc:»»%.1f dpi\nĐộ sâu:»»»%d bit\nPhóng:»»»%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4860,7 +4942,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "Kích thước tập tin:»»»%s (%s)\nĐộ rộng:»»»%ld pixel\nChiều cao:»»»%ld pixel\nĐộ phân giải ngang:»%.1f dpi\nĐộ phân giải dọc:»»%.1f dpi\nĐộ sâu:»»»%d bit\nPhóng:»»»%d%%\n\nKích thước tập tin:»»»%s (%s)\nĐộ rộng:»»»%ld pixel\nChiều cao:»»»%ld pixel\nĐộ phân giải ngang:»%.1f dpi\nĐộ phân giải dọc:»»%.1f dpi\nĐộ sâu:»»»%d bit\nPhóng:»»»%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "Tên tập tin" @@ -4868,17 +4950,17 @@ msgstr "Tên tập tin" msgid "Files" msgstr "Các tập tin" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "Công cụ lấp đầy\nLấp đầy" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "Lọc bởi" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "Lọc đường dẫn" @@ -4890,11 +4972,11 @@ msgstr "" msgid "Filter: " msgstr "" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "Tìm" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4904,17 +4986,17 @@ msgstr "Tìm các dòng chữ đã chỉ ra\nTìm" msgid "Find:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "" @@ -4922,23 +5004,23 @@ msgstr "" msgid "Fingerprints" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "Hoàn tất!" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "Gốc đầu tiên" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "Chỉ gốc đầu tiên" @@ -4947,18 +5029,18 @@ msgid "First known &bad:" msgstr "" #. Resource IDs: (32818) -msgid "Fit image &heights" +msgid "Fit image &heights\tH" msgstr "" #. Resource IDs: (32817) -msgid "Fit image &widths" +msgid "Fit image &widths\tW" msgstr "" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "Ổ đĩa mềm (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "Thư mục" @@ -4970,38 +5052,34 @@ msgstr "" msgid "Font" msgstr "Phông chữ" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "Để giúp đỡ, nhấn F1. Cuộn ngang với Ctrl-bánh xe cuộn" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "Để xem toàn bộ lịch sửa bỏ lựa chọn 'Dừng tại sao chép/đổi tên'" -#. Resource IDs: (1521) -msgid "Force" -msgstr "Ép" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5019,20 +5097,20 @@ msgstr "" msgid "Format Patch" msgstr "Định dạng vá lỗi" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "" -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "Tiến tới" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5040,7 +5118,7 @@ msgstr "" #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "" +msgstr "Tìm thấy từ tự động:" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5062,11 +5140,11 @@ msgstr "" msgid "From SVN Repository" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "" @@ -5074,7 +5152,7 @@ msgstr "" msgid "From:" msgstr "Từ:" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "Toàn màn hình" @@ -5082,7 +5160,7 @@ msgstr "Toàn màn hình" msgid "Full text search" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "Đệ quy hoàn toàn" @@ -5090,7 +5168,7 @@ msgstr "Đệ quy hoàn toàn" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "" @@ -5098,24 +5176,24 @@ msgstr "" msgid "GB2312 (Simplified)" msgstr "" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "Không thể khởi hoạt GDI+!" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ không thể tạo được đối tượng ảnh. Có lẽ bạn không có đủ bộ nhớ." -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "Đang thu thập thông tin. Vui lòng chờ..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "" @@ -5145,43 +5223,43 @@ msgstr "Tổng quát::Thực đơn ngữ cảnh" #. Resource IDs: (196) msgid "General::Dialogs 1" -msgstr "" +msgstr "Tổng quát::Hộp thoại 1" #. Resource IDs: (197) msgid "General::Dialogs 2" -msgstr "" +msgstr "Tổng quát::Hộp thoại 2" #. Resource IDs: (4593) msgid "General::Dialogs 3" -msgstr "" +msgstr "Tổng quát::Hộp thoại 3" #. Resource IDs: (4573) msgid "General::Set Extend Menu Item" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "Lấy các tường trình hợp nhất" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "Đang nhận tập tin %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "Đang nhận tập tin %s, duyệt lại %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "Đang lấy thông tin..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "Đang lấy thông tin cần thiết..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "Đang lấy khác biệt thống nhất" @@ -5193,23 +5271,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Sao chép Git và thêm các tập tin vào WC này" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Sao chép Git và đổi tên các đối tượng trong phiên bản tại đây" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Sao chép (các) đối tượng phiên bản Git tại đây" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Xuất dữ liệu từ tất cả các đối tượng Git tại đây" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Xuất dữ liệu các đối tượng phiên bản Git tại đây" @@ -5217,35 +5295,35 @@ msgstr "Xuất dữ liệu các đối tượng phiên bản Git tại đây" msgid "Git Init" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Di chuyển Git và đổi tên các đối tượng phiên bản tại đây" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Di chuyển (các) đối tượng trong phiên bản Git tại đây" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" -msgstr "" +msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "" @@ -5257,31 +5335,31 @@ msgstr "" msgid "Git clone - TortoiseGit" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "" #. Resource IDs: (65535) msgid "Git for Windows" -msgstr "" +msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5302,7 +5380,7 @@ msgstr "" msgid "Git::Remote" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "" @@ -5314,47 +5392,47 @@ msgstr "Đi Tới Dòng" msgid "Go to line" msgstr "Đi đến dòng" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "Đi đến mâu thuẫn tiếp theo\nMâu thuẫn tiếp theo" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "Đi đến khác biệt tiếp theo\nKhác biệt tiếp theo" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "Đi đến khác biệt nội tuyến tiếp theo\nKhác biệt nội tuyến tiếp theo" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "Đi đến mâu thuẫn trước đó\nMâu thuẫn trước đó" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "Đi đến khác biệt trước đó\nKhác biệt trước đó" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "Đi đến khác biệt nội tuyến trước đó\nKhác biệt nội tuyến trước đó" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "Đi đến dòng" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "Biểu đồ" @@ -5370,11 +5448,11 @@ msgstr "Xám" msgid "Greek" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "Nhóm danh sách thay đổi" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "" @@ -5390,7 +5468,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "" @@ -5402,7 +5480,7 @@ msgstr "" msgid "Hebrew" msgstr "" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "Giúp đỡ" @@ -5426,11 +5504,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "Ẩn thực đơn cho các đường dẫn chưa phiên bản" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "Ẩn cửa sổ gắn" @@ -5438,25 +5516,25 @@ msgstr "Ẩn cửa sổ gắn" msgid "Hide the script while running" msgstr "Ẩn kịch bản khi chạy" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "Ẩn/Hiển thị danh sách tập tin vá" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "Ẩn/Hiện danh sách tập tin vá\nẨn hoặc hiện danh sách tập tin vá" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "" @@ -5466,7 +5544,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "Gợi ý: chọn thực đơn ngư cảnh, thay đổi trang sang 'Lệnh' và kéo lê các nút bấm của thanh công cụ vào cửa sổ thực đơn." -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Trang Chủ" @@ -5482,7 +5560,7 @@ msgstr "" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Kịch bản móc::Tích hợp bộ theo dõi vấn đề" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Kiểu móc" @@ -5496,9 +5574,9 @@ msgstr "Đường dẫn &bao gồm:" #. Resource IDs: (1580) msgid "IBugTraqProvider" -msgstr "" +msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5506,55 +5584,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5562,15 +5641,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5594,7 +5673,7 @@ msgstr "" msgid "ID:32857:VA +F" msgstr "" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5602,7 +5681,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5610,7 +5689,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5618,16 +5697,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5638,17 +5717,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5660,7 +5739,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5724,7 +5803,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "Biểu tượng nạp chồng" @@ -5736,7 +5815,7 @@ msgstr "Biểu tượng nạp chồng::Tập hợp biểu tượng" msgid "Icon Overlays::Overlay Handlers" msgstr "Biểu tượng nạp chồng::Xử lý nạp chồng" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5746,52 +5825,52 @@ msgstr "" msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "Biểu tượng/Mã thiết kế:»»Luebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "Nếu được kích hoạt, ngăn chặn nạp chồng và thực đơn ngữ cảnh không cho xuất hiện trong 'lưu như là...' hoặc hộp thoại 'mở'" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "Nếu được đánh dấu, nháy kép chuột trên một bản chỉnh sửa trong danh sách tường trình so sánh nó với bản chỉnh sửa trước đó" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "Nếu được chọn, hộp thoại ủy nhiệm sẽ được bắt đầu tự động ngay khi có lỗi,\ntrong khi đang duyệt lại lựa chọn cuối của bạn và trong thông điệp nhật trình." -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "Nếu được mở, TortoiseGit sẽ kiểm tra ít nhất mỗi tuần một lần khi có phiên bản mới được phát hành" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "Nếu bật, các tập tin bên trong thư mục không được đánh phiên bản có thể hiển thị trong điều khiển trạng thái.\nĐiều khiển trạng thái được dùng cho ví dụ trong hộp thoại cam kết." -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5804,16 +5883,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "Bỏ qua" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "Bỏ qua %d món bởi phần mở &rộng" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "" @@ -5825,15 +5904,15 @@ msgstr "" msgid "Ignore Type" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "Bỏ qua tất cả các thay đổi trên khoảng trắng" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "" @@ -5841,7 +5920,7 @@ msgstr "" msgid "Ignore case cha&nges" msgstr "Bỏ qua &thay đổi về chữ hoa" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5859,11 +5938,11 @@ msgstr "" msgid "Ignore line &endings (recommended)" msgstr "Bỏ qua các dấu &hết dòng (khuyên dùng)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "" @@ -5871,29 +5950,29 @@ msgstr "" msgid "Ignore whitespace" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "Bỏ qua các thay đổi trên khoảng trắng" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "Bỏ qua" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "Bỏ qua các thay đổi trên khoảng trắng khi tìm khác biệt\nBỏ qua các thay đổi trên khoảng trắng" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5911,24 +5990,24 @@ msgstr "Ảnh &và chữ" msgid "Images" msgstr "Ảnh" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "Các con gần nhất, bao gồm thư mục" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "Nhập" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "Nhập dữ liệu %s đến %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "" @@ -5937,16 +6016,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "Đang nhập dữ liệu từ tập tin %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "" @@ -5970,24 +6049,24 @@ msgstr "" msgid "Include only the following revision range:" msgstr "Chỉ bao gồm phạm vi thay đổi sau đây:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "Tên tập tin sai." -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "Nhập ban đầu" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "Diff nội tuyến" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "Diff nội tuyến theo từ" @@ -5999,25 +6078,25 @@ msgstr "Khác biệt trong dòng" msgid "Input" msgstr "Dữ liệu vào" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "Chèn nội dung vào Clipboard\nDán" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "Không đủ bộ nhớ để thực hiện thao tác." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "Lỗi bên trong ứng dụng." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "Tiền tệ không hợp lệ" -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "" @@ -6025,7 +6104,7 @@ msgstr "" msgid "Issuer:" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6048,7 +6127,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "" @@ -6056,11 +6135,11 @@ msgstr "" msgid "Keep changelists" msgstr "Giữ danh sách thay đổi" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6074,7 +6153,7 @@ msgstr "Bàn phím" msgid "Keyboard shortcuts:" msgstr "Bàn phím tắt:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "Các chìa khoá" @@ -6116,21 +6195,41 @@ msgstr "Dòng8" #. Resource IDs: (65535) msgid "Language:" +msgstr "Ngôn ngữ:" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "" @@ -6138,7 +6237,11 @@ msgstr "" msgid "Last known &good:" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "" @@ -6146,17 +6249,17 @@ msgstr "" msgid "Least active author:" msgstr "Tác giả ít hoat động nhất:" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "Để vẫn còn mâu thuẫn\nTrạng thái mâu thuẫn của tập tin được giữ" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "Xem bên trái: " @@ -6164,11 +6267,11 @@ msgstr "Xem bên trái: " msgid "Left image" msgstr "Ảnh bên trái" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "Biểu đồ dòng" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6182,12 +6285,12 @@ msgstr "Thanh khác biệt dòng" msgid "Line differences" msgstr "Các khác biệt về dòng" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "Dòng được di chuyển từ dòng %ld" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "Dòng được di chuyển tới dòng %ld" @@ -6200,26 +6303,26 @@ msgstr "" msgid "Line:" msgstr "Dòng:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "Dòng: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" msgstr "" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "Liệt kê các chủ đề Giúp Đỡ\nChủ đề Giúp Đỡ" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6237,23 +6340,23 @@ msgstr "Tải các ảnh" msgid "Load Putty &Key" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "Tải các thay đổi\nMàn xem được cập nhật với nội dung mới." -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "" @@ -6261,13 +6364,13 @@ msgstr "" msgid "Local Branch" msgstr "Nhánh hiện tại" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "Trạng thái địa phương" @@ -6275,7 +6378,7 @@ msgstr "Trạng thái địa phương" msgid "Local:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6285,7 +6388,7 @@ msgstr "" msgid "Locator Bar" msgstr "Thanh Định Vị" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "Tường trình" @@ -6325,12 +6428,12 @@ msgstr "Các thông điệp tường trình (Hiện hộp thoại tường trìn msgid "Login:" msgstr "" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "Duyệt lại phần hiển thị thấp nhất %ld - duyệt lại phần hiển thị cao nhất: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6341,26 +6444,22 @@ msgstr "Duyệt lại phần hiển thị thấp nhất %ld - duyệt lại ph msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" #. Resource IDs: (5066) msgid "Macintosh" -msgstr "" +msgstr "Macintosh" #. Resource IDs: (1582) msgid "Mail" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "DLL của hệ thống thư không hợp lệ." -#. Resource IDs: (156) -msgid "Main" -msgstr "Chính" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "" @@ -6373,47 +6472,47 @@ msgstr "" msgid "Manage" msgstr "" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "Đánh dấu như đã được giải quyết" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "Đánh dấu là đã giải quyết\nTrạng thái của tập tin được đổi thành đã sửa đổi" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" -msgstr "" +msgstr "Đánh dấu để so sánh" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "Khớp xét &chữ hoa" @@ -6437,7 +6536,7 @@ msgstr "&Thực đơn hiện các lệnh được dùng gần đây trước" msgid "Menu" msgstr "Thực đơn" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "Thanh thực đơn" @@ -6445,7 +6544,7 @@ msgstr "Thanh thực đơn" msgid "Menu s&hadows" msgstr "&Bóng mờ của thực đơn" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "Hợp nhất" @@ -6453,34 +6552,34 @@ msgstr "Hợp nhất" msgid "Merge &Message" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "Tái tích hợp cho hợp nhật" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "" -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "Đã hợp nhất" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "" @@ -6488,22 +6587,22 @@ msgstr "" msgid "Merging" msgstr "Đang hợp nhất" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "Đang xác nhập từ %s, duyệt lại %s đến %s, duyệt lại %s vào trong %s, %s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "Việc hợp nhất đòi hỏi các bản chỉnh sửa khác nhau hoặc URL khác nhau trong 'Từ:' và 'Đến:'" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "Duyệt lại việc xác nhập %s của %s vào trong %s, %s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "Thông điệp" @@ -6513,9 +6612,9 @@ msgstr "" #. Resource IDs: (1579) msgid "Message part &expression:" -msgstr "" +msgstr "Phần &biểu diễn thông điệp:" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "Các thông điệp" @@ -6523,23 +6622,27 @@ msgstr "Các thông điệp" msgid "Min" msgstr "Cực tiểu" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "Của tôi" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "Thu nhỏ Ribbon" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" -msgstr "" +msgstr "Số ký tự nhỏ nhất cho thông điệp cam kết:" #. Resource IDs: (1023, 65535) msgid "Misc" msgstr "Linh tinh" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "Đủ thứ" @@ -6547,35 +6650,35 @@ msgstr "Đủ thứ" msgid "Mixed: Leave working tree untouched, reset index" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "Ngày sửa đổi" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "Đã sửa đổi" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "Thêm" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "Thêm nút bấm" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "Thêm lệnh..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "Thêm màu..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "Thêm..." @@ -6595,41 +6698,41 @@ msgstr "Chuyển &xuống" msgid "Move &Up" msgstr "Chuyển &lên" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "Chuyển món xuống" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "Chuyển món lên" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "Di chuyển và đổi tên" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "Chuyển đến danh sách thay đổi" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "Chuyển/Đổi tên" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "Chuyển: Tên mới cho %s" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "Chuyển các tập tin bị thay đổi sang thùng rác trước khi thực hiện phục hồi quay lui" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "Đang chuyển %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "Đang chuyển..." @@ -6637,11 +6740,11 @@ msgstr "Đang chuyển..." msgid "My file:" msgstr "Tập tin của tôi:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "" @@ -6653,7 +6756,7 @@ msgstr "" msgid "Navigate" msgstr "Định hướng" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6663,11 +6766,11 @@ msgstr "Định hướng đến một dòng cụ thể trong màn xem\nĐi đế msgid "Navigation Pane Options" msgstr "Tuỳ chọn cho bảng định hướng" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "Tuỳ chọn cho bảng định hướng..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "Lồng ghép" @@ -6679,7 +6782,7 @@ msgstr "Mạng" msgid "Network::Email" msgstr "" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "Mới" @@ -6688,43 +6791,43 @@ msgid "New &name:" msgstr "&Tên mới" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "Nhánh mới\\Thẻ đánh dấu" +msgid "New Branch/Tag" +msgstr "Nhánh mới/Thẻ đánh dấu" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "Thực đơn mới" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "Tên mới cho %s" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "Tên mới:" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "" @@ -6732,33 +6835,29 @@ msgstr "" msgid "Next" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "Trang tiếp\nTrang tiếp" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "Xung đột tiếp theo" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "Khác biệt tiếp theo" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "Khác biệt nội tuyến tiếp theo" -#. Resource IDs: (73) -msgid "No" -msgstr "Không" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "" @@ -6770,102 +6869,107 @@ msgstr "" msgid "No Co&mmit" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "Không có giá trị lệnh nào được chỉ ra!" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "Không tìm thấy khác biệt nào!" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "Không có thông điệp lỗi nào sẵn có." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "Không có lỗi nào xảy ra." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "Không có tập tin hoặc thư mục nào được chỉnh sửa. Hiện không có phần nào dành cho TortoiseGit để quay lại!" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "Không có tập tin nào để hiện thị cho thiết lập hiện thời.\nKiểm tra một hoặc nhiều thiết lập phía dưới để xem các tập tin không được đánh phiên bản, bỏ qua và/hoặc không bị sửa đổi\nĐể xem các thay đổi từ xa, nhấn vào 'Kiểm tra kho chứa'" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "Không có tập tin nào được thay đổi hoặc được thêm vào từ\nlần đệ trình cuối cùng. HIện không có\ntác vụ nào dành cho TortoiseGit tại đây..." +"the last commit." +msgstr "" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "Không có tập tin nào được thay đổi hoặc được thêm vào từ\nlần đệ trình cuối cùng. HIện không có\ntác vụ nào dành cho TortoiseGit tại đây...\nBạn có muốn xem lại các tập tin chưa được xếp loại phiên bản?" +msgstr "" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "Không có sẵn đồ thị nào" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "Không có bộ mã hoá ảnh nào tìm thấy cho %s." -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "Không có chỉnh lý đánh vần nào" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" msgstr "Không có trạng thái nào được lưu tạm. Chỉ có các thư mục được đánh phiên bản nhận nạp chồng, các tập tin không được nhận nạp chồng" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "Không có đề nghị nào từ bộ từ điển" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "" @@ -6873,11 +6977,11 @@ msgstr "" msgid "Node size" msgstr "" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "Không" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "Bình thường" @@ -6889,30 +6993,30 @@ msgstr "" msgid "North European" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "Không phải tất cả các mục trong registry hệ thống (hay tập tin INI) được loại bỏ" -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "Không đủ bộ nhớ để hoàn tất tác vụ." -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "Không đủ bộ nhớ!\nThử giảm kích thước của biểu đồ chỉnh sửa bằng cách hoặc là\nthu gọn các nút hay giảm yếu tố phóng." -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "" @@ -6920,7 +7024,7 @@ msgstr "" msgid "Note node" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6939,26 +7043,26 @@ msgstr "Ghi chú: thư mục chứa các món không được đánh phiên bả msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "Chú ý" @@ -6966,7 +7070,7 @@ msgstr "Chú ý" msgid "Number Commits" msgstr "Số lượng đệ trình" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "Số lượng của %s" @@ -6979,7 +7083,7 @@ msgstr "Số lượng tác giả" msgid "Number of characters required for moved or copied line detection:" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "" @@ -7051,41 +7155,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "OK" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Màu Office 2007" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "" @@ -7093,15 +7197,15 @@ msgstr "" msgid "Older lines" msgstr "Các dòng cũ hơn" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "Một hay nhiều các tài liệu tự động lưu được tìm thấy." -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "Một hay nhiều tập tin ở trong trạng thái mâu thuẫn." @@ -7113,29 +7217,29 @@ msgstr "" msgid "Only Local Branches" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "Chỉ con tập tin" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "Chỉ số (có thể ngăn cách bởi dấu phẩy)\nđược cho phép" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "Chỉ món này" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "Mở" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7145,51 +7249,52 @@ msgstr "" msgid "Open certificate" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "Mở các tập tin để xem khác biệt hoặc áp dụng một bản vá\nMở các tập tin" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "Mở từ clipboard" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "Mở tập tin ảnh..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "Mở thư mục cha" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "Mở với" -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "Mở giúp đỡ\nCác chủ để giúp đỡ" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "Tuỳ chọn" @@ -7198,30 +7303,30 @@ msgid "Options" msgstr "Các tùy chọn" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "Kích thước &nguyên thủy" +msgid "Ori&ginal size\tS" +msgstr "Kích thước &nguyên thủy\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "Các bảng tác vụ khác" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "Khác" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "Hết bộ nhớ" @@ -7229,7 +7334,7 @@ msgstr "Hết bộ nhớ" msgid "Output Directory" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.pm" @@ -7237,20 +7342,24 @@ msgstr "Output.pm" msgid "Override branch if exists" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "Trang %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7261,15 +7370,15 @@ msgstr "Trang %u\nCác trang %u-%u\n" msgid "Page :" msgstr "Trang :" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "Tham số" @@ -7277,25 +7386,25 @@ msgstr "Tham số" msgid "Parameters:" msgstr "Các tham số:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "" @@ -7307,39 +7416,39 @@ msgstr "" msgid "Password" msgstr "" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "Mật khẩu:" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "Dán" -#. Resource IDs: (603) -msgid "Paste Recent Message..." +#. Resource IDs: (2750) +msgid "Paste &filename list" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "" + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "Công cụ dán\nDán" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "Dán danh sách tên tập tin" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "Dán đường dẫn svn từ clipboard, cho kết quả trong một tác vụ di chuyển (cắt) hoặc sao chép" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "" @@ -7355,32 +7464,32 @@ msgstr "Vá tất cả các món được &chọn" msgid "Patch As Attachment" msgstr "" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "Vá tất cả các món" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "Vá tất cả các món được chọn" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "Đang vá" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "Đường dẫn" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "Đường dẫn được tìm thấy khớp đường dẫn tốt hơn." @@ -7388,21 +7497,21 @@ msgstr "Đường dẫn được tìm thấy khớp đường dẫn tốt hơn." msgid "Path:" msgstr "Đường dẫn:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "Các đường dẫn" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "Công cụ bút chì\nBút chì" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "Phần trăm quyền tác giả" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "Phần trăm" @@ -7410,24 +7519,24 @@ msgstr "Phần trăm" msgid "Personalized Menus and Toolbars" msgstr "Cá nhân hóa Thực đơn và Thanh công cụ" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" msgstr "" -#. Resource IDs: (90) -msgid "Pick commit message" +#. Resource IDs: (1431) +msgid "Pick commit &message" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7437,56 +7546,56 @@ msgstr "Ảnh (tập tin meta)\nmột bức ảnh" msgid "Picture:" msgstr "Bức ảnh:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "Biểu đồ bánh" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "Vui lòng nhập vào một kịch bản hook để thi hành" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "Vui lòng nhập vào một đường dẫn để áp dụng kịch bản hook" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "Vui lòng chọn kiểu hook" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "Vui lòng chờ trong khi đang hủy bỏ..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "Vui lòng chờ trong khi khác biệt đang được nhận về..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "Vui lòng chờ..." @@ -7502,11 +7611,11 @@ msgstr "Cổng :" msgid "Port:" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Hook sau cam kết" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "" @@ -7514,23 +7623,23 @@ msgstr "" msgid "Pre&v Page" msgstr "Trang &trước đó" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Hook trước cam kết" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "" @@ -7542,11 +7651,11 @@ msgstr "Nhấn phím tắt &Mới:" msgid "Press &new shortcut key:" msgstr "Nhấn phím tắt &mới:" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "Xem trước" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "Xem trước tập tin được vá" @@ -7558,51 +7667,51 @@ msgstr "Xem trước: " msgid "Previous" msgstr "" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "Trang trước\nTrang trước" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "Xung đột trước đó" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "Khác biệt trước đó" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "Khác biệt nội tuyến trước đó" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "In ấn" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "In tài liệu\n&In ấn" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "In ra tập tin" @@ -7610,7 +7719,7 @@ msgstr "In ra tập tin" msgid "Printer :" msgstr "Máy in:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "Các tập tin máy in (*.prn)|*.prn|All Files (*.*)|*.*||" @@ -7618,11 +7727,11 @@ msgstr "Các tập tin máy in (*.prn)|*.prn|All Files (*.*)|*.*||" msgid "Printing" msgstr "Đang in" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "Chương trình" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "Chương trình (*.exe)|*.exe|All Files (*.*)|*.*||" @@ -7630,11 +7739,11 @@ msgstr "Chương trình (*.exe)|*.exe|All Files (*.*)|*.*||" msgid "Progress" msgstr "Tiến triển" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "Thuộc tính" @@ -7642,17 +7751,17 @@ msgstr "Thuộc tính" msgid "Property Page" msgstr "Trang thuộc tính" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "Nhà cung cấp" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "" +msgstr "&Tham số cho nhà cung cấp:" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "" +msgstr "win&32 uuid của nhà cung cấp:" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" @@ -7674,15 +7783,15 @@ msgstr "" msgid "Prune (All remotes)" msgstr "" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "Kéo" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "" @@ -7690,19 +7799,19 @@ msgstr "" msgid "Pull/Fetch" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "Đẩy" @@ -7718,11 +7827,11 @@ msgstr "" msgid "Push notes" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "" @@ -7730,22 +7839,22 @@ msgstr "" msgid "Putty Key:" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "Thoát chương trình; hiên thông báo hỏi lưu tài liệu\nThoát" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7763,11 +7872,15 @@ msgstr "Ổ đĩa R&AM" msgid "R&eset" msgstr "&Đặt lại" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "&Quay lui tới bản chỉnh sửa này" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "" @@ -7775,7 +7888,7 @@ msgstr "" msgid "Randomize Sync Dialog startup position" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7797,7 +7910,7 @@ msgstr "" msgid "Re&movable drives" msgstr "Ổ đĩa &tháo lắp" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "Đổi &tên..." @@ -7813,15 +7926,15 @@ msgstr "&Đặt lại tất cả" msgid "Re&store defaults" msgstr "&Khôi phục mặc định" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "&Quay lui..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "Đọc 'Hướng dẫn sử dụng hàng ngày' trước khi bạn bị kẹt..." @@ -7829,21 +7942,21 @@ msgstr "Đọc 'Hướng dẫn sử dụng hàng ngày' trước khi bạn bị msgid "Rebase" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "Gần đây" @@ -7855,21 +7968,21 @@ msgstr "" msgid "Recently modified lines" msgstr "Các dòng được chỉnh sửa gần đây" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "Chỉ ghi hồ sơ lại" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "Phục hồi các tài liệu được lưu tự động\nMở các phiên bản được lưu tự động thay cho các phiên bản được lưu rõ ràng" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7883,17 +7996,21 @@ msgstr "" msgid "Recursive" msgstr "Đệ quy" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "Khôi phục hành động chưa làm xong trước đó\nKhôi phục" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "Giảm cửa sổ thành một biểu tượng" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "" @@ -7901,31 +8018,31 @@ msgstr "" msgid "Ref (Click it then go to)" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "Làm mới" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "" @@ -7937,7 +8054,7 @@ msgstr "" msgid "Regex:" msgstr "" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7956,7 +8073,7 @@ msgid "" "\\s : whitespaces" msgstr "Lọc biểu thức thông thường:\n. : bất kỳ ký tự nào\nc+ : khớp ký tự c một hoặc nhiều lần\nc* : khớp ký tự c không hoặc nhiều lần\n^ : bắt đầu dòng\n$ : cuối dòng\n(string){n} : khớp chuỗi n lần\n(abcd) : biểu thức con\n[aei0-9] : khớp a,e,i và 0..9\n[^aei0-9] : mọi thứ trừ a,e,i và 0..9\n\n\\w : khớp a-z,A-Z,0-9 và _\n\\W : bất ký ký tự không phải chữ\n\\d : chữ số 0-9\n\\s : khoảng trắng" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "Bác bỏ khối vá cho '%s'" @@ -7969,7 +8086,7 @@ msgstr "Thời gian liên quan trong nhật trình" msgid "Reload" msgstr "Tải lại" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8003,19 +8120,19 @@ msgstr "" msgid "Remote Branch" msgstr "Nhánh từ xa" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "Trạng thái từ xa" @@ -8027,12 +8144,12 @@ msgstr "Từ xa:" msgid "Remove" msgstr "Loại bỏ" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "Loại bỏ %ld món" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "Loại bỏ %s" @@ -8041,7 +8158,7 @@ msgstr "Loại bỏ %s" msgid "Remove &all untracked files (-fx)" msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "" @@ -8049,21 +8166,21 @@ msgstr "" msgid "Remove &non-ignored untracked files (-f)" msgstr "" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "Loại bỏ khỏi danh sách &bỏ qua" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "Loại bỏ khỏi Thanh Truy Cập Nhanh" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "Loại bỏ khỏi danh sách bỏ qua" @@ -8075,7 +8192,7 @@ msgstr "" msgid "Remove untracked directories (-d)" msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "" @@ -8083,11 +8200,11 @@ msgstr "" msgid "Removed" msgstr "Đã loại bỏ" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "Đã loại bỏ khỏi danh sách thay đổi" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8095,7 +8212,7 @@ msgid "" "from the ignore list." msgstr "Đã loại bỏ mẫu tập tin(s)\n%s\nkhỏi danh sách bỏ qua." -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "Loại bỏ tập tin hoặc tập tin mask khỏi danh sách các món bị bỏ qua" @@ -8103,11 +8220,11 @@ msgstr "Loại bỏ tập tin hoặc tập tin mask khỏi danh sách các món msgid "Rena&me..." msgstr "Đổi &tên..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "Đổi tên" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "Đổi tên %s" @@ -8116,20 +8233,20 @@ msgstr "Đổi tên %s" msgid "Rename - TortoiseGit" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "Đổi tên/di chuyển" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8139,7 +8256,7 @@ msgstr "Lập lại hành động cuối cùng\nLập lại" msgid "Replace &All" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8153,12 +8270,12 @@ msgstr "" msgid "Replace:" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "Đang thay thế" @@ -8182,11 +8299,11 @@ msgstr "" msgid "Requests a username and a password" msgstr "Yêu cầu một tên đăng nhập và mật khẩu" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "" -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "Cài đặt lại" @@ -8198,25 +8315,25 @@ msgstr "Đặt lại &tất cả" msgid "Reset Type" msgstr "Loại cài đặt lại" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "" -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "Đặt lại các cột" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "Giải quyết" @@ -8224,126 +8341,122 @@ msgstr "Giải quyết" msgid "Resolve Submodule Conflict" msgstr "" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "Giải quyết mâu thuẫn sử dụng 'của tôi'" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "Giải quyết mâu thuẫn sử dụng 'của họ'" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "Đã giải quyết" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "Đã giải quyết:\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "Đã giải quyết các tập tin bị mâu thuẫn" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "Khôi phục" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "Khôi phục mặc định" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "Khôi phục sau khi cam kết" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "Khôi phục cửa sổ về kích thước bình thường" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "Khôi phục" -#. Resource IDs: (73) -msgid "Retry" -msgstr "Thử lại" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "Quay lui" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "Đã quay lui" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "Quay lui tất cả thay đổi bạn làm kể từ lần cập nhất cuối cùng" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "Quay lui việc thêm vào kiểm soát phiên bản" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "" -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "Bản chỉnh sửa" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "Bản chỉnh sửa %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "Bản chỉnh sửa %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "Biểu đồ &bản chỉnh sửa" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "" @@ -8359,31 +8472,31 @@ msgstr "Lọc biểu đồ bản chỉnh sửa" msgid "Revision graph" msgstr "Biểu đồ bản chỉnh sửa" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Giàu văn bản (RTF)\nchữ với phông và định dạng đoạn văn" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "Xem bên phải: " @@ -8391,21 +8504,21 @@ msgstr "Xem bên phải: " msgid "Right image" msgstr "Ảnh bên phải" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "Dòng %d của %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "Dòng %d-%d của %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "Dòng xuống" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "Dòng lên" @@ -8413,11 +8526,11 @@ msgstr "Dòng lên" msgid "S&elect..." msgstr "&Chọn..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "&Hiện nút bấm trên một dòng" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "&Hiện nút bấm trên hai dòng" @@ -8425,25 +8538,33 @@ msgstr "&Hiện nút bấm trên hai dòng" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "&Hiện Thanh Công Cụ Truy Cập Nhanh dưới Ribbon" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "&Số liệu" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "" -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" #. Resource IDs: (65535) msgid "SHA-1:" -msgstr "" +msgstr "SHA-1:" #. Resource IDs: (65535) msgid "SHA-256:" -msgstr "" +msgstr "SHA-256:" #. Resource IDs: (1585) msgid "SMTP Server requires authentication" @@ -8453,7 +8574,7 @@ msgstr "" msgid "SMTP Server:" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "" @@ -8461,31 +8582,31 @@ msgstr "" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" -msgstr "" +msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." -msgstr "" +msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "" @@ -8497,15 +8618,15 @@ msgstr "Sa&feCrLf:" msgid "Safe Crlf:" msgstr "Safe Crlf:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8521,37 +8642,41 @@ msgstr "" #. Resource IDs: (1612) msgid "Sample text:" -msgstr "" +msgstr "Văn bản ví dụ:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "Lưu" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "Lưu như &là..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "Lưu như &là...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "Lưu như là" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8559,13 +8684,13 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8573,74 +8698,74 @@ msgid "" "%s" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "Lưu dưới dạng" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "Lưu như là..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "Lưu như là\nBạn đang được hỏi nơi lưu tập tin" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "Lưu thay đổi sang %1?" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "Lưu các thay đổi." -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "Lưu chỉnh sửa &vào..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8662,13 +8787,13 @@ msgstr "" msgid "Save unified diff since HEAD" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "Lưu\nLưu tập tin với các đánh dấu mâu thuẫn" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8680,28 +8805,28 @@ msgstr "Lưu\nCác sửa đổi đã được lưu vào\n%s" msgid "Saved Data" msgstr "Dữ liệu được lưu" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "" #. Resource IDs: (1522) msgid "Scan" -msgstr "" +msgstr "Quét" #. Resource IDs: (1014, 1064, 1636) msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "Cuộn Trái" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "Cuộn Phải" @@ -8709,7 +8834,7 @@ msgstr "Cuộn Phải" msgid "Se&ttings..." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "Tìm kiếm trên các &thông điệp tường trình..." @@ -8721,20 +8846,20 @@ msgstr "" msgid "Search for:" msgstr "Tìm kiếm cho:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "Tìm đường dẫn tốt hơn để áp dụng bản vá..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "Việc tìm bị thất bại %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "Chọn &tất cả" @@ -8750,59 +8875,59 @@ msgstr "Chọn &thực đơn ngữ cảnh:" msgid "Select &window:" msgstr "Chọn &cửa sổ:" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "Chọn công cụ màu\nChọn màu" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "Chọn tập tin..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "Chọn máy khách SSH" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "Chọn nút bấm." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "Chọn một đối tượng để được Giúp đỡ" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "Chọn danh sách thay đổi" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "Chọn ứng dụng tìm khác biệt" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "Chọn thư mục để gắn với bộ theo dõi vấn đề này" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "Chọn thư mục để xuất.\nBạn có lẽ cần tạo một thư mục mới trước khi thi hành việc xuất này." -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "Chọn thư mục để chạy kịch bản cho" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "Chọn thư mục để lưu các tập tin được chọn vào" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "Chọn tập tin kịch bản móc" @@ -8810,20 +8935,20 @@ msgstr "Chọn tập tin kịch bản móc" msgid "Select items automatically" msgstr "Chọn các món một cách tự động" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "Chọn ứng dụng hợp nhất" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "Chọn đối tượng hợp nhất" -#. Resource IDs: (79) +#. Resource IDs: (1253) 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ụ." -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8833,17 +8958,21 @@ msgstr "Chọn toàn bộ tài liệu\nChọn tất cả" msgid "" "Select the language this project is using. This settings affects the spell " "checker used for commit messages." +msgstr "Chọn ngôn ngữ đề án này đang dùng. Thiết lập này sẽ ảnh hưởng bộ kiểm tra chính tả dùng cho các thông điệp cam kết." + +#. Resource IDs: (1559) +msgid "Select tracked branch" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "Chọn chương trình xem cho các tập tin chứa khác biệt" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8853,7 +8982,7 @@ msgstr "" msgid "Select/deselect &all" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "" @@ -8861,7 +8990,7 @@ msgstr "" msgid "Send" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "" @@ -8869,11 +8998,11 @@ msgstr "" msgid "Send Mail after create" msgstr "" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "Gửi Thư thất bại trong việc gửi thông điệp." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "" @@ -8881,19 +9010,19 @@ msgstr "" msgid "Send Patch" msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "Đang gửi nội dung" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "" @@ -8913,28 +9042,28 @@ msgstr "" msgid "Set author &date" msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "Đặt thuộc tính..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "Thiết lập" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "Thiết lập - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Shell" @@ -8942,7 +9071,7 @@ msgstr "Shell" msgid "Shell Extended" msgstr "" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "Bản nhớ cho biểu tượng Shell đã được tạo!" @@ -8954,7 +9083,7 @@ msgstr "" msgid "Short &date/time format in log messages" msgstr "Hiển thị định dạng &ngày tháng trong các thông điệp tường trình" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "Danh sách thuộc tính thu gọn" @@ -8966,7 +9095,7 @@ msgstr "Hiển thị" msgid "Show &Accelerator for:" msgstr "Hiển thị &Tăng Tốc cho" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "" @@ -8974,15 +9103,15 @@ msgstr "" msgid "Show &Unversioned Files" msgstr "" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "Hiển thị các &thay đổi" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "Hiển thị &tường trình" @@ -8990,15 +9119,19 @@ msgstr "Hiển thị &tường trình" msgid "Show &log..." msgstr "Hiển thị &tường trình..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "Chỉ hiển thị &nạp chồng và thực đơn ngữ cảnh trong trình khám phá" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "Hiển thị phía trên Ribbon" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "Hiển thị phía dưới Ribbon" @@ -9006,35 +9139,35 @@ msgstr "Hiển thị phía dưới Ribbon" msgid "Show Environment Variables" msgstr "" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "Hiển thị ít Nút Bấm hơn" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "Hiển thị các nút của bản chỉnh sửa CHÍNH" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "Hiển thị khác biệt trong dòng từng từ một\nHướng theo khác biệt từng từ trong dòng" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "Hiện Khác biệt-trong dòng\nKhác biệt trong dòng" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "Hiển thị nhiều Nút Bấm hơn" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "Hiển thị Thanh Công Cụ Truy Cập Nhanh phía trên Ribbon" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "Hiển thị Thanh Công Cụ Truy Cập Nhanh phía dưới Ribbon" @@ -9042,11 +9175,11 @@ msgstr "Hiển thị Thanh Công Cụ Truy Cập Nhanh phía dưới Ribbon" msgid "Show Screen&Tips on toolbars" msgstr "Hiển thị các &mẹo màn hình trên thanh công cụ" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "Hiển thị Khoảng Trắng" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "Hiển thị tổng quát của toàn bộ biểu đồ" @@ -9054,7 +9187,7 @@ msgstr "Hiển thị tổng quát của toàn bộ biểu đồ" msgid "Show asterisk log prefix" msgstr "" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "" @@ -9062,11 +9195,11 @@ msgstr "" msgid "Show author" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "Hiển thị các thay đổi dưới dạng khác biệt &thống nhất" @@ -9086,15 +9219,15 @@ msgstr "" msgid "Show describe in log" msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "" @@ -9106,11 +9239,15 @@ msgstr "" msgid "Show excluded folders as normal" msgstr "Hiển thị các thư mục bị loại trừ như bình thường" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "&Hiển thị đầy đủ thực đơn sau một khoảng chờ ngắn" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "" @@ -9126,7 +9263,7 @@ msgstr "Hiển thị c&ác tập tin bị bỏ qua" msgid "Show ignore local changes flagged files" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "" @@ -9134,90 +9271,90 @@ msgstr "" msgid "Show linenumber&s" msgstr "Hiển thị số thứ tự &dòng" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "Hiển thị nút cũ nhất trên cùng" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "Ẩn hoặc hiện thanh khác biệt dòng\nĐảo hiện thanh khác biệt dòng" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "Ẩn hoặc hiện thanh địa chỉ\nĐảo hiện thanh địa chỉ" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "Ẩn hoặc hiện thanh trạng thái\nĐảo hiện thanh trạng thái" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "Ẩn hoặc hiện thanh công cụ\nĐảo hiện thanh công cụ" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "Hiện thuộc tính chỉnh sửa" @@ -9225,7 +9362,7 @@ msgstr "Hiện thuộc tính chỉnh sửa" msgid "Show shortcut &keys in ScreenTips" msgstr "Hiện &phím tắt trong Mẹo Màn Hình" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9235,7 +9372,7 @@ msgstr "Hiển thị ký tự đặc biệt cho các khoảng trắng và dòng msgid "Show status of subrepositories in parent folders" msgstr "" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9247,45 +9384,43 @@ msgstr "Hiển thị các t&ập tin chưa được chỉnh sửa" msgid "Show un&versioned files" msgstr "Hiển thị các tập tin chưa đượ&c xếp loại phiên bản" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "Hiện/Ẩn" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "Hiển thị biểu diễn đồ hoạ của các bản sao/thẻ/nhánh" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "Hiển thị tất cả các tập tin được thay đổi kể từ lần cập nhất cuối, địa phương và trong kho chứa" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "Hiển thị thông tin thêm về TortoiseGit" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "Hiển thị tập tin về tường trình hành động trong bộ biên tập văn bản mặc định" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "" @@ -9297,7 +9432,7 @@ msgstr "" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "Kiều Màu Bạc" @@ -9305,20 +9440,20 @@ msgstr "Kiều Màu Bạc" msgid "Since" msgstr "Kể từ" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "Kích thước" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "Bỏ qua" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "" @@ -9326,23 +9461,23 @@ msgstr "" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "Bỏ qua" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "Bỏ qua đích bị thiếu" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "Trượt" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "" @@ -9350,13 +9485,13 @@ msgstr "" msgid "Soft: Leave working tree and index untouched" msgstr "Mềm: Rời bỏ cây làm việc cũng như chỉ mục mà không tác động" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9370,7 +9505,7 @@ msgstr "Sắp xếp theo số lần cam kết" msgid "Sort tag list in reversed order" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9380,57 +9515,61 @@ msgstr "Chỉ ra bao nhiêu món bạn muốn giữ lại trong hộp thoại th msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "Tách các dòng" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "Tách cửa sổ hoạt động thành các bảng\nTách" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" msgstr "Nén chặt" -#. Resource IDs: (246) +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "" + +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "Chồng các đồ thị thanh" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "Chồng các đồ thị dòng" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "Tiêu chuẩn" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Bắt đầu hook cam kết" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "" #. Resource IDs: (1542) msgid "Start registry editor" -msgstr "" +msgstr "Chạy trình biên tập registry" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "" @@ -9442,39 +9581,47 @@ msgstr "" msgid "Stash &Message" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "" +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "Tĩnh" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "Các số liệu" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "Trạng thái" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "Cấu hình thanh trạng thái" @@ -9486,32 +9633,32 @@ msgstr "Màu của trạng thái và hành động" msgid "Status cache" msgstr "Bản lưu tạm của trạng thái" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "Bản lưu trạng thái chỉ cho cho một thư mục, không có nạp chồng kiểu đệ quy" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "" @@ -9519,15 +9666,15 @@ msgstr "" msgid "Strip lines starting with \"#\" in commit message" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "Kiểu" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "" @@ -9535,7 +9682,7 @@ msgstr "" msgid "Submodule" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "" @@ -9543,7 +9690,7 @@ msgstr "" msgid "Submodule Add" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "" @@ -9551,15 +9698,15 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "" @@ -9567,7 +9714,7 @@ msgstr "" msgid "Submodule Update Options" msgstr "" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9582,15 +9729,15 @@ msgstr "" msgid "Submodules" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "Xoay chuyển" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "Chuyển đổi %s sang %s, bản chỉnh sửa %s" @@ -9599,43 +9746,43 @@ msgstr "Chuyển đổi %s sang %s, bản chỉnh sửa %s" msgid "Switch To" msgstr "Chuyển đổi sang" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "Chuyển sang cửa sổ bảng trước đó\nBảng trước đó" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "Hoán đổi giữa màn xem đơn và đôi" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "Chuyển đổi giữa bảng xem đơn và kép\nChuyển đổi giữa bảng xem đơn và kép" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "Hoán đổi màn xem trái và phải" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "Chuyển đổi nội dung của kiểu xem trái và phải\nChuyển đổi kiểu xem trái và phải" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "Chuyển sang cửa sổ tài liệu tiếp theo" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "Chuyển sang cửa sổ bảng tiếp theo\nCửa sổ bảng tiếp theo" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "Chuyển sang cửa sổ tài liệu trước đó" @@ -9643,21 +9790,21 @@ msgstr "Chuyển sang cửa sổ tài liệu trước đó" msgid "Switch/Checkout" msgstr "" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "" -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" -msgstr "" +msgstr "Chuyển cách so sánh trái <-> phải" #. Resource IDs: (1733) msgid "Symbolize ref names" @@ -9667,23 +9814,23 @@ msgstr "" msgid "Symlink" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9693,13 +9840,13 @@ msgstr "Regitry hệ thống đã được loại bỏ và tập tin INI (nếu msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" -msgstr "" +msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" @@ -9713,7 +9860,7 @@ msgstr "Giữ chỗ cho dấu tab" msgid "Tab size:" msgstr "Kích thước dấu tab:" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "" @@ -9721,16 +9868,16 @@ msgstr "" msgid "Tag (FF)" msgstr "" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "Các thẻ đánh dấu" @@ -9738,11 +9885,11 @@ msgstr "Các thẻ đánh dấu" msgid "Tags:" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "Nhiệm vụ" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "Bảng nhiệm vụ" @@ -9754,11 +9901,11 @@ msgstr "" msgid "Test" msgstr "" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "Chỉ kiểm tra" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "" @@ -9766,13 +9913,19 @@ msgstr "" msgid "Thai" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9780,64 +9933,78 @@ msgid "" "Do you really want to delete it?" msgstr "" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "Kích thước một mẩu không khớp số dòng được thêm/loại bỏ!" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "Cỗ máy tìm khác biệt được bỏ bởi một lỗi:\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "Tập tin %s không tìm thấy trong đường dẫn!" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "Tập tin %s không tìm thấy trong tập tin vá!" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9846,15 +10013,15 @@ msgid "" "Do you want to remove the file?" msgstr "Tập tin\n%s\nđang trống.\nBạn có muốn loại bỏ nó không?" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "Tập tin quá lớn" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "Tập tin quá lớn để mở." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9862,7 +10029,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "Tập tin\n%s\nđã tồn tại! Bạn có muốn ghi đè nó không?" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9870,14 +10037,14 @@ msgid "" "is not a valid text file!" msgstr "Tập tin\n%s\nkhông phải là một tập tin văn bản hợp lệ!" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "Thư mục %s\nchứa các tập tin không đánh văn bản và/hay được sửa đổi. Bạn có muốn loại bỏ nó không?" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9886,78 +10053,78 @@ msgid "" "Would you like to create it first?" msgstr "Thư mục\n%s\nkhông tồn tại.\nBạn có muốn tạo nó trước không?" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Kịch bản hook trả về lỗi:\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "Ảnh không thể hiển thị được." -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "Bộ cung cấp theo dõi vấn đề không thể tạo được. Vui lòng kiểm tra rằng nó được cài đặt đúng." -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "Bộ cung cấp theo dõi vấn đề không thể xác nhận được chuỗi tham số" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "Dòng thể hiện tập tin mới phải có trong dòng %d !" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "Số dòng phải ở giữa %d và %d" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." msgstr "Số tối đa các dòng tường trình hành động để giữ.\nBất kỳ dòng nào thêm vào quá giới hạn này sẽ loại bỏ dòng cũ nhất khỏi tập tin." -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "Tác vụ thất bại." -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "Các tham số '/path' và '/pathfile' loại trừ lẫn nhau.\nBạn phải chỉ rõ ra một trong chúng." -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9967,7 +10134,7 @@ msgid "" "do not match!" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9978,7 +10145,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "Đường dẫn/đường liên kết bạn điền vào có trạng thái không hợp lệ trong hệ điều hành Windows!\nBạn vẫn có thể thực hiện điều này, nhưng rồi sẽ nhận được một thông báo lỗi.\n\nMột đường dẫn được xem là hợp lệ trong hệ điều hành Windows không được phép chứa '<<>|\"?*:' hoặc một trong các tên thiết bị sau:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\nBạn vẫn muốn tiếp tục?" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9989,36 +10156,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." -msgstr "" +msgstr "Biểu thức thông thường không hợp lệ!\nVui lòng nhập vào một biểu thức thông thường hợp lệ." -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "Đã tạo thành công nơi chứa dữ liệu." -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "Đường dẫn được lựa chọn có vẻ vẫn còn một hay nhiều đánh dấu mâu thuẫn trong đó.\nBạn có chắc là muốn đánh dấu tập tin đã được giải quyết?" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10026,7 +10200,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10035,7 +10209,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10044,26 +10218,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "Thời gian tính bằng giây mà sau đó việc phân tích các tập tin được lựa chọn dừng lại.\nMột giá trị thấp hơn sẽ làm cho danh sách tự động điền đủ có được sớm hơn,\nnhưng có lẽ không quét tất cả các tập tin." -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "Hai URL được lựa chọn không được tạo ra từ một gốc chung.\nKhông thể hiện thông điệp tường trình giữa chúng!" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10073,34 +10247,34 @@ msgstr "" msgid "Their file:" msgstr "Tập tin của họ:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "Của họ" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "Hiện có %d các cán lớp phủ được cài đặt bên cạnh những cán được dùng bởi Tortoise" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "Không có bộ cung cấp theo dõi vấn đề nào sẵn sàng." -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10109,85 +10283,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "Vẫn còn các mâu thuẫn chưa giải quyết trong dòng %d!\nBạn nên giải quyết các mâu thuẫn trước khi lưu.\nBạn có muốn lưu tập tin với mâu thuẫn vẫn còn đó?\nNếu bạn nhấn VÂNG, thì bạn phải giải quyết các mâu thuẫn đó thủ công trong một trình biên tập khác!" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "Có các sửa đổi chưa lưu!\nBạn có muốn lưu các thay đổi của bạn?" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "Bộ toàn thư" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "Có nhiều lưu trữ gần đây hơn các tài liệu đang được mở và chứa các thay đổi được thực hiện trước khi ứng dụng đóng lại." -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "Đây không phải là một URL hợp lệ.\nXin nhập vào một URL ở đây." -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Đây không phải là một đường dẫn hợp lệ!\nMột đường dẫn được xem là hợp lệ khi không chứa '<<>|\"?*:' hoặc một trong các tên thiết bị sau:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "Chương trình này liên kết với các xuất khẩu bị mất %s trong tập tin %s. Máy tính này có lẽ có một phiên bản không tương thích của %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "Chương trình này đòi hỏi tập tin %s, không tìm thấy trên hệ thống này." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "Thuộc tính này chỉ được phép trên các thư mục, không phải trên tập tin." -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" msgstr "Việc này sẽ xóa các bản ghi của các lệnh bạn đã dùng trong ứng dụng và khôi phục danh sách mặc định các lệnh thấy được trên thực đơn và thanh công cụ. Nó sẽ không phục hồi các tuỳ biến rõ ràng. Bạn có chắc là muốn làm việc này?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "" @@ -10203,14 +10377,14 @@ msgstr "Xếp lợp &ngang" msgid "To" msgstr "" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10222,13 +10396,13 @@ msgstr "" msgid "To:" msgstr "Đến:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "Lật thể hiện Một/Hai trang\nLật thể hiện Một/Hai trang" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "" @@ -10240,11 +10414,11 @@ msgstr "Thanh công cụ" msgid "Toolbar Name" msgstr "tên thanh công cụ" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "Tùy chọn cho thanh công cụ" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "Lỗi nội bộ của thanh công cụ. Vui lòng liên lạc nơi cung cấp ứng dụng của bạn." @@ -10260,16 +10434,16 @@ msgstr "Công cụ" msgid "Tools:" msgstr "Công cụ:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10279,40 +10453,40 @@ msgstr "" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" +"Do you want to restore or remove it from the index?" msgstr "" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit đã nhận dạng tính đồng dạng trong tên của các tập tin. Bạn có muốn các tập tin:%s\ncũng được tiến hành đổi tên hay không?" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" -msgstr "" +msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, Version %d.%d.%d.%d" @@ -10328,7 +10502,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10336,7 +10510,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10350,36 +10524,36 @@ msgid "" "/showinfo\t\tto show the image info boxes" msgstr "" -#. Resource IDs: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" "libsvn_diff %d.%d.%d, %s\r\n" "apr %d.%d.%d\r\n" "apr-util %d.%d.%d" -msgstr "" +msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\nlibsvn_diff %d.%d.%d, %s\r\napr %d.%d.%d\r\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" -msgstr "" +msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10418,11 +10592,11 @@ msgstr "Theo dõi" msgid "Tracked Remote Branch:" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "Chuyển giao tại %s" @@ -10431,39 +10605,35 @@ msgstr "Chuyển giao tại %s" msgid "Transparent &color..." msgstr "&Màu trong suốt..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "Thử 'Dọn dẹp'. Nếu nó không được thì bạn cần phải làm việc lấy ra mới." -#. Resource IDs: (73) -msgid "Try again" -msgstr "Thử lần nữa" - #. Resource IDs: (65535) msgid "Turkish" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "Tùy chỉnh TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "" @@ -10487,24 +10657,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "Không thể tải được hệ thống thư hỗ trợ." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "Không xử lý được lênh, máy chủ đang bận." -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "Không thể đọc được từ %1, nó được mở bởi ai đó." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "Không thể đọc được thuộc tính chỉ-ghi." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10512,91 +10682,95 @@ msgid "" "from the top pane in the log dialog." msgstr "" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "Không thể ghi một thuộc tính chỉ đọc." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "Không thể ghi vào %1, nó là chỉ-đọc hoặc được mở bởi ai đó." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "Bỏ chọn" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "Hoàn Tác" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "Hủy %d hành động" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "Hủy 1 hành động" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "Hoàn tác các sửa đổi cuối\nHoàn tác" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "Định dạng tập tin không chấp nhận" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "Trải ra" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "Văn bản không được định dạng\nvăn bản không có định dạng nào" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "&Khác biệt thống nhất của các bản chỉnh sửa HEAD" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "Độ sâu không biết được" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "Các mâu thuẫn chưa được giải quyết!" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "Không tiêu đề" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "Đã được bỏ phiên bản" @@ -10604,7 +10778,7 @@ msgstr "Đã được bỏ phiên bản" msgid "Unversioned files mark parent folder as modified" msgstr "Các tập tin không phiên bản đánh dấu thư mục cha như là đã được sửa đổi" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "Đang thực hiện việc gỡ bỏ phiên bản %s" @@ -10617,23 +10791,23 @@ msgstr "Lên" msgid "Update" msgstr "Cập nhật" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "Đã cập nhật" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "Đang cập nhật đối tượng ActiveX" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "" @@ -10645,30 +10819,26 @@ msgstr "Sử dụng ảnh &mặc định: " msgid "Use &one-pane view as default for 2-file diff" msgstr "Dùng chế độ xem &một bảng như là mặc định cho việc so sánh 2-tập tin" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "Sử dụng khối văn bản &khác" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "Sử dụng khối văn bản 'của tôi'" -#. Resource IDs: (156) +#. Resource IDs: (32822) 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: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "Sử dụng khối 'của họ'" -#. Resource IDs: (156) +#. Resource IDs: (32821) 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: (156) -msgid "Use Blocks" -msgstr "Sử dụng các khối" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "" @@ -10689,15 +10859,15 @@ msgstr "" msgid "Use Unified Diff from &clipboard" msgstr "Dùng tìm khác biệt thống nhất từ &clipboard" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10707,7 +10877,7 @@ msgstr "Sử dụng tất cả nội dung từ bảng xem bên trái\nSử dụn msgid "Use block from left before right" msgstr "Sử dụng khối từ bên trái trước bên phải" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10717,25 +10887,25 @@ msgstr "Sử dụng khối từ bên trái trước khối từ bên phải\nS msgid "Use block from right before left" msgstr "Sử dụng khối từ bên phải trước bên trái" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "Sử dụng khối từ bên phải trước khối từ bên trái\nSử dụng khối từ bên phải trước bên trái" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "Sử dụng cả hai khối văn bản (cái này trước)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "Sử dụng cả hai khối văn bản (cái này cuối)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "Sử dụng khối bên trái" @@ -10751,15 +10921,15 @@ msgstr "" msgid "Use recycle bin when reverting" msgstr "Dùng thùng tái chế khi quay lui" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "Dùng biểu thức thông thường" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "" @@ -10767,61 +10937,61 @@ msgstr "" msgid "Use system locale for date/time" msgstr "Dùng văn hóa hệ thống cho ngày/tháng" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "Dùng khối văn bản từ '&của tôi'" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "Dùng khối văn bản từ 'của &họ'" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "Dùng khối văn bản từ 'của &tôi' trước 'của họ'" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "Dùng khối văn bản từ 'của tôi' trước 'của họ'\nDùng khối văn bản 'của tôi' rồi 'của họ'" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "Dùng khối văn bản từ 'của tôi'\nDùng khối văn bản 'của tôi'" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "Dùng khối văn bản từ 'của &họ' trước 'của tôi'" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "Dùng khối văn bản từ 'của họ' trước 'của tôi'\nDùng khối văn bản 'của họ' rồi 'của tôi'" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "Dùng khối văn bản từ 'của họ'\nDùng khối văn bản 'của họ'" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "Dùng khối văn bản từ bảng xem bên trái\nDùng khối bên trái" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "Dùng khối văn bản &này" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10829,7 +10999,7 @@ msgid "" "%s" msgstr "Dùng đường dẫn được tìm thấy.\nÁp dụng đường dẫn vào\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10841,19 +11011,19 @@ msgstr "Dùng đường dẫn nguyên thuỷ.\nÁp dụng đường dẫn vào\n msgid "Use this" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "Dùng &toàn bộ tập tin này" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "Dùng toàn bộ &tập tin kia" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." msgstr "" @@ -10869,11 +11039,11 @@ msgstr "" msgid "User Name:" msgstr "" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "Người dùng huỷ bỏ" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10883,11 +11053,11 @@ msgstr "" msgid "User&name:" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "Tên đăng nhập:" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10906,7 +11076,7 @@ msgid "" "/line:" msgstr "" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "Giá trị" @@ -10914,24 +11084,24 @@ msgstr "Giá trị" msgid "Version" msgstr "Phiên bản" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "Version %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "" @@ -10939,11 +11109,11 @@ msgstr "" msgid "Version Information" msgstr "Thông tin phiên bản" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "Phiên bản:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "Có phiên bản" @@ -10955,23 +11125,27 @@ msgstr "" msgid "View" msgstr "Xem" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "Xem bản chỉnh sửa cho đường dẫn trong &trình xem web" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "" @@ -10983,11 +11157,11 @@ msgstr "" msgid "Visit our website" msgstr "Thăm website của chúng tôi" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10998,7 +11172,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "CẢNH BÁO:\nChỉ thay đổi các thiết lập này nếu bạn tuyệt đối chắc chắn về những gì bạn đang làm!\nĐể đặt các giá trị về mặc định, hãy xóa các chữ." -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "Chờ" @@ -11006,7 +11180,7 @@ msgstr "Chờ" msgid "Wait for the script to finish" msgstr "Chờ cho kịch bản hoàn tất" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "" @@ -11014,15 +11188,15 @@ msgstr "" msgid "Walk Be&haviour" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "Cảnh báo" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "Cảnh báo!" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11030,7 +11204,7 @@ msgid "" "Do you really want to continue?" msgstr "" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "" @@ -11038,56 +11212,56 @@ msgstr "" msgid "Western European" msgstr "" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" msgstr "" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "Khi được cho phép, các món được đánh phiên bản liệt kê trong hộp thoại cam kết sẽ tự động được lựa chọn" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "" @@ -11097,15 +11271,15 @@ msgid "" "authentication and/or encryption." msgstr "" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "Khoảng trắng" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "Vị trí cửa sổ" @@ -11113,15 +11287,15 @@ msgstr "Vị trí cửa sổ" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11165,11 +11339,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "" @@ -11177,29 +11351,25 @@ msgstr "" msgid "Working Tree Path:" msgstr "" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "Gói các dòng dài" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "Gói các dòng dài ở biên bên phải của màn xem\nGói các dòng dài" -#. Resource IDs: (73) -msgid "Yes" -msgstr "Vâng" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "Vâng cho tất cả" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "Bạn đã có phiên bản mới nhất cài đặt." @@ -11209,51 +11379,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "Bạn có thể vô hiệu hóa những bộ xử lý Nạp Chồng cụ thể ở đây.\nNhững bộ xử lý sẽ không dùng hết những ô nạp chồng và sẽ cho các phần mở rộng shell cơ hội để hiện nạp chồng" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "Bạn có thể chỉ dán các ảnh với kích thước (%d x %d)!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "Bạn không thể tạo ra nhiều hơn %d thanh công cụ do người dùng định nghĩa!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "Bạn không thể đặt thuộc tính này trên các thư mục, chỉ có thể trên các tập tin!\nNếu bạn muốn đặt nó trên các tập tin trong thư mục,\nbạn phải kích hoạt hộp đánh dấu 'đệ quy'." -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "Bạn đã sửa đổi các thuộc tính mà không lưu chúng trước.\nBạn có muốn lưu chúng bây giờ không?" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11261,67 +11431,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "Bạn chưa nhập vào một con số cho vấn đề!\nBạn có chắc bạn muốn cam kết mà không có số vấn đề?" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "Bạn có thể định nghĩa nhiều nhất %d công cụ." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "Bạn phải điền vào một tin nhắn nhật trình cho phần đệ trình" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "Bạn phải khởi động lại hệ thống để các thay đổi có hiệu lực." -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "Bạn đã chọn một tập tin chưa được đánh phiên bản.\nTập tin sẽ được thêm vào kiểm soát phiên bản khi bạn cam kết." -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "Bạn nên nhập vào một văn bản!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "Bạn nên chọn một ảnh!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "Bạn đã thay đổi bộ biểu tượng từ %s thành %s.\nViệc thay đổi này sẽ không hữu hiệu cho đến khi bạn khởi động lại máy tính hoặc tắt và đăng nhập trở lại!" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11331,7 +11501,7 @@ msgstr "Các thông điệp tường trình bạn đã nhập vào trước đó msgid "Your version is:" msgstr "Phiên bản của bạn là:" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "Phiên bản của bạn là: %d.%d.%d.%d" @@ -11341,10 +11511,10 @@ msgid "Zip File" msgstr "Tập tin nén dạng zip" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "&Thu nhỏ" +msgid "Zoo&m out\t-" +msgstr "&Thu nhỏ\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "Phóng" @@ -11356,80 +11526,80 @@ msgstr "Phóng &to" msgid "Zoom &Out" msgstr "Thu &Nhỏ" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "Phóng 100%" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "Phóng to\nPhóng to" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "Thu Nhỏ\nThu Nhỏ" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "Phóng &to" +msgid "Zoom i&n\t+" +msgstr "Phóng &to\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "Phóng to" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "Thu nhỏ" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "Phóng để vừa" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "Phóng để vừa chiều cao" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "Phóng để vừa chiều rộng" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[Mặc định]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[Chưa được giao]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11443,7 +11613,7 @@ msgstr "_POPUP_" msgid "add \"cherry picked from\"" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" msgstr "đã thêm vào" @@ -11451,7 +11621,7 @@ msgstr "đã thêm vào" msgid "added files" msgstr "các tập tin đã thêm vào" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "một tập tin không tên" @@ -11459,14 +11629,19 @@ msgstr "một tập tin không tên" msgid "and support the developers" msgstr "và hỗ trợ các nhà phát triển" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "tác giả" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "" @@ -11499,30 +11674,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "các cam kết" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "mâu thuẫn" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "đã được sao chép từ\n%s - phần chỉnh sửa %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "ngày" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "đã xóa" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "" @@ -11534,7 +11709,7 @@ msgstr "vật giả" msgid "eMail settings" msgstr "" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11543,16 +11718,16 @@ msgid "" "%s" msgstr "đã xuất\n%s\nsang\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "bên ngoài" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "bỏ qua" @@ -11560,23 +11735,23 @@ msgstr "bỏ qua" msgid "include &untracked" msgstr "" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "chưa hoàn chỉnh" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "món được giữ một cách địa phương" #. Resource IDs: (65535) msgid "keep the file lists in English" -msgstr "" +msgstr "giữ danh sách tập tin bằng tiếng Anh" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11585,7 +11760,7 @@ msgid "" "%s = %ld" msgstr "" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11600,11 +11775,11 @@ msgstr "" msgid "master" msgstr "gốc" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "đã hợp nhất" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "thiếu" @@ -11612,7 +11787,7 @@ msgstr "thiếu" msgid "missing/deleted/replaced" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "đã sửa đổi" @@ -11620,7 +11795,7 @@ msgstr "đã sửa đổi" msgid "modified/copied" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "tháng" @@ -11628,40 +11803,44 @@ msgstr "tháng" msgid "new branch" msgstr "" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "không" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "không có mô tả nào cho lệnh này" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "không có phiên bản" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "bình thường" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "bị cản trở" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "trên %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "điểm ảnh" @@ -11669,11 +11848,11 @@ msgstr "điểm ảnh" msgid "possible or real conflict/obstructed" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "quý của năm" @@ -11681,35 +11860,35 @@ msgstr "quý của năm" msgid "renamed" msgstr "" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "đã thay thế" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "đường dẫn đang quét" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "chuyển sang\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "sang %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "sang %s" @@ -11718,35 +11897,35 @@ msgstr "sang %s" msgid "u&nknown changes" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "tuần" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "năm" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "vâng" diff --git a/Languages/Tortoise_zh_CN.po b/Languages/Tortoise_zh_CN.po index e0c1e9345..67bdc830d 100644 --- a/Languages/Tortoise_zh_CN.po +++ b/Languages/Tortoise_zh_CN.po @@ -20,10 +20,10 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-02 19:43+0000\n" -"Last-Translator: YF \n" +"PO-Revision-Date: 2015-08-02 16:59+0000\n" +"Last-Translator: Sven Strickroth \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/tortoisegit/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +31,7 @@ msgstr "" "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -53,138 +53,138 @@ msgstr "! %d" msgid "# authors shown individually:" msgstr "# 作者单独显示:" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" msgstr "已传输 %.2f MiB" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." msgstr "%1 包含有未预期的对象。" -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." msgstr "%1 包含有错误的路径。" -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." msgstr "%1 包含有错误的结构。" -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." msgstr "%1 存在格式错误。" -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." msgstr "未找到 %1。" -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d!天前" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d!天前" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d!小时前" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d!小时前" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d!分钟前" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d!月前" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d!月前" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d!秒前" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d!秒前" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d!周前" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d!周前" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d!年前" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d!年前" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" msgstr "已选择 %1!d! 个项目" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d!分钟前" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" msgstr "%1!s!\n总计显示 %2!d! 个文件, %3!d! 个子模块和 %4!d! 个文件夹, %5!d! 个项目" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\n大小 %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" msgstr "%1: %2\n要继续执行脚本吗？" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" @@ -192,52 +192,52 @@ msgid "" "Verify that the correct path and file name are given." msgstr "%1\n无法找到该文件，\n请检查输入的路径和文件名是否正确。" -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig 或 %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" msgstr "已传输 %I64d 字节" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" msgstr "已传输 %I64d KiB" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" msgstr "%d 个提交领先于 \"%s\"" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" msgstr "%d个文件已更改" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." -msgstr "%d个文件已删除。" +msgstr "%d个文件已移除。" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." msgstr "%d个文件已还原到 %s。" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" msgstr "选择了 %d 个文件，共有 %d 个文件" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" msgstr "%d 个最活跃的作者各自至少提交 %d 次 (%d %%)" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" @@ -245,78 +245,78 @@ msgid "" "double click to automatically toggle alpha" msgstr "%i%% alpha\n单击以切换 alpha\n双击以自动切换 alpha" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld 分 %ld 秒" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" msgstr "%ld / %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" msgstr "%s - 于版本: %d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [已恢复的]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s，耗用 %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s 要求 Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s，传输速度 %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" msgstr "%s: 工作副本" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\导出 （%d 个） %s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\导出 %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." msgstr "%s\n无法顺利地应用补丁。" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\n您确定要删除它吗？" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" @@ -332,6 +332,10 @@ msgstr "&..." msgid "&3 way merge" msgstr "三路合并(&3)" +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "中止(&A)" + #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." msgstr "关于 TortoiseGitBlame(&A)..." @@ -350,7 +354,7 @@ msgstr "添加(&A)" #. Resource IDs: (17075) msgid "&Add >>" -msgstr "增加(&A) >>" +msgstr "添加(&A) >>" #. Resource IDs: (1505) msgid "&Add Filter" @@ -360,17 +364,17 @@ msgstr "添加过滤器(&A)" msgid "&Add New/Save" msgstr "添加/保存(&A)" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" msgstr "添加(&A)" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" -msgstr "增加或删除按钮(&A)" +msgstr "添加或移除按钮(&A)" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." -msgstr "增加(&A)..." +msgstr "添加(&A)..." #. Resource IDs: (1090, 1093) msgid "&Advanced..." @@ -408,7 +412,7 @@ msgstr "分配(&A)" msgid "&Associate double-click event with:" msgstr "关联双击事件与(&A):" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "自动隐藏(&A)" @@ -424,15 +428,15 @@ msgstr "自动加载 Putty 密钥(&A)" msgid "&Backup original file" msgstr "备份原文件(&B)" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "追溯(&B)" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "追溯变更(&B)" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "追溯版本(&B)" @@ -456,7 +460,7 @@ msgstr "分支(&B):" msgid "&Browse Dir" msgstr "浏览目录(&B)" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" msgstr "浏览版本库(&B)" @@ -492,7 +496,7 @@ msgstr "分类(&C)" msgid "&Choose commands from:" msgstr "选择命令(&C):" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." msgstr "清理(&C)..." @@ -516,7 +520,7 @@ msgstr "关闭窗口(&C)" msgid "&Command:" msgstr "命令(&C):" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "提交(&C)" @@ -524,23 +528,27 @@ msgstr "提交(&C)" msgid "&Commit submodule..." msgstr "提交子模块(&C)..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" msgstr "提交(&C)" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "提交(&C)..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "比较版本差异(&C)" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "紧缩版本树(&C)" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "继续(&C)" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "复制(&C)" @@ -554,17 +562,17 @@ msgstr "复制(&C)\tCtrl+C" #. Resource IDs: (1662) msgid "&Custom" -msgstr "定制(&C)" +msgstr "自定义(&C)" #. Resource IDs: (1269) msgid "&Default" msgstr "默认(&D)" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "删除(&D)" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "删除并保留本地副本(&D)" @@ -572,7 +580,7 @@ msgstr "删除并保留本地副本(&D)" msgid "&Delete Filter" msgstr "删除过滤器(&D)" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "删除远端和本地(&D)" @@ -584,11 +592,11 @@ msgstr "检测已移动或已复制的行(&D)" msgid "&Detect moved or copied lines:" msgstr "检测已移动或已复制的行(&D)：" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" msgstr "比较差异(&D)" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" msgstr "与上一版本比较差异(&D)" @@ -600,7 +608,7 @@ msgstr "目录(&D)" msgid "&Disabled" msgstr "已禁用(&D)" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" msgstr "放弃(&D)" @@ -608,7 +616,7 @@ msgstr "放弃(&D)" msgid "&Do the same for the rest" msgstr "剩下的做同样操作(&D)" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" msgstr "钉住(&D)" @@ -616,11 +624,15 @@ msgstr "钉住(&D)" msgid "&Don't ask me again" msgstr "不再询问(&D)" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "不再显示此消息(&D)" + #. Resource IDs: (1384) msgid "&Down" msgstr "向下(&D)" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "下载(&D)" @@ -628,11 +640,11 @@ msgstr "下载(&D)" msgid "&Edit" msgstr "编辑(&E)" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" msgstr "编辑.git/config(&E)" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "编辑全部(&E)" @@ -640,7 +652,7 @@ msgstr "编辑全部(&E)" msgid "&Edit Filter" msgstr "编辑过滤器(&E)" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "编辑冲突(&E)" @@ -665,10 +677,10 @@ msgid "&Enable edit" msgstr "启用编辑(&E)" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "退出(&E)" +msgid "&Exit\tCtrl+W" +msgstr "退出(&E)\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." msgstr "导出选择项(&E)..." @@ -680,27 +692,27 @@ msgstr "外部(&E)" msgid "&File" msgstr "文件(&F)" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "查找(&F)" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "查找(&F)\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "缩放图像以适应窗口(&F)" +msgid "&Fit images in window\tF" +msgstr "缩放图像以适应窗口(&F)\tF" #. Resource IDs: (1050) msgid "&Fixed drives" msgstr "本地硬盘(&F)" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "浮动(&F)" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "跟踪重命名(&F)" @@ -712,7 +724,7 @@ msgstr "日志信息字体(&F): " msgid "&Font:" msgstr "字体(&F): " -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "强制(&F)" @@ -732,7 +744,7 @@ msgstr "Git风格提交 (--rmdir)(&G)" msgid "&Go to\tCtrl+G" msgstr "跳转(&G)\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "灰化无关的修改路径(&G)" @@ -744,7 +756,7 @@ msgstr "绿色(&G):" msgid "&HEAD" msgstr "HEAD(&H)" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "帮助(&H)" @@ -752,7 +764,7 @@ msgstr "帮助(&H)" msgid "&Help Topics" msgstr "帮助主题(&H)" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "隐藏 (&H)" @@ -760,11 +772,11 @@ msgstr "隐藏 (&H)" msgid "&Icon Set:" msgstr "图标集(&I): " -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "忽略(&I)" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" msgstr "按照名称忽略 %d 项(&I)" @@ -778,14 +790,14 @@ msgid "&Image" msgstr "图片(&I)" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "图片信息(&I)" +msgid "&Image info\tI" +msgstr "图片信息(&I)\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "仅图片(&I)" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "导入(&I)..." @@ -797,7 +809,7 @@ msgstr "初始目录(&I):" msgid "&Initialize submodules (--init)" msgstr "初始化子模块(&I)(--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "安装(&I)" @@ -809,11 +821,11 @@ msgstr "加载时跳转到第一个差异处(&J)" msgid "&Keep CR" msgstr "保持换行符(&K)" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" msgstr "保持当前状态(&K)" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "块状标签(&L)" @@ -841,7 +853,7 @@ msgstr "限制(&L):" msgid "&Line number" msgstr "行号(&L)" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "行号(%d - %d)(&L)" @@ -858,7 +870,7 @@ msgstr "列表视图(&L)" msgid "&Local Branch:" msgstr "本地分支(&L)" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "本地分支(&L)" @@ -882,11 +894,11 @@ msgstr "菜单动画(&M):" msgid "&Menu contents:" msgstr "菜单内容(&M):" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "合并(&M)" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "合并(&M)..." @@ -942,6 +954,10 @@ msgstr "下一个(&N) >" msgid "&Next Page" msgstr "下页(&N)" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "否(&N)" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "无双击事件(&N)" @@ -958,11 +974,11 @@ msgstr "无(&N)" msgid "&Notepad2" msgstr "Notepad2(&N)" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "确定(&O)" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "单页(&O)" @@ -970,19 +986,15 @@ msgstr "单页(&O)" msgid "&Onto" msgstr "到(&O)" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "打开(&O)" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "打开 Git for Windows 网站(&O)" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "打开(&O)..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "打开(&O)...\tCtrl+O" @@ -995,18 +1007,18 @@ msgid "&Overlay Icon:" msgstr "叠加图标(&O)" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "叠加图像(&O)" +msgid "&Overlay images\tO" +msgstr "叠加图像(&O)\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "密码(&P): " -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "粘贴(&P)" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "选取全部(&P)" @@ -1014,7 +1026,7 @@ msgstr "选取全部(&P)" msgid "&Port:" msgstr "端口(&P): " -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "打印预览(&P)" @@ -1022,11 +1034,15 @@ msgstr "打印预览(&P)" msgid "&Print..." msgstr "打印(&P)..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "打印(&P)...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "继续(&P)" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "拉取(&P)" @@ -1034,10 +1050,14 @@ msgstr "拉取(&P)" msgid "&Push all branches" msgstr "推送所有分支(&P)" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "重新提交(&R)" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "变基(&R)" + #. Resource IDs: (1246) msgid "&Recent messages" msgstr "最近信息(&R)" @@ -1050,7 +1070,7 @@ msgstr "递归(&R)" msgid "&Red:" msgstr "红色(&R):" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "重做(&R)" @@ -1066,7 +1086,7 @@ msgstr "刷新(&R)" msgid "&Regular Expression" msgstr "正则表达式(&R)" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "稍后提醒我(&R)" @@ -1074,7 +1094,7 @@ msgstr "稍后提醒我(&R)" msgid "&Remote Branch:" msgstr "远端分支(&R)" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "远端分支(&R)" @@ -1082,7 +1102,7 @@ msgstr "远端分支(&R)" msgid "&Remote:" msgstr "远端(&R)" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "删除(&R)" @@ -1094,7 +1114,7 @@ msgstr "从索引中去掉这个文件(&R)" msgid "&Replace" msgstr "替换(&R)" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" msgstr "版本库浏览器(&R)" @@ -1102,7 +1122,7 @@ msgstr "版本库浏览器(&R)" msgid "&Reset" msgstr "重置(&R)" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "重置工具栏(&R)" @@ -1118,23 +1138,27 @@ msgstr "重置我的使用信息(&R)" msgid "&Reset to Default" msgstr "恢复到默认值(&R)" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" -msgstr "解决冲突(&R)" +msgstr "冲突已解决(&R)" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "恢复(&R)" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "恢复到旧状态(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "重试(&R)" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "还原此版本做出的变更(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "还原这些版本的变更(&R)" @@ -1146,7 +1170,7 @@ msgstr "SSH 客户端(&S): " msgid "&Saturation:" msgstr "饱和度(&S):" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "保存(&S)" @@ -1154,15 +1178,19 @@ msgstr "保存(&S)" msgid "&Save authentication" msgstr "保存认证(&S)" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "图片另存为(&S)..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "保存选中文件的列表到(&S)..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "保存(&S)\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "设置 Git 路径(&S)" @@ -1170,7 +1198,7 @@ msgstr "设置 Git 路径(&S)" msgid "&Set upstream/track remote branch" msgstr "设置上游/跟踪远端分支(&S)" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "设置(&S)" @@ -1190,7 +1218,7 @@ msgstr "显示文本标签(&S)" msgid "&Signing key ID:" msgstr "签名密钥ID(&S):" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "跳过(&S)" @@ -1198,7 +1226,7 @@ msgstr "跳过(&S)" msgid "&Squash" msgstr "并合(&S)" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" msgstr "并合全部(&S)" @@ -1210,7 +1238,7 @@ msgstr "开始(&S)" msgid "&Start Group" msgstr "启动组(&S)" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "贮藏(Stash)(&S)" @@ -1230,7 +1258,7 @@ msgstr "符号视图(&S)" msgid "&Tab size:" msgstr "Tab 宽度(&T):" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "标签显示文档(&T)" @@ -1238,7 +1266,7 @@ msgstr "标签显示文档(&T)" msgid "&Tag" msgstr "标签(&T)" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "标签(&T)" @@ -1274,7 +1302,7 @@ msgstr "工具栏和停靠窗口(&T)" msgid "&Toolbars:" msgstr "工具栏(&T):" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "TortoiseGit(&T)" @@ -1286,7 +1314,11 @@ msgstr "TortoiseGitMerge(&T)" msgid "&Trunk:" msgstr "主干(&T):" -#. Resource IDs: (3845) +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "再试一次(&T)" + +#. Resource IDs: (61506) msgid "&Two Page" msgstr "双页(&T)" @@ -1294,15 +1326,15 @@ msgstr "双页(&T)" msgid "&URL:" msgstr "&URL:" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "撤销(&U)" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" msgstr "标准差异(&U)" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" msgstr "比较标准差异(&U)" @@ -1314,7 +1346,7 @@ msgstr "未知磁盘(&U)" msgid "&Up" msgstr "向上(&U)" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "更新项目至版本(&U)" @@ -1326,11 +1358,11 @@ msgstr "上游(&U):" msgid "&Use auto-completion of file paths and keywords" msgstr "自动完成文件路径和关键词(&U)" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" msgstr "用户名(&U): " -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "查看(&V)" @@ -1338,9 +1370,9 @@ msgstr "查看(&V)" msgid "&View:" msgstr "查看(&V):" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" -msgstr "在提交缺少Signed-off-by时给出警告(&W)" +msgstr "在提交缺少 Signed-off-by 时给出警告(&W)" #. Resource IDs: (1203) msgid "&Whole Project" @@ -1354,6 +1386,10 @@ msgstr "全字匹配(&W)" msgid "&Within file" msgstr "在文件中(&W)" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "是(&Y)" + #. Resource IDs: (1657) msgid "&ignore space change" msgstr "忽略空格变更(&I)" @@ -1362,46 +1398,46 @@ msgstr "忽略空格变更(&I)" msgid "&known changes" msgstr "已知变更(&K)" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit默认)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(从 %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(无修改列表)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(没有行号)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(无值)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(没找到)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(未知)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "-全部-" @@ -1409,13 +1445,14 @@ msgstr "-全部-" msgid "--&all" msgstr "--all(&A)" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1423,7 +1460,7 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" msgstr "版本库根目录中的 .git/config" @@ -1439,7 +1476,7 @@ msgstr ".gitignore 放在文件/文件夹所在的目录" msgid ".gitignore in the repository root" msgstr ".gitignore 放在版本库的根目录" -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" msgstr "版本库根目录中的 .tgitconfig" @@ -1455,31 +1492,31 @@ msgstr "<.....>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<所有分支>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "<本地分支>" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<匿名分支>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "<分隔符>" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "<未命名>" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1488,66 +1525,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit 是一个 Windows 外壳扩展。\n这意味着本程序会集成在 Windows 资源管理器中。\n要使用 TortoiseGit，请打开资源管理器，在任意文件夹中单击鼠标右键，\n在弹出的右键菜单中您可以找到所有的 TortoiseGit 命令。\n更详细的操作方法请阅读手册。" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." msgstr "警告：如果这些分支已经完全并入 HEAD，它将不被选中。" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." msgstr "警告：此操作将删除远端服务器上的所有分支。" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." msgstr "警告：这个分支被没有完全并入 HEAD。" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" msgstr "当前的 HEAD 已分离，您将工作在 (无分支)。\n您要现在就创建一个分支吗？" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" msgstr "您确定要删除全部储藏(stash)吗？" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "应用储藏(stash)失败!!!" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "弹出储藏(stash)失败!!!" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "储藏(stash)失败!!!" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" -msgstr "先前变基目录的 rebase-apply 仍然存在，但是 mbox 提供了\n\n您是否想要" +msgstr "先前的变基目录仍然存在 rebase-apply，但是 mbox 也提供了一份\n\n您是否想要" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "应用储藏(stash)失败，有冲突存在" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "弹出储藏(stash)失败，有冲突存在" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "应用储藏(stash)成功" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "弹出储藏(stash)成功" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "储藏(stash)成功" @@ -1555,7 +1592,7 @@ msgstr "储藏(stash)成功" msgid "" msgstr "<描述>" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "(新修改列表)" @@ -1567,71 +1604,71 @@ msgstr "" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "您输入的标签名称与另一个分支的名称相同。\n这可能引起问题，您应该避免这种情况。" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "此名称的分支已存在。" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." msgstr "合并过程正在进行，因此此提交将变成一个合并提交。若要中止合并，您必须进行一次重置或者强制检出。" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "有新版本可用。请下载最新版本！" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." msgstr "以换行分隔的列表，包含要显示图标覆盖的目录。\n如果您在路径后面加上字符“*”，此路径下的所有文件及子目录也都会显示。" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." msgstr "以换行分隔的列表，列出的目录不显示上下文菜单。\n如果您在路径后面加上字符“*”， 此路径下的所有文件及子目录也都不会显示。\n列表为空时表示所有路径都显示上下文菜单。" -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." msgstr "以换行分隔的列表，列出的目录不显示图标覆盖。\n如果您在路径后面加上字符“*”， 此路径下的所有文件及子目录也都不会显示。\n列表为空时表示所有路径都显示图标覆盖。" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "找不到需要的资源。" -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." msgstr "您输入的分支名称与另一个标签的名称相同。\n这可能引起问题，您应该避免这种情况。" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "此名称的标签已存在。" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." msgstr "用来查看 GNU 差异文件（即补丁文件）的查看器程序。\n如果您没有，也可以使用记事本程序。" -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "放弃(&A)" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "关于(&B)" @@ -1647,11 +1684,11 @@ msgstr "缩短重命名" msgid "Abbreviated size" msgstr "缩写大小" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" msgstr "中止" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" msgstr "中止合并(&M)" @@ -1659,11 +1696,11 @@ msgstr "中止合并(&M)" msgid "Abort Merge" msgstr "中止合并" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." msgstr "中止进行中的合并。" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "关于" @@ -1683,12 +1720,12 @@ msgstr "关于 TortoiseGitMerge" msgid "Accept certificate" msgstr "接受证书" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "存取 %1 被拒绝。" -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "操作" @@ -1696,26 +1733,26 @@ msgstr "操作" msgid "Action log" msgstr "动作记录" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "操作" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "当前任务列表" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "活动文件" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "当窗口存在时不能保存 ActiveX 对象！\n丢弃对 %1 的全部修改?" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "加入" @@ -1723,10 +1760,10 @@ msgstr "加入" msgid "Add &Signed-off-by" msgstr "添加“Signed-off-by”(&S)" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" -msgstr "增加“%s”到目录" +msgstr "添加“%s”到目录" #. Resource IDs: (323) msgid "Add Remote" @@ -1736,15 +1773,15 @@ msgstr "添加远端" msgid "Add \"&Signed-off-by\"" msgstr "添加“Signed-off-by”(&S)" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" msgstr "再添加一个提交？" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" msgstr "根据扩展名指定差异比较程序" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "根据扩展名指定合并程序" @@ -1752,53 +1789,53 @@ msgstr "根据扩展名指定合并程序" msgid "Add new files automatically to Git" msgstr "自动添加新文件到 Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" -msgstr "增加到忽略列表(&I)" +msgstr "添加到忽略列表(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "添加到快速访问工具栏" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." -msgstr "增加..." +msgstr "添加..." #. Resource IDs: (171) msgid "Add/Edit Extension Specific Diff/Merge Program" -msgstr "增加/编辑针对扩展名的差异比较/合并工具" +msgstr "添加/编辑针对扩展名的差异比较/合并工具" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" -msgstr "已增加" +msgstr "已添加" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" "%s\n" "to the ignore list." -msgstr "将选定的文件类型\n%s\n增加到忽略列表。" +msgstr "将选定的文件类型\n%s\n添加到忽略列表。" -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" -msgstr "正在增加" +msgstr "正在添加" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "添加文件到Git版本控制" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "将选定的文件或文件匹配列表加入忽略列表" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "调整系统设置\n设置" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "高级" @@ -1806,43 +1843,43 @@ msgstr "高级" msgid "Advanced Diff/Merge Settings" msgstr "高级差异比较/合并设置" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" msgstr "高级差异比较设置" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "高级合并设置" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "全部" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "所有命令" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "所有文件 (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "所有文件 (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "所有父" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "所有本地分支" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" msgstr "所有引用" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "所有标签" @@ -1850,47 +1887,47 @@ msgstr "所有标签" msgid "All tags only" msgstr "仅全部标签" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" msgstr "这将会丢弃您的全部更改！您确定要重置所有工具栏和菜单吗？" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" msgstr "这将会丢弃您的全部更改！您确定要重置键盘分配吗？" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" msgstr "这将会丢弃您的全部更改！您确定要重置菜单“%s”吗？" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" msgstr "这将会丢弃您的全部更改！您确定要重置工具栏“%s”吗？" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "允许编辑这个视窗\n允许编辑" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" msgstr "允许使用自定义的 Gravatar 网址" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." msgstr "允许创建只有提交信息而没有文件的空提交（即 git commit --allow-empty）。" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." msgstr "已经最新" @@ -1906,11 +1943,11 @@ msgstr "总是推送这个本地分支到选择的远端分支" msgid "Always show long format" msgstr "始终显示长格式" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "始终使用系统区域设置显示时间和日期" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" msgstr "修改" @@ -1918,12 +1955,12 @@ msgstr "修改" msgid "Amend &Last Commit" msgstr "修改上次提交(&L)" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." msgstr "一个替代编辑器，它最好能够支持 *nix 行尾符号。" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1934,7 +1971,7 @@ msgid "" "%mine: the modified file" msgstr "用来比较不同版本间文件差异的外部程序。\n\n您可以指定以下的参数至路径中: \n%base : 基础文件名称\n%mine : 修改过的文件。" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1947,34 +1984,34 @@ msgid "" "%base: the original file without your changes" msgstr "用来解决冲突文件的外部合并程序。\n\n您可以在程序路径中指定以下参数: \n%merged : 发生冲突的文件存放位置\n%theirs : 版本库中存放的文件\n%mine : 您现有的修改过的文件\n%base : 不包含您所做修改的原始文件" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "%1 关联到了一个错误的文件句柄。" -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "发生未知错误。" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "存取 %1 时发生未知错误。" -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" msgstr "在第 %d 行发现不明型态数据！" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "缩写标签" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "添加右侧内容" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "追加这个块到左边" @@ -1986,11 +2023,11 @@ msgstr "应用程序框架菜单:" msgid "Apply &Patch..." msgstr "应用补丁(&P)..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "应用补丁序列..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "应用补丁..." @@ -1998,7 +2035,7 @@ msgstr "应用补丁..." msgid "Apply Patches" msgstr "应用补丁" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" msgstr "从邮箱应用补丁序列" @@ -2006,7 +2043,7 @@ msgstr "从邮箱应用补丁序列" msgid "Apply unified diff" msgstr "应用标准差异文件" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "水绿风格" @@ -2014,39 +2051,39 @@ msgstr "水绿风格" msgid "Arabic" msgstr "阿拉伯语" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" msgstr "其他URL(&U):" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" msgstr "您确定要重置列吗？" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" msgstr "您确定要中止变基过程吗？" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "确定要将有冲突的文件标识为已解决吗？" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "您确定要还原 %d 个项目? 您将丢失上次更新之后的所有变更！" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" msgstr "您确定要保存至 \"%s\" 吗？" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "垂直排列(&V)" +msgid "Arrange &vertical\tV" +msgstr "垂直排列(&V)\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "指派到修改列表“%s”" @@ -2055,11 +2092,11 @@ msgstr "指派到修改列表“%s”" msgid "Assigned to:" msgstr "分配到:" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "假定未变更" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" msgstr "假定有效/未变更" @@ -2071,34 +2108,34 @@ msgstr "假定有效/未变更(TortotiseSVN中的\"Needs-lock\")" msgid "At file &creation" msgstr "在文件创建(&C)" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "在文件创建" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" msgstr "于版本: %d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "这时您只能重命名分支。" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "试图进行不支持的操作。" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "试图存取超过 %1 结尾的部分。" -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "试图读取写入中的 %1。" -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "试图写入读取中的 %1。" @@ -2115,11 +2152,11 @@ msgstr "认证" msgid "Authentication data" msgstr "认证数据" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "作者" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "作者邮件" @@ -2127,7 +2164,7 @@ msgstr "作者邮件" msgid "Author:\t\t\t\tStefan Kueng" msgstr "作者:\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "作者" @@ -2149,11 +2186,11 @@ msgstr "自动CrLf换行符转换" msgid "Auto Crlf:" msgstr "自动CrLf转换:" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "自动隐藏" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "全部自动隐藏" @@ -2161,23 +2198,23 @@ msgstr "全部自动隐藏" msgid "Auto&Crlf" msgstr "自动换行符转化(&C)" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "无冲突时自动关闭窗口" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "如无错误，自动关闭" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "如果没有进一步的选项可用，自动关闭" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" -msgstr "如无合并、增加、删除操作，自动关闭" +msgstr "如无合并、添加或删除操作，自动关闭" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." @@ -2191,7 +2228,7 @@ msgstr "自动加载 Putty 密钥(&K)" msgid "Autoload Putty &Key" msgstr "自动加载 Putty 密钥(&K)" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "自动" @@ -2211,7 +2248,7 @@ msgstr "平均" msgid "B&rowse..." msgstr "浏览(&B)..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "后退" @@ -2223,7 +2260,7 @@ msgstr "背景色" msgid "Baltic" msgstr "Baltic" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "柱状图" @@ -2243,7 +2280,7 @@ msgstr "基础文件:" msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "基于 TortoiseSVN 的 TortoiseIDiff " -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "基本信息" @@ -2255,45 +2292,45 @@ msgstr "文件之间:" msgid "Big5 (Traditional)" msgstr "Big5 (繁体)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "二分定位 - 问题" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "二分定位 - 正常" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "二分定位 - 重置" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "二分定位 - 开始" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "位图\n一种位图" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "黑色风格" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "追溯" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "追溯错误" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "追溯以前的版本" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "列出文件每一行的作者" @@ -2301,26 +2338,30 @@ msgstr "列出文件每一行的作者" msgid "Blend alpha" msgstr "Alpha 混合" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "蓝色风格" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "正文" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." msgstr "同时指定了 /logmsg 和 /logmsgfile！\n两者只能指定其中一个。" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "补丁文件路径与目标路径都必须是绝对路径！" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "底部视图：" @@ -2332,30 +2373,30 @@ msgstr "浏览(&O)..." msgid "Branc&h:" msgstr "分支(&H):" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "分支" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" msgstr "分支 %s 落后于 %s\n%s 将快进到 %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" msgstr "分支 (FF)" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "分支名称" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." msgstr "分支/标签名称不合规定。" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." msgstr "分支/标签名称必须非空且符合规定。" @@ -2367,11 +2408,11 @@ msgstr "分支：" msgid "Bro&wse" msgstr "浏览(&W)" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" msgstr "浏览引用" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" msgstr "查找外部比较差异工具" @@ -2383,7 +2424,7 @@ msgstr "浏览引用" msgid "Browse..." msgstr "浏览..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" msgstr "Bug-ID" @@ -2395,7 +2436,7 @@ msgstr "Bug-ID 表达式(&X):" msgid "Bug-ID/Issue-Nr:" msgstr "问题ID" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" msgstr "Bug-ID" @@ -2411,7 +2452,7 @@ msgstr "Bugtraq 正则表达式测试器 - TortoiseGit" msgid "Button Appearance" msgstr "按钮外观" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "按钮一" @@ -2427,7 +2468,7 @@ msgstr "立即检查(&H)" msgid "C&ommands:" msgstr "命令(&O):" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" msgstr "从版本创建分支/标签(&R)" @@ -2435,11 +2476,11 @@ msgstr "从版本创建分支/标签(&R)" msgid "C&urrent Keys:" msgstr "当前快捷键(&U):" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "剪切(&C)" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" @@ -2455,11 +2496,11 @@ msgstr "计算" msgid "Can double-click in log list to compare with previous revision" msgstr "可以在日志列表中的一个版本上双击，与上一个版本比较" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "不能激活静态 ActiveX 对象。" -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2468,80 +2509,80 @@ msgid "" "%s" msgstr "无法复制 \n%s\n到\n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "不能复制位图图像到剪贴板！" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "不能创建新图像！" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" -msgstr "不能定制菜单！" +msgstr "不能自定义菜单！" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "不能从剪贴板粘贴位图！" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "取消" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "取消\n不退出TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "取消\n不切换视图" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "取消\n保持空文件" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "取消\n首先解决冲突" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "取消\n保持当前文件" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" msgstr "取消\n保持当前设置" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." msgstr "现在不能结合提交。\n请确定您在查看您的当前分支的提交，并且没有应用过滤器。" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." msgstr "不能强制更新当前分支。如果您需要，请使用 reset 命令。" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." msgstr "不能显示追溯。“%s”没有被 git 管理。" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." msgstr "由于文件中采用了不同的换行方式，不能显示其差异。" @@ -2553,7 +2594,7 @@ msgstr "层叠(&D)" msgid "Cascaded context menu" msgstr "右键菜单" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "区分大小写" @@ -2577,33 +2618,33 @@ msgstr "证书验证失败！" msgid "Change log" msgstr "改动日志" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "更改打印机和打印选项\n打印设置" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "更改打印选项\n打印设置" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "更改应用程序的风格\n更改风格" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "更改窗口位置" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "更改窗口大小" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" msgstr "更改类型" @@ -2611,38 +2652,38 @@ msgstr "更改类型" msgid "Changed Files" msgstr "已变更的文件" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "在 %s 和 %s之间已变更的文件" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "从 %s，%s 到 %s，%s 所变更的文件" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "已变更文件: %d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" msgstr "包括添加/删除文件的修改行数" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" -msgstr "每日的修改行数（包括增加/删除的文件）" +msgstr "每日的修改行数（包括添加/删除的文件）" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" msgstr "不包括添加/删除文件的修改行数" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" -msgstr "每日的修改行数（不包括增加/删除的文件）" +msgstr "每日的修改行数（不包括添加/删除的文件）" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "修改列表 %s 已移动" @@ -2651,7 +2692,7 @@ msgstr "修改列表 %s 已移动" msgid "Changes made (double-click on file for diff):" msgstr "变更列表（双击文件查看差异）: " -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "更改应用程序的风格" @@ -2659,7 +2700,7 @@ msgstr "更改应用程序的风格" msgid "Char position where to show a border line in commit text boxes:" msgstr "在提交文本框中要显示边框线的字符位置:" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "检查" @@ -2671,63 +2712,63 @@ msgstr "检查新版本 - TortoiseGit" msgid "Check For Updates..." msgstr "检查更新..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "检查已修改(&F)" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." msgstr "请检查您输入的路径或 URL。" -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" msgstr "选中您希望直接出现在右键菜单而不是 TortoiseGit 子菜单中的菜单项" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" msgstr "选择您想移到扩展右键菜单（按Shift键+左键单击）的项目" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" msgstr "在日志信息中显示相对时间" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" msgstr "选中可在日志信息中使用较简短的日期及时间" #. Resource IDs: (1700) msgid "Check:" -msgstr "检查：" +msgstr "选中：" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "检出" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "检出合并" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "摘取" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "摘取失败" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "摘取选中的版本..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "摘取此提交..." -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "摘取失败！跳过此提交？" @@ -2735,11 +2776,11 @@ msgstr "摘取失败！跳过此提交？" msgid "Chinese" msgstr "中文" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" msgstr "选择版本库" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "按时间顺序颠倒(Git默认)" @@ -2751,78 +2792,78 @@ msgstr "清除" msgid "Clean Type" msgstr "清除类型" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "永久清除" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "清空回收站" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" msgstr "清理过时的远端分支" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" msgstr "清理" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." msgstr "正在清除。" -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" msgstr "清理以下路径失败: \n%s" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" msgstr "清理以下路径成功: \n%s" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "清除" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "清理工具\n清理" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" msgstr "清除%ld个URL，它们存储在%ld个工作副本中" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" msgstr "清除%ld条日志，它们存储在%ld个工作副本中" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" msgstr "清除%ld个用户名/密码、%ld个SSL认证数据及%ld个用户名" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" msgstr "已经清空 %ld 个版本库中缓存的日志" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." msgstr "清除已保存的身份认证。\n您将需要为所有版本库重新输入用户名和密码。" -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "清除存储的 %ld 个对话框的大小和位置数据" @@ -2831,7 +2872,7 @@ msgstr "清除存储的 %ld 个对话框的大小和位置数据" msgid "Click here to go to the website" msgstr "点击这里进入网站" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "点击这里选择一条最近输入过的信息" @@ -2847,17 +2888,17 @@ msgid "" "extension" msgstr "点击“高级设置”可根据不同扩展名指定不同的合并程序" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "点击查看移动文本块的命令\n使用文本块" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "剪贴板" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "克隆" @@ -2865,7 +2906,7 @@ msgstr "克隆" msgid "Clone Existing Repository" msgstr "克隆现存的版本库" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" msgstr "克隆版本库" @@ -2873,49 +2914,49 @@ msgstr "克隆版本库" msgid "Clone into Bare Repo" msgstr "克隆成纯版本库" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "克隆..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "关闭" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "关闭全屏" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "关闭打印预览\n关闭(&C)" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "手动关闭" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "关闭打印预览模式\n取消预览" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "关闭当前文档\n关闭" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "关闭当前窗口并提示保存文件" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "折叠" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2941,7 +2982,7 @@ msgstr "颜色:" msgid "Combine One Mail" msgstr "合并成一个邮件" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "合并到一个提交" @@ -2949,11 +2990,11 @@ msgstr "合并到一个提交" msgid "Comman&ds:" msgstr "命令(&D):" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "命令" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "命令行" @@ -2961,7 +3002,7 @@ msgstr "命令行" msgid "Command Line To Execute:" msgstr "要执行的命令行: " -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "命令失败。" @@ -2969,41 +3010,41 @@ msgstr "命令失败。" msgid "Commands" msgstr "命令" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "提交" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "提交 %s 目前不可见。" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" msgstr "提交 %s 未在“%s”中找到。立即更新子模块？" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "提交日期" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "提交者邮件" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "完成提交" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "提交信息" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "提交消息" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" msgstr "提交者名称" @@ -3011,7 +3052,7 @@ msgstr "提交者名称" msgid "Commit Ordering:" msgstr "对提交的排序方式：" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "提交父工程" @@ -3019,19 +3060,19 @@ msgstr "提交父工程" msgid "Commit to:" msgstr "提交至: " -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "提交..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" msgstr "作者提交次数" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" msgstr "每日提交次数" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" msgstr "提交每%s" @@ -3040,72 +3081,72 @@ msgstr "提交每%s" msgid "Commits each week:" msgstr "每周提交次数: " -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" msgstr "将您所做的更改提交到该版本库" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "提交者邮件" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" "\n" "Are you sure that you want to continue the commit?" -msgstr "提交未版本控制的文件夹不会递归增加它的子项目！\n您可能需要用上下文菜单的“增加...”来递归增加这些文件夹。\n\n您确定要继续提交吗？" +msgstr "提交未版本控制的文件夹不会递归添加它的子项目！\n您可能需要用上下文菜单的“添加...”来递归添加这些文件夹。\n\n您确定要继续提交吗？" #. Resource IDs: (65535) msgid "Common Name:" msgstr "通用名称：" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "比较HEAD版本(&H)" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" msgstr "比较选定的引用" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "比较两个文件" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "比较空白字符" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "与工作副本比较(&W)" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "与基础版本比较(&A)" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "与上一版本比较差异" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "进行差异比较时比较空白字符\n比较空白字符" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "比较此文件与上次提交的版本并列出您所做的更改" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "比较 %s 和 %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "完毕" @@ -3121,7 +3162,7 @@ msgstr "配置源" msgid "Config type:" msgstr "配置类型:" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "配置正则过滤器" @@ -3155,11 +3196,11 @@ msgstr "设置查看 GNU 差异文件（补丁文件）的程序" msgid "Confirm to kill running git process" msgstr "确认终止运行中的 git 进程" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "冲突" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "冲突文件" @@ -3167,15 +3208,15 @@ msgstr "冲突文件" msgid "Conflict resolved" msgstr "冲突已经解决" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "冲突" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "冲突" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" msgstr "冲突: %d" @@ -3188,98 +3229,98 @@ msgstr "右键菜单: " msgid "Context lines for patches" msgstr "补丁的上下文行数" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "继续" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "收缩钉住的窗口" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "转换空格到制表符" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "转换制表符到空格" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "复制(&Y)" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "已复制" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "复制" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" msgstr "复制 %s 到 %s，版本 %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "复制哈希值到剪切板" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "复制工具\n复制" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "复制所有信息到剪贴板" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "复制并更名" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" msgstr "复制日志信息到剪贴板" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" msgstr "复杂日志到剪贴板" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "将路径复制到剪贴板" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" msgstr "复制引用名称" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "复制到剪贴板(&P)" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "将选择的区块复制至剪贴板\n复制" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "复制到剪贴板" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" msgstr "复制: %s 的新名称" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "正在复制 %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." msgstr "正在复制..." @@ -3287,25 +3328,25 @@ msgstr "正在复制..." msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "版权所有 (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "修正" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" msgstr "无法向忽略列表中加入 %s ！" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" msgstr "无法检查新版本！" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" msgstr "无法检查新版本！%s（错误码：0x%08X）" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3313,76 +3354,76 @@ msgid "" "%s" msgstr "不能复制文件！\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "目录已满，无法创建 %1。" -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "无法确定最后提交的版本！" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "不能找到父工程" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" msgstr "无法获得状态！" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "由于已经打开过多的文件，无法打开 %1。" -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "无法打开文件\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." msgstr "%1 是当前目录，无法删除。" -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "无法从忽略列表删除 %s！" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." msgstr "不能重置到第一个提交（第一步）。中止中..." -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." msgstr "不能重置到最后一个提交（第二步）。中止中..." -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "不能重置到原来的HEAD。" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" msgstr "无法获取文件的 URL！\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" msgstr "无法获取 %s 版本的 %s 文件。\n无法进行补丁！" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "不能打开TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" @@ -3390,7 +3431,7 @@ msgid "" "%s" msgstr "不能开始比较程序！\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" @@ -3398,7 +3439,7 @@ msgid "" "%s" msgstr "不能启动外部比较程序！\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" @@ -3406,11 +3447,11 @@ msgid "" "%s" msgstr "不能启动外部合并程序!\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "无法启动打印任务。" -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" @@ -3418,11 +3459,11 @@ msgid "" "%s" msgstr "不能启动文本查看器！\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "无法启动 Putty 助手 (pageant)。" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" msgstr "无法启动线程！" @@ -3430,7 +3471,7 @@ msgstr "无法启动线程！" msgid "Coun&t" msgstr "计数(&T)" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." msgstr "计数：%u个匹配。" @@ -3443,15 +3484,15 @@ msgstr "创建库(Library)(&L)" msgid "Create .gitignore file" msgstr "创建 .gitignore 文件" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "创建分支" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "在这个版本上创建分支..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "创建分支..." @@ -3463,29 +3504,29 @@ msgstr "创建修改列表" msgid "Create New Branch" msgstr "创建新分支" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "创建补丁序列..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "创建标签" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "在这个版本上创建标签..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "创建标签..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "创建一个新文档\n新建" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " @@ -3494,49 +3535,49 @@ msgid "" "history, and would want to send in fixes as patches." msgstr "创建一个历史记录被截断到指定数量的浅克隆（shallow clone）版本库。浅克隆的版本库有许多的限制（您不能“克隆”或“获取”它，也不能为它“获取”或“推送”）。但如果您只是对一个具有着庞大历史记录的大型项目的最近的记录感兴趣，并且只想以补丁文件形式发送修复补丁，它已是足够的。" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "创建补丁文件" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "创建拉取请求(&R)" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." msgstr "在这里创建版本库(&Y)..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "创建" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "创建分支/标签" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "创建一个用于 Git 工作区的“库”文件夹" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "从两个文件的差异创建补丁文件\n创建补丁文件" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" msgstr "在当前地址创建文件数据库" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" msgstr "创建包含有您做出的所有更改的标准差异文件" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." msgstr "正在创建拉取请求..." -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "凭证助手不能为空。" @@ -3548,7 +3589,7 @@ msgstr "凭证助手:" msgid "Credentials" msgstr "凭证" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "剪切(&T)" @@ -3556,7 +3597,7 @@ msgstr "剪切(&T)" msgid "Current" msgstr "当前" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" msgstr "当前分支" @@ -3564,7 +3605,7 @@ msgstr "当前分支" msgid "Current Branch:" msgstr "当前分支:" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" @@ -3576,40 +3617,40 @@ msgstr "当前分支 %s 已经最新\n\n如果您想强制变基（即使当前 msgid "Current version is:" msgstr "当前版本是: " -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" msgstr "当前版本是: %s" #. Resource IDs: (17079) msgid "Cus&tomize..." -msgstr "定制(&T)..." +msgstr "自定义(&T)..." #. Resource IDs: (16963) msgid "Custom" -msgstr "定制" +msgstr "自定义" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" -msgstr "定制" +msgstr "自定义" #. Resource IDs: (17076) msgid "Customize Keyboard" -msgstr "定制键盘" +msgstr "自定义键盘" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "自定义快速访问工具栏" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "自定义快速访问工具栏..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." -msgstr "定制..." +msgstr "自定义..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3623,88 +3664,92 @@ msgstr "Cyrillic" msgid "DCommit Type" msgstr "DCommit 类型" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "后台服务进程" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "日期" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "最后提交日期" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "默认" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "默认菜单" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "默认应用程序菜单。在没有打开文档的时候显示。" +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "日志信息默认限量:" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "默认为UTF-8编码" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "删除" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "删除%d个分支" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "删除%d个远端分支" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "删除%d标签" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "删除本地(&L)" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." msgstr "删除引用..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "删除全部标签" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" msgstr "根据名称删除和忽略 %d 项(&I)" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" msgstr "删除并添加到忽略列表(&I)" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" msgstr "根据扩展名删除和忽略 %d 项(&E)" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "删除分支" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" msgstr "删除分支/标签" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "删除远端分支" @@ -3712,34 +3757,34 @@ msgstr "删除远端分支" msgid "Delete remote tag - TortoiseGit" msgstr "删除远端标签 - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." msgstr "删除在“%s”的远端标签..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "删除远端标签..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "删除子模块" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "删除标签" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "删除现存的分支，或者使用其他名称。" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "删除\n文件被删除" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "已删除" @@ -3747,36 +3792,36 @@ msgstr "已删除" msgid "Deleted merge conflict" msgstr "已删除合并冲突" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" msgstr "将选定的文件或文件匹配列表删除，并且加入忽略列表" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" msgstr "从版本控制树中删除文件/文件夹" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" msgstr "只从版本控制树中删除文件/文件夹，保留本地文件" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" msgstr "删除操作记录文件" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "正在删除" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "正在删除缓存的数据" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "正在删除文件" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." msgstr "删除远端引用..." @@ -3796,7 +3841,7 @@ msgstr "描述" msgid "Describe Strategy" msgstr "描述策略" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "描述" @@ -3804,7 +3849,7 @@ msgstr "描述" msgid "Description:" msgstr "描述: " -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "取消选定修改列表" @@ -3812,33 +3857,33 @@ msgstr "取消选定修改列表" msgid "Destination" msgstr "目标" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "目标磁盘已满。" -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "检测并高光标记出移动过的块" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "检测已有文件在任何提交中已移动和复制的行" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "检测已有文件在涉及文件修改的提交中已移动和复制的行" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "在同一个提交的修改文件中检测移动和复制的行" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "检测文件内移动和复制的行" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3852,11 +3897,15 @@ msgstr "窗口大小及位置" msgid "Dialogs" msgstr "对话框" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" msgstr "差异选项" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" msgstr "比较两个版本差异" @@ -3888,7 +3937,7 @@ msgstr "补丁文件:" msgid "Diff header" msgstr "差异-头" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" msgstr "用于稍后比较差异" @@ -3900,12 +3949,12 @@ msgstr "差异-位置" msgid "Diff removed lines" msgstr "差异-删除的行" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" msgstr "与“%s”比较差异" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" msgstr "与第%d个父节点比较差异" @@ -3918,19 +3967,19 @@ msgstr "比较" msgid "Diffing" msgstr "比较差异" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" msgstr "比较提交差异" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" msgstr "比较工作副本文件与上次提交之间的差异" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" msgstr "比较任意两个版本" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." msgstr "目录..." @@ -3942,26 +3991,26 @@ msgstr "目录: " msgid "Disable sounds" msgstr "禁用音效" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." msgstr "如果您的工作副本非常大并且感觉到卡顿，请禁用此选项。\n浏览本地副本时它会带来较多的磁盘访问。" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "停用检查更新" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" msgstr "已禁用" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "存取 %1 时磁盘已满。" -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" msgstr "分派异常: %1" @@ -3970,44 +4019,52 @@ msgstr "分派异常: %1" msgid "Display &buttons in this order" msgstr "按照此顺序显示按钮(&B)" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "显示完整的页面\n打印预览" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "显示被点选的按钮、菜单或窗口的帮助\n帮助" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "显示当前任务或命令的帮助\n帮助" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "显示如何使用帮助\n帮助" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "显示程序信息、版本号及版权声明\n关于" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "显示提交消息的主题和主体" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" msgstr "不再显示这个警告(如果选择继续)(&N)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" msgstr "不要再显示这个警告消息(如果选择忽略)(&N)" +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "不要自动选中“缺失”文件（已被删除，但仍在索引中存在）" + #. Resource IDs: (1669) msgid "Do not autoselect submodules" msgstr "不自动选择子模块" @@ -4020,54 +4077,71 @@ msgstr "对下述路径，不显示右键菜单:" msgid "Do not use recycle bin" msgstr "不使用回收站" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "您确定要删除 %s吗？" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" msgstr "您确定要删除工具栏“%s”吗？" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." msgstr "您确定要停用 TortoiseGit 的自动检查更新吗？\n\n您可以在 TortoiseGit 设置的“常规”页面中重新启用自动检查更新。" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "您确定要标记选中文件为 assume-valid 吗？" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "您确定要标记选中文件为 skip-worktree（跳过工作树）吗？" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" msgstr "您确定要移动这个文件或文件夹吗？" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" msgstr "您确定要永久删除%d个选择的引用？这个操作不能被恢复！" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "您确定要从索引中移除“%s”吗？" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" msgstr "您确定要删除\"%s\"吗？" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "您确定要从索引中移除选定的 %d 个文件/目录吗？" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "您确定要移除选定的 %d 个文件/目录吗？" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "您真的确定要恢复该副本？您将丢失所有在创建该副本后的变更。" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4075,7 +4149,7 @@ msgid "" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." msgstr "您确定要还原\n%s\n的所有更改并返回到此版本吗？这些更改将被反向合并到您的工作副本。" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" @@ -4083,21 +4157,21 @@ msgid "" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." msgstr "您确定要还原在此版本中对\n%s\n做出的所有更改吗？这些更改将被反向合并到您的工作副本。" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" msgstr "您确定要取消选中文件的 skip-worktree 或者 assume-unchanged 标记吗？" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "您要从新添加的远端获取远端分支吗？" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "您要加载已变更的文件吗？" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4105,21 +4179,21 @@ msgid "" "as resolved?" msgstr "您要标记文件\n%s\n为已解决吗？" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" msgstr "您要恢复这些自动保存的文档吗？" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" msgstr "确定要重新加载文件以反映设置变更吗?\n注意: 所有变更将不会保存！" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "您要查看变更吗？" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "您现在要弹出贮藏(Stash)吗？" @@ -4127,28 +4201,28 @@ msgstr "您现在要弹出贮藏(Stash)吗？" msgid "Document :" msgstr "文档:" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" msgstr "因为未知分支\"%s\"，所以不知道推送内容" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "因为您输入了 URL，所以不知道什么将被推送" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" msgstr "不恢复自动保存文档\n打开曾经保存的版本而不是自动保存的版本" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "不保存\n关闭视图而不保存修改" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4158,11 +4232,11 @@ msgstr "不保存\n重新加载视图而不保存修改" msgid "Don't show the selected items: (press shift key to show them)" msgstr "不显示选定项: (仅在按下 Shift 键时显示)" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "不再显示此信息" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "完成" @@ -4174,7 +4248,7 @@ msgstr "向下" msgid "Download" msgstr "下载" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "通过拖动使此菜单浮动" @@ -4202,6 +4276,10 @@ msgstr "虚拟按钮形式" msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "编辑未选中(&D)" + #. Resource IDs: (65535) msgid "E&xclude paths:" msgstr "排除路径(&X): " @@ -4210,7 +4288,7 @@ msgstr "排除路径(&X): " msgid "E&xit" msgstr "退出(&X)" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "导出(&X)..." @@ -4230,11 +4308,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "东欧" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "编辑" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "编辑全局.gitconfig(&G)" @@ -4250,23 +4328,23 @@ msgstr "编辑 .tgitconfig" msgid "Edit Button Image" msgstr "编辑按钮图片" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "编辑注释" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "编辑作者" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "编辑描述" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" msgstr "编辑根据扩展名的差异比较程序" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "编辑根据扩展名的合并程序" @@ -4278,11 +4356,11 @@ msgstr "编辑全局.git/config(&O)" msgid "Edit global &XDG git/config" msgstr "编辑全局 &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "编辑本地git config" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" msgstr "编辑日志信息" @@ -4302,25 +4380,25 @@ msgstr "编辑/拆分提交" msgid "Effective" msgstr "实际生效" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "代理服务器的名称或 IP 地址" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "椭圆工具\n椭圆" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "Email" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." msgstr "邮件抄送地址和收件人不能同时为空。" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "邮件地址" @@ -4328,7 +4406,7 @@ msgstr "邮件地址" msgid "Empty" msgstr "空" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "启用编辑" @@ -4344,7 +4422,7 @@ msgstr "启用 Gravatar" msgid "Enable drag context menu" msgstr "启用拖放菜单" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" msgstr "使用日志缓存文件 (tortoisegit.data, tortoisegit.index)" @@ -4353,10 +4431,14 @@ msgstr "使用日志缓存文件 (tortoisegit.data, tortoisegit.index)" msgid "Enable log cache" msgstr "使用日志缓存" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" msgstr "在日志对话框启用显示 Gravatar 头像" +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "启用语法高亮" + #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" msgstr "启用的图标覆盖" @@ -4365,35 +4447,35 @@ msgstr "启用的图标覆盖" msgid "Encode" msgstr "编码" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "编码方式" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "存取 %1 时发生硬件 I/O 错误。" -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "存取 %1 时发生锁定错误。" -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "存取 %1 时发生共享错误。" -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "参数错误。" -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "读取 %1 时意外出错。" -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "写入 %1 时意外出错。" @@ -4406,11 +4488,11 @@ msgstr "加密" msgid "End" msgstr "结束" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "行结束符风格" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "扩大窗口到全尺寸" @@ -4418,23 +4500,23 @@ msgstr "扩大窗口到全尺寸" msgid "Enter Log Message" msgstr "输入日志信息" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "输入 URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "请输入一个 GUID。" -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "请输入货币。" -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "请输入日期和(或)时间。" -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "请输入日期。" @@ -4442,33 +4524,33 @@ msgstr "请输入日期。" msgid "Enter a name for the changelist:" msgstr "请输入修改列表的名称: " -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "请输入介于 %1 与 %2 之间的数字。" -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "请输入数字。" -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "请输入正整数。" -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "请输入时间。" -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "请输入介于 %1 与 %2 之间的整数。" -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "请输入介于 0 到 255 之间的整数。" -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "请输入整数。" @@ -4480,7 +4562,7 @@ msgstr "请在下面输入要测试的文件内容：" msgid "Enter log &message:" msgstr "请输入日志信息(&M): " -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "请勿输入超过 %1 个字符。" @@ -4489,43 +4571,43 @@ msgstr "请勿输入超过 %1 个字符。" msgid "Enter the regex string below:" msgstr "请在下面输入正则表达式字符串：" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "全部清除\n全部清除" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "清除选择区\n清除" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "错误" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "重建图标缓存时发生错误！" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" msgstr "“%s”的服务器证书验证出错：" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" msgstr "读写注册表键值 %s 时发生错误\n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "已经最新" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4535,28 +4617,28 @@ msgstr "可执行 (*.exe)|*.exe|命令 (*.com)|*.com|信息 (*.pdf)|*.pdf|批处 msgid "Executable (+x)" msgstr "可执行 (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "已存在" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "退出" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "展开 (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "展开钉住的窗口" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "浏览" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "导出" @@ -4564,36 +4646,36 @@ msgstr "导出" msgid "Export Zip File" msgstr "导出为zip文件" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "导出目录: " -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "导出选择项..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "导出这个版本..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "导出未受版本控制的文件" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "正在导出 %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." msgstr "正在导出..." -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "导出一个版本到一个zip文件" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "扩展名" @@ -4609,7 +4691,7 @@ msgstr "扩展名" msgid "Extern DLL Path:" msgstr "外置 DLL 路径:" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "外部" @@ -4617,101 +4699,101 @@ msgstr "外部" msgid "External Program:" msgstr "外部程序: " -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "渐变" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "失败" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "还原失败" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" msgstr "检出文件“%s”失败" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." msgstr "检出文件“%s”的版本 %s 到“%s”失败。" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." msgstr "连接失败。\n链接可能中断了。" -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "转换 ActiveX 对象失败。" -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "创建空文档失败。" -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "创建对象失败。请确认此应用程序已在系统注册表中。" -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "创建拉取请求失败。" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "获得基础文件失败。" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "获得合并文件失败。" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "启动帮助失败。" -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "启动服务器应用程序失败。" -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "打开文档失败。" -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "执行服务器操作失败。" -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "保存文档失败。" -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" msgstr "设置/删除修改列表“%s”失败" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" msgstr "启动问题跟踪器的 COM 提供者“%s”失败。\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." msgstr "等待 pageant 完成加载密钥失败。" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" msgstr "失败！" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" msgstr "快进式" @@ -4719,62 +4801,62 @@ msgstr "快进式" msgid "Fast Forward o&nly" msgstr "仅快进式(&N)" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" msgstr "快进到%s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "获取(&H)" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "获取" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "获取，然后变基(&B)" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" msgstr "从SVN版本库获取" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" msgstr "从\"%s\"获取" -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "获取，然后变基(&B)" - -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "获取..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." msgstr "正在获取状态..." -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." msgstr "正在获取已变更的文件..." -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." msgstr "正在获取文件..." -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" msgstr "正在获取文件的 %s 版本: " -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "文件" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "文件编码" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "每%s修改次数" @@ -4783,27 +4865,27 @@ msgstr "每%s修改次数" msgid "File changes each week:" msgstr "每周修改次数: " -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "文件差异比较" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "文件没有冲突" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "文件是空" -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "文件列表为空" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "文件补丁" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4815,7 +4897,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "文件大小: \t\t%s (%s)\n宽度: \t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平分辨率:\t%.1f dpi\n垂直分辨率: \t%.1f dpi\n色深: \t\t\t%d 位\n缩放比例: \t\t\t%d%%\"" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4835,7 +4917,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "文件大小:\t\t%s (%s)\n宽度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平分辨率:\t%.1f dpi\n垂直分辨率:\t%.1f dpi\n色深: \t\t\t%d 位\n缩放比例:\t\t\t%d%%\n\n文件大小:\t\t%s (%s)\n宽度:\t\t\t%ld 像素\n高度:\t\t\t\t%ld 像素\n水平分辨率:\t%.1f dpi\n垂直分辨率:\t%.1f dpi\n色深:\t\t\t%d 位\n缩放比例:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4847,7 +4929,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "文件大小:\t\t\t%s (%s)\n宽度:\t\t\t%ld 像素\n高度:\t\t\t\t%ld 像素\n水平分辨率:\t%.1f dpi\n垂直分辨率:\t\t%.1f dpi\n色深:\t\t\t%d 位\n缩放比例:\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4867,7 +4949,7 @@ msgid "" "Zoom:\t\t\t%d%%" msgstr "文件大小:\t\t\t%s (%s)\n宽度:\t\t\t%ld pixel\n高度:\t\t\t%ld pixel\n水平分辨率:\t%.1f dpi\n垂直分辨率:\t\t%.1f dpi\n色深:\t\t\t%d bit\n缩放比例:\t\t\t%d%%\n\n文件大小:\t\t\t%s (%s)\n宽度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平分辨率:\t%.1f dpi\n垂直分辨率:\t\t%.1f dpi\n色深:\t\t\t%d 位\n缩放比例:\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "文件名称" @@ -4875,17 +4957,17 @@ msgstr "文件名称" msgid "Files" msgstr "文件" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "填充工具\n填充" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "可筛选" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "过滤器路径" @@ -4897,11 +4979,11 @@ msgstr "过滤器：" msgid "Filter: " msgstr "过滤器" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "查找" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4911,17 +4993,17 @@ msgstr "查找指定文本\n查找" msgid "Find:" msgstr "查找:" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" msgstr "查找：无法找到文本“%s”" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." msgstr "查找：从底部首次找到。已跃过文档开头。" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." msgstr "查找：从顶部首次找到。已跃过文档末尾。" @@ -4929,23 +5011,23 @@ msgstr "查找：从顶部首次找到。已跃过文档末尾。" msgid "Fingerprints" msgstr "指纹" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "完成" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "变基已完成。" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" msgstr "完成！" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "第一个父节点" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "仅第一个父节点" @@ -4954,18 +5036,18 @@ msgid "First known &bad:" msgstr "第一个问题版本(&B):" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "适合图像高度(&H)" +msgid "Fit image &heights\tH" +msgstr "适合图像高度(&H)\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "适合图像宽度(&W)" +msgid "Fit image &widths\tW" +msgstr "适合图像宽度(&W)\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" msgstr "软驱 (A: B:)" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "文件夹" @@ -4977,38 +5059,34 @@ msgstr "跟随重命名" msgid "Font" msgstr "字体" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "按 F1 键寻求帮助；用 Ctrl+鼠标滚轮横向滚动" -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" msgstr "取消选择“复制/更名时停止”以查看完整的历史列表" -#. Resource IDs: (1521) -msgid "Force" -msgstr "强制" - -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." msgstr "强制创建分支/标签 - 即使已经存在同名分支/标签" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." msgstr "仅在远端引用指向同一个提交为远端跟踪分支时强制推送。\n这可能导致远端仓库丢失提交。请谨慎使用。\n此选项对应 git 选项 --force-with-lease。" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." msgstr "强制推送到选定的远端引用并覆盖它，不进行任何安全检查。\n这可能导致远端仓库丢失不可见的提交。请谨慎使用。\n此选项对应 git 选项 --force。" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." @@ -5026,20 +5104,20 @@ msgstr "前景色" msgid "Format Patch" msgstr "创建补丁" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "创建邮件补丁..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "转发" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "向前 %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5069,11 +5147,11 @@ msgstr "从已修改文件(&M)" msgid "From SVN Repository" msgstr "从SVN版本库" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "从已有文件" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "从已修改文件" @@ -5081,7 +5159,7 @@ msgstr "从已修改文件" msgid "From:" msgstr "起始: " -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "全屏" @@ -5089,7 +5167,7 @@ msgstr "全屏" msgid "Full text search" msgstr "全文搜索" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "全递归" @@ -5097,7 +5175,7 @@ msgstr "全递归" msgid "Further options for the commit dialog are on Dialogs 3 page." msgstr "在“对话框组三”页面有更多有关“提交”对话框的选项。" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5105,24 +5183,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (Simplified)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" msgstr "无法初始化 GDI+！" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ 无法创建位图对象。可能是您的系统内存不足。" -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "GPG 签名该标签，查阅手册了解详细信息" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." msgstr "正在获取信息。请稍候..." -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "正在收集统计信息" @@ -5166,29 +5244,29 @@ msgstr "常规设置::对话框组三" msgid "General::Set Extend Menu Item" msgstr "常规设置::扩展菜单" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" msgstr "获取合并日志" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "正在获取文件 %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "正在获取文件的 %s 版本 %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." msgstr "正在获取信息..." -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." msgstr "正在获取所需信息..." -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" msgstr "正在获取标准差异" @@ -5200,23 +5278,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git命令进度" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git 复制并添加文件到工作区" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" -msgstr "Git 复制并更名版本控制的项目到当前位置" +msgstr "Git 复制并更名受版本控制的项目到当前位置" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git 复制受版本控制的项目到当前位置" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git 导出所有项目到当前位置" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git 导出受版本控制的项目到当前位置" @@ -5224,35 +5302,35 @@ msgstr "Git 导出受版本控制的项目到当前位置" msgid "Git Init" msgstr "Git Init" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Git 安装路径" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" msgstr "Git日志" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" -msgstr "Git 移动并更名版本控制的项目到当前位置" +msgstr "Git 移动并更名受版本控制的项目到当前位置" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git 移动受版本控制的项目到当前位置" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git远端设置" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Git版本列表" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5264,7 +5342,7 @@ msgstr "Git同步" msgid "Git clone - TortoiseGit" msgstr "Git克隆 - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." msgstr "Git 目录没有设置 (见 \"常规\" 设置页面)。" @@ -5272,23 +5350,23 @@ msgstr "Git 目录没有设置 (见 \"常规\" 设置页面)。" msgid "Git for Windows" msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." msgstr "未找到 Git for Windows (https://msysgit.github.io/)。" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" msgstr "在创建版本库时，Git 报告了一个错误！\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Git修订列表，含完整文件历史" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Git修订列表包括文件更名" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" @@ -5309,7 +5387,7 @@ msgstr "Git::凭证" msgid "Git::Remote" msgstr "Git::远端" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "全局" @@ -5321,47 +5399,47 @@ msgstr "跳到" msgid "Go to line" msgstr "跳到行" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "跳到下个冲突处\n下个冲突" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "跳到下个差异处\n下个差异" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "跳到下个内部差异处\n下个差异" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "跳到上个冲突处\n上个冲突" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "跳到上个差异处\n上个差异" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "跳到上个内部差异处\n上个差异" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "跳到行" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "版本树" @@ -5377,11 +5455,11 @@ msgstr "灰色" msgid "Greek" msgstr "Greek" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "分组修改列表" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "隐藏不相关的文件(&I)" @@ -5397,7 +5475,7 @@ msgstr "HEAD" msgid "HEAD:" msgstr "HEAD:" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "硬" @@ -5409,7 +5487,7 @@ msgstr "Hard: 重置工作区和索引（丢弃所有本地变更）" msgid "Hebrew" msgstr "Hebrew" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "帮助" @@ -5419,7 +5497,7 @@ msgstr "键盘帮助" #. Resource IDs: (65535) msgid "Helper:" -msgstr "助手：" +msgstr "助手:" #. Resource IDs: (65535) msgid "Helpers:" @@ -5433,11 +5511,11 @@ msgstr "十六进制" msgid "Hide Menus for unversioned paths" msgstr "对于未版本控制的路径隐藏菜单" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "隐藏补丁<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "隐藏钉住的窗口" @@ -5445,25 +5523,25 @@ msgstr "隐藏钉住的窗口" msgid "Hide the script while running" msgstr "运行时隐藏脚本" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "隐藏未变更" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" msgstr "隐藏引用比较列表中未变更的引用" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" msgstr "隐藏/显示补丁文件列表" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" msgstr "隐藏/显示补丁文件列表" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "示意" @@ -5473,7 +5551,7 @@ msgid "" "toolbar buttons into the menu window." msgstr "提示：选择右键菜单，进入“命令”页，将工具栏按钮拖到菜单窗口中。" -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "家" @@ -5489,7 +5567,7 @@ msgstr "Hook 脚本::问题跟踪器配置" msgid "Hook Scripts::Issue Tracker Integration" msgstr "Hook 脚本::问题跟踪器集成" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" msgstr "Hook 类型" @@ -5505,7 +5583,7 @@ msgstr "包含路径(&I): " msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5513,55 +5591,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5569,15 +5648,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5601,7 +5680,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5609,7 +5688,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5617,7 +5696,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5625,16 +5704,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5645,17 +5724,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5667,7 +5746,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5731,7 +5810,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "图标覆盖" @@ -5743,7 +5822,7 @@ msgstr "图标覆盖::图标集" msgid "Icon Overlays::Overlay Handlers" msgstr "图标覆盖::覆盖处理器" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5753,52 +5832,52 @@ msgstr "图标 (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bm msgid "Icons/Design/Code:\t\tLuebbe Onken" msgstr "图标/设计/程序:\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "相同" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" msgstr "如果选中该项，在“另存为...”或“打开”对话框中不显示覆盖图标和右键菜单。" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." msgstr "如果选中，\"--track\"传给git命令，如果没有选中， \"--no-track\"传给git命令， 否则上面两个参数都不传给git命令(见帮助)。" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" msgstr "如果选中该项，可以在日志列表中的一个版本上双击，将其与上一个版本比较" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." msgstr "如果选中该项，则如果在提交过程中发生错误，“提交”对话框将自动重新\n打开，并保留原有的选择内容和记录日志信息。" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" msgstr "如果选中此项，TortoiseGit 将每周检查是否有新版本可用" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" msgstr "如果选中该项，已从覆盖显示排除的工作副本文件夹仍旧会按照“正常”情况覆盖显示" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." msgstr "如果选中该项，未受版本控制的文件夹中的文件将出现在状态控件中。\n状态控件用于像是“提交”对话框之类的地方。" -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." @@ -5811,16 +5890,16 @@ msgid "" "folder should have a name that ends with '.git')" msgstr "如果您计划在这个文件夹中工作，应不选此项。典型的一个纯版本库仅用于被推送。（根据惯例，一个纯版本库的名称应使用 '.git' 结尾）" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "忽略" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" msgstr "根据扩展名忽略 %d 项(&E)" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "忽略注释" @@ -5832,15 +5911,15 @@ msgstr "忽略文件" msgid "Ignore Type" msgstr "忽略类型" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "忽略所有空白字符" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "忽略空白字符的变化" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "忽略空行" @@ -5848,7 +5927,7 @@ msgstr "忽略空行" msgid "Ignore case cha&nges" msgstr "忽略大小写变更(&N)" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5866,11 +5945,11 @@ msgstr "递归忽略文件或目录" msgid "Ignore line &endings (recommended)" msgstr "忽略行尾符号（推荐）(&E)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "忽略文件结束前的空行" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "忽略空行变更" @@ -5878,29 +5957,29 @@ msgstr "忽略空行变更" msgid "Ignore whitespace" msgstr "忽略空白" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "忽略空白字符变化" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "比较父与其子版本时忽略空白" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "忽略" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "忽略的文件" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "在比较时忽略全部空格变更\n忽略全部空格变更" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5918,24 +5997,24 @@ msgstr "图片与文本(&A)" msgid "Images" msgstr "图片" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "直接子节点，包括文件夹" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "导入" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "导入%s 到 %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "导入 SVN 忽略设置" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "导入SVN忽略..." @@ -5944,16 +6023,16 @@ msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" msgstr "导入 SVN 忽略文件到 .git/info/exclude 文件（文件将被覆盖）" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "正在导入文件 %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "在修改列表中" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "在提交中" @@ -5977,24 +6056,24 @@ msgstr "在分支选择框中包含 FETCH_HEAD" msgid "Include only the following revision range:" msgstr "仅包括下列版本范围:" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." msgstr "错误的文件名。" -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "初始化导入" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." msgstr "已在 %s 初始化空的 Git 版本库。" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "内嵌比较" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "行间差异（智能）" @@ -6006,25 +6085,25 @@ msgstr "行间差异" msgid "Input" msgstr "输入" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "插入剪贴板内容\n粘贴" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "内存不足，无法完成操作。" -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "内部程序错误。" -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "非法货币。" -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" msgstr "无效的修订版本号！" @@ -6032,7 +6111,7 @@ msgstr "无效的修订版本号！" msgid "Issuer:" msgstr "签发者：" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" @@ -6055,7 +6134,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "保持" @@ -6063,11 +6142,11 @@ msgstr "保持" msgid "Keep changelists" msgstr "保持修改列表" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "保留本地文件？" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6081,7 +6160,7 @@ msgstr "键盘" msgid "Keyboard shortcuts:" msgstr "键盘快捷键:" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "键" @@ -6125,19 +6204,39 @@ msgstr "行8" msgid "Language:" msgstr "语言:" -#. Resource IDs: (85) +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "最后 %s 个提交" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "最近 %s 个月" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "最近 %s 周" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "最近 %s 年" + +#. Resource IDs: (1350) msgid "Last Author" msgstr "最后的作者" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "最后的提交" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "最后修改" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" msgstr "最后修改:" @@ -6145,7 +6244,11 @@ msgstr "最后修改:" msgid "Last known &good:" msgstr "最后已知正常版本(&G):" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "上次选择的日期" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" msgstr "调用外部差异比较/合并程序处理冲突" @@ -6153,17 +6256,17 @@ msgstr "调用外部差异比较/合并程序处理冲突" msgid "Least active author:" msgstr "最不活跃作者: " -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "保留冲突\n“冲突”状态将被保留" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "仅留下标记的更改" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " msgstr "左侧查看:" @@ -6171,11 +6274,11 @@ msgstr "左侧查看:" msgid "Left image" msgstr "左侧图片" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "折线图" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6189,12 +6292,12 @@ msgstr "行差异工具栏" msgid "Line differences" msgstr "行差异" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "从%ld移动行" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "行移动到%ld" @@ -6207,26 +6310,26 @@ msgstr "行宽度" msgid "Line:" msgstr "行:" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" msgstr "行号: %*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" -msgstr "增加行数" +msgstr "添加行数" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "删除行数" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "列出帮助主题\n帮助主题" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." @@ -6244,23 +6347,23 @@ msgstr "载入图片" msgid "Load Putty &Key" msgstr "加载Putty密钥(&K)" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "加载变化\n TortoiseGitMerge 中所做的修改将被新加载的内容替换" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "加载变化\n视图中的内容将被更新。" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." msgstr "载入中..." -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "此版本库" @@ -6268,13 +6371,13 @@ msgstr "此版本库" msgid "Local Branch" msgstr "本地分支" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" msgstr "已忽略的本地变更（设置了 valid/unchanged 或者 skip worktree 标记的文件）" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "本地状态" @@ -6282,7 +6385,7 @@ msgstr "本地状态" msgid "Local:" msgstr "本地：" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." @@ -6292,7 +6395,7 @@ msgstr "版本库中选择的版本\n将要保存到的位置。" msgid "Locator Bar" msgstr "定位工具栏" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" msgstr "日志" @@ -6332,12 +6435,12 @@ msgstr "日志信息(显示日志对话框)" msgid "Login:" msgstr "用户名:" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" msgstr "最低显示版本: %ld - 最高显示版本: %ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " @@ -6348,7 +6451,7 @@ msgstr "最低显示版本 %ld - 最高显示版本: %ld - 最新版本: %ld" msgid "Lum" msgstr "亮度" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6360,14 +6463,10 @@ msgstr "Macintosh" msgid "Mail" msgstr "邮件" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "邮件系统 DLL 无效。" -#. Resource IDs: (156) -msgid "Main" -msgstr "主要" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" msgstr "制作纯版本库（没有工作目录）" @@ -6380,47 +6479,47 @@ msgstr "管理(&G)" msgid "Manage" msgstr "管理" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "管理远端" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "标记为已解决" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "标记为解决\n文件状态将被标记成已经被修改" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "标记供比较" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "标记此块" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "标记的更改" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "把一个文件在Git中标记为已解决\n标记为已解决" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "标记为问题版本" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "标记为好版本" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "区分大小写(&C)" @@ -6444,7 +6543,7 @@ msgstr "菜单中首先显示最近使用过的命令(&N)" msgid "Menu" msgstr "菜单" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "菜单栏" @@ -6452,7 +6551,7 @@ msgstr "菜单栏" msgid "Menu s&hadows" msgstr "菜单阴影(&H)" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "合并" @@ -6460,34 +6559,34 @@ msgstr "合并" msgid "Merge &Message" msgstr "合并日志(&M)" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "合并点" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "合并复兴分支" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "合并原分支、工作副本内容，并将分支切换到" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." msgstr "合并到 \"%s\"..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "已合并" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "合并的文件" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "合并其他分支" @@ -6495,22 +6594,22 @@ msgstr "合并其他分支" msgid "Merging" msgstr "合并" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" msgstr "从 %s 合并，版本 %s 至 %s，版本 %s 到 %s，%s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" msgstr "合并指定的不同版本差异或从“起始: ” URL 到“结束: ” URL 之间的差异" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" msgstr "合并版本 %s 于 %s 到 %s，%s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "信息" @@ -6522,7 +6621,7 @@ msgstr "仅仅消息(&Y)" msgid "Message part &expression:" msgstr "信息部分表达式(&E):" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "信息" @@ -6530,11 +6629,11 @@ msgstr "信息" msgid "Min" msgstr "最小" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "现有文件（mine）" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "最小化功能区" @@ -6546,7 +6645,11 @@ msgstr "提交消息的最小字符数:" msgid "Misc" msgstr "其他" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "缺失" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "混合" @@ -6554,35 +6657,35 @@ msgstr "混合" msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed:保持工作区不变，重置索引文件" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "修改日期" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "已修改" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "修改的文件" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "更多" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "更多按钮" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "更多命令..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "更多颜色..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "更多..." @@ -6602,41 +6705,41 @@ msgstr "下移(&D)" msgid "Move &Up" msgstr "上移(&U)" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "下移项目" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "上移项目" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "移动和更名" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "移动到修改列表" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" msgstr "移动/更名" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" msgstr "移动: %s 的新名称" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "在还原前将已经修改的文件移动到回收站" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "正在移动 %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." msgstr "正在移动..." @@ -6644,11 +6747,11 @@ msgstr "正在移动..." msgid "My file:" msgstr "我的文件:" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "数字" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" msgstr "名称" @@ -6660,7 +6763,7 @@ msgstr "名称:" msgid "Navigate" msgstr "导航" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6670,11 +6773,11 @@ msgstr "在视图中跳到特定行\n跳到行" msgid "Navigation Pane Options" msgstr "窗格选项导航" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "窗格选项导航..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "嵌套" @@ -6686,7 +6789,7 @@ msgstr "网络" msgid "Network::Email" msgstr "网络::邮件" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "新增" @@ -6695,43 +6798,43 @@ msgid "New &name:" msgstr "新名称(&N): " #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "创建分支\\标签" +msgid "New Branch/Tag" +msgstr "创建分支/标签" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "新菜单" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "新哈希" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "新消息" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "%s 的新名称" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "新名称不能为空或相同！" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" msgstr "新名称: " -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "新建子模块" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "新的提交时间" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "新行" @@ -6739,33 +6842,29 @@ msgstr "新行" msgid "Next" msgstr "下一个" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "下页\n下页" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "下一冲突" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "下一处差异" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "下一内嵌差异" -#. Resource IDs: (73) -msgid "No" -msgstr "否" - #. Resource IDs: (1481) msgid "No &Fast Forward" msgstr "非 &Fast Forward" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "无合并(&M)" @@ -6777,114 +6876,119 @@ msgstr "不检出" msgid "No Co&mmit" msgstr "不提交(&M)" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "找不到HEAD" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" msgstr "未指定命令！\n\nTortoiseGitProc.exe应该被Windows外壳扩展调用，不应该直接执行！" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" msgstr "没有指定命令值！" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "未发现差异！" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "没有发现差异！子模块可能还没有被更新。立即更新子模块？" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "没有错误信息。" -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "没有发生错误。" -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "合并后没有额外变更" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" msgstr "自上次提交以来没有文件或文件夹被修改。TortoiseGit 不需要进行任何还原！" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "根据当前配置，没有文件显示。\n检查下面的配置项，查看未版本控制的、被忽略的或未修改的文件。\n要查看远端修改，请点击“检查版本库”。" +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "根据当前配置，没有文件显示。\n检查下面的配置项，查看未版本控制的、被忽略的或未修改的文件。" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "在上次提交后没有添加或更改过文件。\nTortoiseGit 在这里不需要做任何事情……" +"the last commit." +msgstr "在上次提交后没有添加或更改过文件。" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "在上次提交后没有添加或更改过文件。\nTortoiseGit 在这里不需要做任何事情……\n要显示未受版本控制的文件吗？" +msgstr "在上次提交后没有添加或更改过文件。\n要显示未受版本控制的文件吗？" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "没有可使用的图表" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." msgstr "没有找到适用于 %s 的图像解码器。" -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "无限制" + +#. Resource IDs: (1375) msgid "No more revisions found." -msgstr "没有找到更多版本" +msgstr "没有找到更多版本。" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "没有上一个版本" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" msgstr "没有找到引用" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "没有要修正的拼写" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" -msgstr "无状态缓存。只有版本控制的文件夹获得图标覆盖，文件不会获得图标覆盖" +msgstr "无状态缓存。只有受版本控制的文件夹获得图标覆盖，文件不会获得图标覆盖" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "没有建议辞典" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." -msgstr "没有找到工作目录" +msgstr "没有找到工作目录。" #. Resource IDs: (65535) msgid "Node size" msgstr "节点大小" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "无" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "正常" @@ -6896,30 +7000,30 @@ msgstr "正常SVN Commit(&S)" msgid "North European" msgstr "北欧" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "未受版本控制的文件" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "不是所有文件已经下载和验证" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." msgstr "没有删除全部的注册表项（或 INI 文件）。" -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." msgstr "内存不足，无法完成操作。" -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "内存不足！\n尝试折叠节点或减少缩放比例\n以减少版本分支图的尺寸。" -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." msgstr "没有生成出补丁。" @@ -6927,7 +7031,7 @@ msgstr "没有生成出补丁。" msgid "Note node" msgstr "注释节点" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " @@ -6946,26 +7050,26 @@ msgstr "注意：此文件夹包含未版本控制的项目" msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" msgstr "注意：这将影响到所有的 Tortoise 客户端，不仅仅是 TortoiseGit！" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "注释" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "不需要变基\n%s 等于 %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "没有必要变基" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "没有可提交的内容" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "告示" @@ -6973,7 +7077,7 @@ msgstr "告示" msgid "Number Commits" msgstr "提交数量" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "%s数" @@ -6986,7 +7090,7 @@ msgstr "作者数量: " msgid "Number of characters required for moved or copied line detection:" msgstr "需要检测的已移动或已复制的字符数:" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "显示在缩写哈希部分的字符数量" @@ -7058,41 +7162,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "确定" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "OLE 初始化失败。请确保 OLE 库是正确的版本。" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007 颜色" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "旧哈希" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "旧消息" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "旧提交时间" @@ -7100,15 +7204,15 @@ msgstr "旧提交时间" msgid "Older lines" msgstr "旧行" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "按照需求" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "发现了自动保存文档。" -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." msgstr "至少还有一个的文件处于冲突状态。" @@ -7120,29 +7224,29 @@ msgstr "仅对当前分支" msgid "Only Local Branches" msgstr "仅本地分支" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "仅合并文件" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "仅文件子节点" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" msgstr "仅可以输入数字（可以用逗号分隔）！" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "仅此项" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "打开" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7152,51 +7256,52 @@ msgstr "打开一个现有的文档\n打开" msgid "Open certificate" msgstr "打开证书" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" msgstr "比较文件或应用差异文件\n打开文件" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "从剪贴板复制" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "打开图像文件..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "打开父文件夹" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "创建补丁文件" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "打开这个文档" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "打开方式..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "打开帮助\n帮助主题" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." msgstr "打开引用浏览器对话框。" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" msgstr "打开库浏览器" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "选项" @@ -7205,30 +7310,30 @@ msgid "Options" msgstr "选项" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "原始大小(&G)" +msgid "Ori&ginal size\tS" +msgstr "原始大小(&G)\tS" #. Resource IDs: (1531) msgid "Origin Name" msgstr "原名称" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "其他任务窗格" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "对方的" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "将推送的变更" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "将推送的提交" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "内存不足。" @@ -7236,7 +7341,7 @@ msgstr "内存不足。" msgid "Output Directory" msgstr "输出目录" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7244,20 +7349,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "覆盖已存在的分支" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "覆盖" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "覆盖工作树变更 (强制)" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "页面设置(&A)..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "第 %u 页" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7268,15 +7377,15 @@ msgstr "第 %u 页\n页面范围 %u-%u\n" msgid "Page :" msgstr "页:" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "窗格 1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "窗格 2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "参数" @@ -7284,25 +7393,25 @@ msgstr "参数" msgid "Parameters:" msgstr "参数:" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "父节点 %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "父节点 %d 不存在" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "父节点1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "父节点2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "父节点" @@ -7314,39 +7423,39 @@ msgstr "部分代码来自于 TortoiseSVN Blame" msgid "Password" msgstr "密码" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" msgstr "密码: " -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "粘贴" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "粘贴近期的信息..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "粘贴文件名列表(&F)" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "粘贴上次提交的消息(&L)" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "粘贴最近提交的消息(&R)..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "粘贴工具\n粘贴" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "粘贴文件名列表" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "粘贴上次提交的信息" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" msgstr "从剪贴板粘帖 svn 路径，它是移动(剪切)或复制操作的结果" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" msgstr "补丁" @@ -7362,32 +7471,32 @@ msgstr "修补选定项目(&S)" msgid "Patch As Attachment" msgstr "补丁作为附件" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" msgstr "修补所有文件" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" msgstr "修补选择的文件" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "补丁文件 (*.diff, *.patch)|*.diff;*.patch|全部 (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" msgstr "正在修补" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" msgstr "修补文件'%s'" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "路径" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "找到了更符合补丁的路径。" @@ -7395,21 +7504,21 @@ msgstr "找到了更符合补丁的路径。" msgid "Path:" msgstr "路径:" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "路径" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "铅笔工具\n铅笔" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "作者比例" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "比例" @@ -7417,24 +7526,24 @@ msgstr "比例" msgid "Personalized Menus and Toolbars" msgstr "个人菜单和工具栏" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "选取" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "摘取提交hash" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "摘取提交&hash" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "摘取提交信息" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "摘取提交消息(&M)" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "摘取 %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7444,56 +7553,56 @@ msgstr "图片 (元文件)\n一张图片" msgid "Picture:" msgstr "图片:" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "图像文件 (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg, *.wmf, *.jpg;*.jpeg;*.png;*.bmp;*.gif|所有文件(*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "图像文件 (*.jpg, *.jpg, *.bmp, *.bmp, *.gif)||*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|所有文件(*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "饼图" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." msgstr "请输入要执行的 Hook 脚本" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." msgstr "请输入要应用 Hook 脚本的路径。" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" msgstr "请选择 Hook 类型" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "请选择分支" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "请选择上游" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" msgstr "请看看忽略的提交" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." msgstr "正在取消，请稍候..." -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." msgstr "正在获取差异，请稍候..." -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." msgstr "请稍候..." @@ -7509,11 +7618,11 @@ msgstr "端口: " msgid "Port:" msgstr "端口:" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" msgstr "Post-Commit Hook" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" msgstr "Post-Push Hook" @@ -7521,23 +7630,23 @@ msgstr "Post-Push Hook" msgid "Pre&v Page" msgstr "上页(&V)" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" msgstr "Pre-Commit Hook" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" msgstr "Pre-Push Hook" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." msgstr "准备提交..." -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "前置右边块" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "前置这个块到左边" @@ -7549,11 +7658,11 @@ msgstr "按下新的快捷键(&N):" msgid "Press &new shortcut key:" msgstr "按下新的快捷键(&N):" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "预览" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "预览打过补丁的文件" @@ -7565,51 +7674,51 @@ msgstr "预览: " msgid "Previous" msgstr "上一个" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "前页\n前页" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "先前版本" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "上一个冲突" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "上一处差异" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "上一内嵌差异" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "打印" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "打印文档\n打印(&P)" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" msgstr "使用当前选项打印当前文档\n快速打印" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "打印当前文档\n打印" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "打印到文件" @@ -7617,7 +7726,7 @@ msgstr "打印到文件" msgid "Printer :" msgstr "打印机:" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "打印机文件 (*.prn)|*.prn|所有文件 (*.*)|*.*||" @@ -7625,11 +7734,11 @@ msgstr "打印机文件 (*.prn)|*.prn|所有文件 (*.*)|*.*||" msgid "Printing" msgstr "打印" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "程序" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "程序文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||" @@ -7637,11 +7746,11 @@ msgstr "程序文件 (*.exe)|*.exe|所有文件 (*.*)|*.*||" msgid "Progress" msgstr "进程" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "项目" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "属性" @@ -7649,7 +7758,7 @@ msgstr "属性" msgid "Property Page" msgstr "属性页面" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "提供者" @@ -7681,15 +7790,15 @@ msgstr "修剪" msgid "Prune (All remotes)" msgstr "修剪 (prune)（所有远端）" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "拉取(Pull)" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." msgstr "拉取要求选择一个本地分支作为当前分支" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "拉取..." @@ -7697,19 +7806,19 @@ msgstr "拉取..." msgid "Pull/Fetch" msgstr "拉取/获取(Pull/Fetch)" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "拉取到的差异" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" msgstr "拉取到的日志" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "推送(&H)" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "推送" @@ -7725,11 +7834,11 @@ msgstr "推送 URL:" msgid "Push notes" msgstr "推送注释" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "推送标签(&G)" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "推送..." @@ -7737,22 +7846,22 @@ msgstr "推送..." msgid "Putty Key:" msgstr "Putty 密钥:" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty 私钥 (*.ppk)|*.ppk|所有文件 (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "结束程序；提示保存文件\n退出" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7770,11 +7879,15 @@ msgstr "内存虚拟磁盘(&A)" msgid "R&eset" msgstr "重置(&E)" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "从索引中恢复这个文件(&E)" + +#. Resource IDs: (20021) msgid "R&evert to this revision" -msgstr "复原到此版本(&E)" +msgstr "还原到此版本(&E)" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "变基" @@ -7782,7 +7895,7 @@ msgstr "变基" msgid "Randomize Sync Dialog startup position" msgstr "“同步”对话框启动位置随机化" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7804,7 +7917,7 @@ msgstr "远端(&M):" msgid "Re&movable drives" msgstr "可移动磁盘(&M)" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "更名(&N)..." @@ -7820,15 +7933,15 @@ msgstr "全部重置(&S)" msgid "Re&store defaults" msgstr "恢复默认值(&S)" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "还原(&V)..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "可达 (Reachable)" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." msgstr "在您卡住之前，请先阅读日常使用指南……" @@ -7836,21 +7949,21 @@ msgstr "在您卡住之前，请先阅读日常使用指南……" msgid "Rebase" msgstr "变基" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." msgstr "变基 \"%s\" 到这..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "变基(rebase)..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" msgstr "变基中... (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "最近的" @@ -7862,21 +7975,21 @@ msgstr "最近文件" msgid "Recently modified lines" msgstr "最近修改的行" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "仅记录" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" msgstr "恢复自动保存文档\n打开自动保存的版本而不是曾经保存的版本" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" msgstr "恢复到变基前的状态" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7890,17 +8003,21 @@ msgstr "递归子模块" msgid "Recursive" msgstr "递归" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" -msgstr "重做上次还原的动作\n重做" +msgstr "重做上次撤销的动作\n重做" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "缩小窗口为图标" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" msgstr "引用" @@ -7908,31 +8025,31 @@ msgstr "引用" msgid "Ref (Click it then go to)" msgstr "引用(点击跳转)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" msgstr "引用列表" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" msgstr "浏览引用" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" msgstr "引用记录" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" msgstr "应用名" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "刷新" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." msgstr "刷新中..." -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "正则过滤器" @@ -7944,7 +8061,7 @@ msgstr "正则过滤器" msgid "Regex:" msgstr "正则：" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7963,7 +8080,7 @@ msgid "" "\\s : whitespaces" msgstr "正则表达式过滤器:\r\n. : 任意字符\r\nc+ : 匹配字符 c 一次或多次\r\nc* : 匹配字符 c 零次或多次\r\n^ : 行首\r\n$ : 行尾\r\n(string){n} : 匹配字符串 n 次\r\n(abcd) : 子表达式\r\n[aei0-9] : 匹配 a，e，i 和 0..9\r\n[^aei0-9] : 除了 a，e，i 和 0..9\r\n\r\n\\w : 匹配 a-z,A-Z,0-9 和 _\r\n\\W : 任意非字母与数字字符\r\n\\d : 数字 0-9\r\n\\s : 空白" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" msgstr "拒绝差异块 '%s'" @@ -7976,7 +8093,7 @@ msgstr "日志中使用相对时间" msgid "Reload" msgstr "重新加载" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -8010,19 +8127,19 @@ msgstr "远端跟踪分支(&T)" msgid "Remote Branch" msgstr "远端分支" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "远端 URL 不能为空。" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "更新远端" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." msgstr "远端名称不能为空。" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "远端状态" @@ -8034,12 +8151,12 @@ msgstr "远端:" msgid "Remove" msgstr "删除" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "删除 %ld 项" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "删除 %s" @@ -8048,7 +8165,7 @@ msgstr "删除 %s" msgid "Remove &all untracked files (-fx)" msgstr "删除所有未被版本控制的文件(-fx)(&A)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "删除分支(&B)" @@ -8056,21 +8173,21 @@ msgstr "删除分支(&B)" msgid "Remove &non-ignored untracked files (-f)" msgstr "删除所有未忽略的未被版本控制的文件(-f)(&N)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" msgstr "比较差异前移除所有注释，以便不显示注释的变更" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "从忽略列表删除(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "从快速访问工具栏移除" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "从修改列表删除" @@ -8082,19 +8199,19 @@ msgstr "删除忽略的文件(-fx)" msgid "Remove untracked directories (-d)" msgstr "删除未被版本控制的目录(-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "从工作副本中移除未受版本控制的文件..." #. Resource IDs: (65535) msgid "Removed" -msgstr "已删除" +msgstr "已移除" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "从修改列表删除" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" @@ -8102,7 +8219,7 @@ msgid "" "from the ignore list." msgstr "已将选定的文件类型\n%s \n从忽略列表删除。" -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "将选定的文件或文件匹配列表从忽略列表删除" @@ -8110,11 +8227,11 @@ msgstr "将选定的文件或文件匹配列表从忽略列表删除" msgid "Rena&me..." msgstr "更名(&M)..." -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "重命名" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "更名 %s" @@ -8123,30 +8240,30 @@ msgstr "更名 %s" msgid "Rename - TortoiseGit" msgstr "重命名 - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" msgstr "重命名“%s”：" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" msgstr "重命名/移动" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" msgstr "重命名版本控制树中的文件/文件夹" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" -msgstr "重复上次动作\n重复" +msgstr "重复上一个动作\n重复" #. Resource IDs: (1512) msgid "Replace &All" msgstr "全部替换(&A)" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8160,12 +8277,12 @@ msgstr "替换为:" msgid "Replace:" msgstr "替换：" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "已替换 %d 个匹配项" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "替换" @@ -8189,11 +8306,11 @@ msgstr "请求拉取" msgid "Requests a username and a password" msgstr "需要用户名和密码" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "解决冲突(&O)..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "重置" @@ -8205,25 +8322,25 @@ msgstr "全部重置(&A)" msgid "Reset Type" msgstr "重置类型" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." msgstr "重置 \"%s\" 到这个版本..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "重置当前分支" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "重置列" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" msgstr "重置当前分支从%s到" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "解决" @@ -8231,126 +8348,122 @@ msgstr "解决" msgid "Resolve Submodule Conflict" msgstr "解决子模块冲突" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "使用“现有”解决有冲突的文件" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "使用“到来”解决有冲突的文件" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "解决" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" msgstr "解决: \n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "解决有冲突的文件" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "重新开始变基" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "恢复" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "恢复默认值" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "提交后恢复" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "还原窗口至一般大小" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" msgstr "已恢复" -#. Resource IDs: (73) -msgid "Retry" -msgstr "重试" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "将在2秒后重试..." -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "还原" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "还原提交" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "还原提交 %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "还原到父版本" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "还原到版本 %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "已还原" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "还原上次更新后的全部变更" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" -msgstr "撤销增加文件到版本控制" +msgstr "撤销添加文件到版本控制" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" msgstr "在TortosieGitMerge中审核补丁" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" msgstr "使用 TortoiseGitMerge 审核/应用一个标准差异文件" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." msgstr "审核/应用单个补丁(&P)..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "版本" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "版本 %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "版本 %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "版本分支图(&G)" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "版本控制文件" @@ -8366,31 +8479,31 @@ msgstr "版本分支图过滤器" msgid "Revision graph" msgstr "版本分支图" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "版本已还原。所有的变更现在已集成到您的工作树。" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" msgstr "版本:" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "回转" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "回退 %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "RTF 格式\n有字体和段落格式的文本" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " msgstr "右侧视图:" @@ -8398,21 +8511,21 @@ msgstr "右侧视图:" msgid "Right image" msgstr "右侧图片" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "行 %d / %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "行 %d-%d / %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "行向下" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "行向上" @@ -8420,11 +8533,11 @@ msgstr "行向上" msgid "S&elect..." msgstr "选择(&E)..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "在一行上显示按钮(&H)" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "在两行上显示按钮(&H)" @@ -8432,15 +8545,23 @@ msgstr "在两行上显示按钮(&H)" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "在功能区下方显示快速访问工具栏(&H)" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "跳过未选中(&K)" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "并合未选中(&Q)" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "统计(&T)" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." msgstr "切换/检出(&W)..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8460,7 +8581,7 @@ msgstr "SMTP 服务器需要身份验证" msgid "SMTP Server:" msgstr "SMTP 服务器:" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP，直连到目标服务器" @@ -8468,11 +8589,11 @@ msgstr "SMTP，直连到目标服务器" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" @@ -8480,19 +8601,19 @@ msgstr "STARTTLS" msgid "SVN Commit Type" msgstr "SVN Commit 类型" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN Fetch" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN Rebase" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN 修订" @@ -8504,15 +8625,15 @@ msgstr "检查换行符(&F):" msgid "Safe Crlf:" msgstr "检查换行符:" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "相同" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "同样的提交时间" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8530,35 +8651,39 @@ msgstr "测试Bugtraq的样本日志消息:正则表达式字符串。\n\n测试 msgid "Sample text:" msgstr "测试例子:" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "保存" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "另存为(&A)..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "另存为(&A)...\tCTrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "另存为" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "另存为底部文件\n您将被询问在何处保存底部文件" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "保存文件" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "保持左边文件到\n您将被询问在何处保存左边文件" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8566,13 +8691,13 @@ msgid "" "%s" msgstr "保存左边文件\n修改将保存到\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "保持右边文件到\n您将被询问在何处保存右边文件" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8580,74 +8705,74 @@ msgid "" "%s" msgstr "保存右边文件\n修改将保存到\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "保存所有\n两侧文件都将保存" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "保存并排除\n保存您的更改，并且使用原内容" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "保存并忽略标记的块\n只保存您手动进行的编辑，标记的块仍保持原样" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "保存并包括\n保存您的更改，并且标记的块被包括在内" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "另存为" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "另存为..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "保存文件\n您将被询问在何处保存底部文件" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" msgstr "是否保存 %1 的变更？" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "保存修改。" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "保存补丁文件" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "保存版本至(&T)..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" msgstr "用一个新名称保存当前文档\n另存为" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "保存当前文档\n保存" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8669,13 +8794,13 @@ msgstr "保存标准差异文件" msgid "Save unified diff since HEAD" msgstr "保存与HEAD差异的标准差异文件" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "保存\n保存文件和冲突标记" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8687,12 +8812,12 @@ msgstr "保存\n修改将保存到\n%s" msgid "Saved Data" msgstr "已保存数据" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." msgstr "保存配置失败（键：“%s”，值：“%s”）。" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "保存注释失败。" @@ -8704,11 +8829,11 @@ msgstr "扫描" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "左卷" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "右卷" @@ -8716,7 +8841,7 @@ msgstr "右卷" msgid "Se&ttings..." msgstr "设置(&T)..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." msgstr "查找日志信息(&L)..." @@ -8728,20 +8853,20 @@ msgstr "向上搜索(&U)" msgid "Search for:" msgstr "查找内容:" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." msgstr "正在搜索更好的路径来应用补丁..." -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "查找错误: %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "选择" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "全选(&A)" @@ -8757,59 +8882,59 @@ msgstr "选择右键菜单(&C):" msgid "Select &window:" msgstr "选择窗口(&W)" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "颜色选择工具\n选择颜色" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "选择文件..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "选择 SSH 用户端程序" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "请选择一个按钮。" -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "请选择一个要获取帮助的对象" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "选择修改列表" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" msgstr "选择比较差异工具" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "选择文件" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "选择要关联此问题跟踪器的文件夹" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." msgstr "请选择要导出至的文件夹。\n您可能需要在进行导出前先创建一个新文件夹。" -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "选择要运行脚本的文件夹" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "选择保存选中文件的文件夹" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" msgstr "选择 Hook 脚本文件" @@ -8817,20 +8942,20 @@ msgstr "选择 Hook 脚本文件" msgid "Select items automatically" msgstr "自动选择项目" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "选择合并工具" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "选择合并目标" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "选择进度窗口在操作后的特性。" -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8842,15 +8967,19 @@ msgid "" "checker used for commit messages." msgstr "选择该项目正在使用的语言。此设置会影响到用于提交消息的拼写检查器。" -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "选择跟踪分支" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" msgstr "选择查看补丁文件工具" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "选择您想另存为的文件" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" @@ -8860,7 +8989,7 @@ msgstr "选择您想另存为的文件\n注意：有未解决的冲突！" msgid "Select/deselect &all" msgstr "全选/取消(&A)" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "选择历史记录" @@ -8868,7 +8997,7 @@ msgstr "选择历史记录" msgid "Send" msgstr "发送" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "发送邮件" @@ -8876,11 +9005,11 @@ msgstr "发送邮件" msgid "Send Mail after create" msgstr "创建后发送邮件" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "发送邮件功能发送失败。" -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "发送邮件..." @@ -8888,19 +9017,19 @@ msgstr "发送邮件..." msgid "Send Patch" msgstr "发送补丁" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "用邮件发送补丁" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "有邮件发送补丁" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "正在发送内容" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." msgstr "发送中..." @@ -8920,28 +9049,28 @@ msgstr "设置作者(&T)" msgid "Set author &date" msgstr "设置作者日期(&D)" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." msgstr "设置该远端为选定本地分支的“pushremote”。" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." msgstr "设置该远端分支为选定本地分支的“pushbranch”。" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." msgstr "正在设置属性..." -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "设置" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "设置 - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "Windows 外壳" @@ -8949,7 +9078,7 @@ msgstr "Windows 外壳" msgid "Shell Extended" msgstr "外壳增强" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" msgstr "图标缓存重建完成！" @@ -8961,7 +9090,7 @@ msgstr "Shift-JIS" msgid "Short &date/time format in log messages" msgstr "日志信息使用短日期/时间格式(&D)" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "缩短属性列表" @@ -8973,7 +9102,7 @@ msgstr "显示" msgid "Show &Accelerator for:" msgstr "显示加速键(&F):" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" msgstr "显示引用记录(&R)" @@ -8981,15 +9110,15 @@ msgstr "显示引用记录(&R)" msgid "Show &Unversioned Files" msgstr "显示未受版本控制的文件(&U)" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "显示整个工程(&W)" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "显示变更(&C)" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" msgstr "显示日志(&L)" @@ -8997,15 +9126,19 @@ msgstr "显示日志(&L)" msgid "Show &log..." msgstr "显示日志(&L)..." +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "选择嵌套引用(&N)" + #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "仅在资源管理器中显示图标覆盖和右键菜单(&O)" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "在功能区上方显示" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "在功能区下方显示" @@ -9013,35 +9146,35 @@ msgstr "在功能区下方显示" msgid "Show Environment Variables" msgstr "显示环境变量" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "显示更少的按钮" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "显示HEAD版本节点" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" msgstr "按照单词显示内迁差异\n识别单词的内嵌差异" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "显示内嵌差异\n内嵌差异" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "显示更多的按钮" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "在功能区上方显示快速访问工具栏" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "在功能区下方显示快速访问工具栏" @@ -9049,11 +9182,11 @@ msgstr "在功能区下方显示快速访问工具栏" msgid "Show Screen&Tips on toolbars" msgstr "在工具栏上显示工具提示(&T)" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "显示空白字符" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "显示鸟瞰图" @@ -9061,7 +9194,7 @@ msgstr "显示鸟瞰图" msgid "Show asterisk log prefix" msgstr "显示星号日志前缀" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" msgstr "在日志对话框中显示星号日志前缀" @@ -9069,11 +9202,11 @@ msgstr "在日志对话框中显示星号日志前缀" msgid "Show author" msgstr "显示作者" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "显示所有包含此提交的分支" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" msgstr "以标准差异格式显示变更(&U)" @@ -9093,15 +9226,15 @@ msgstr "显示时间" msgid "Show describe in log" msgstr "在日志中显示描述" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" msgstr "在日志对话框中显示描述" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "显示目标文件夹" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "显示差异" @@ -9113,11 +9246,15 @@ msgstr "显示和上次提交的差异" msgid "Show excluded folders as normal" msgstr "对排除的文件夹正常显示" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "显示合并后的额外变更" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "在短暂延时后显示全部菜单(&U)" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "显示文件名" @@ -9133,7 +9270,7 @@ msgstr "显示已忽略的文件(&G)" msgid "Show ignore local changes flagged files" msgstr "显示已标记的忽略本地变更的文件" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "仅显示有块状标签的提交(&B)" @@ -9141,90 +9278,90 @@ msgstr "仅显示有块状标签的提交(&B)" msgid "Show linenumber&s" msgstr "显示行号(&S)" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" msgstr "显示日志" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" msgstr "显示重命名和复制之前的日志(&B)" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" msgstr "显示 %s 日志" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" msgstr "显示子模块历史" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" msgstr "显示此文件夹的日志" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." msgstr "显示日志..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" msgstr "即便一个标签已在提交中精确描述，仍然显示长格式" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "显示工作区修改的文件" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "显示选定提交的下一个变更\n显示下一个" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "最旧节点显示在最上方" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "显示或隐藏行差异工具栏\\\n切换行差异工具栏" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "显示或隐藏定位工具栏\n切换定位工具栏" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "显示\\隐藏状态栏\n切换状态栏" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "显示或隐藏状态栏\n切换状态栏" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "显示或隐藏工具栏\n切换工具栏" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "显示原始行号" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "显示选定提交的上一个变更\n显示上一个" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "显示版本属性" @@ -9232,7 +9369,7 @@ msgstr "显示版本属性" msgid "Show shortcut &keys in ScreenTips" msgstr "在屏幕提示中显示快捷键(&K)" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9242,7 +9379,7 @@ msgstr "空白和换行显示为特殊字符\n显示空白" msgid "Show status of subrepositories in parent folders" msgstr "在子仓库的父文件夹中显示状态" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "在ref标签中显示特殊符号" @@ -9254,45 +9391,43 @@ msgstr "显示未修改的文件(&M)" msgid "Show un&versioned files" msgstr "显示未受版本控制的文件(&V)" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" msgstr "显示/隐藏" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" msgstr "正在显示 %1!d! 个引用，已选择 %2!d! 个引用" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" msgstr "正在显示 %ld 个修订版本，从 %s 到 %s - 已选择 %ld 个版本， 已选择 %ld 个文件\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" msgstr "显示图形化的复制/标签/分支" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "不论在版本库中或是在本地端，都显示从上次更新以后有变更的文件" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "显示上次提交后有变更的所有文件。" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "显示关于TortoiseGit的信息" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" msgstr "显示应用日志" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" msgstr "在默认文本编辑器中显示动作记录" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" msgstr "显示选定的文件/文件夹的日志" @@ -9304,7 +9439,7 @@ msgstr "签名(&G)" msgid "Significant contributions by: (see Git repository for a complete list)" msgstr "主要贡献者: (完整列表见 Git 版本库)" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "银色风格" @@ -9312,20 +9447,20 @@ msgstr "银色风格" msgid "Since" msgstr "从" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "大小" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "跳过" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" msgstr "跳过补丁: %s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "跳过工作树" @@ -9333,23 +9468,23 @@ msgstr "跳过工作树" msgid "Skip worktree (\"Locked\" in TortoiseSVN)" msgstr "跳过工作树(TortoiseSVN中的\"Lockes\")" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "跳过" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "跳过缺失的目标项" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "滑动" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "智能制表符" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "软" @@ -9357,13 +9492,13 @@ msgstr "软" msgid "Soft: Leave working tree and index untouched" msgstr "不更改工作区和索引" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "一些文件在 TortoiseGitMerge 外部被更改了。\n您想加载这些更改吗？" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9377,7 +9512,7 @@ msgstr "按照提交数量排序" msgid "Sort tag list in reversed order" msgstr "反向顺序排序标签列表" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." @@ -9387,49 +9522,53 @@ msgstr "设定在最近日志对话框中显示的条目数量。" msgid "Spin1" msgstr "旋转一" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "分割行" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "将当前窗口分割区块\n分割" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" -msgstr "融合" +msgstr "并合" + +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "并合 (下列提交)" -#. Resource IDs: (246) +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "叠加柱状图" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "叠加折线图" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "标准" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" msgstr "开始（快进式）" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "开始摘取" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" msgstr "Start Commit Hook" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "开始变基" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "开始二分定位模式..." @@ -9437,7 +9576,7 @@ msgstr "开始二分定位模式..." msgid "Start registry editor" msgstr "启动注册表编辑器" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "启动一个运行 Git 协议的 Git 服务器" @@ -9449,39 +9588,47 @@ msgstr "贮藏(stash)" msgid "Stash &Message" msgstr "贮藏日志(&M)" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "应用贮藏" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "贮藏列表" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "弹出贮藏" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "保存贮藏" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." msgstr "贮藏操作进行中..." +#. Resource IDs: (2705) +msgid "State" +msgstr "" + #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "静态" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "统计" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "状态" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "状态栏配置" @@ -9493,32 +9640,32 @@ msgstr "操作及状态显示颜色" msgid "Status cache" msgstr "状态缓存" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "状态缓存仅用于一个文件夹，具有完全状态并递归覆盖" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" msgstr "在外部进程中保存状态缓存信息，它能够检测到文件变更，可以递归的显示图标覆盖" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" msgstr "状态缓存仅用于一个文件夹，并不递归覆盖" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "停止二分模式" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." msgstr "存储文件路径供以后右击比较差异。按住Ctrl键删除最后保存的路径。" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "策略" @@ -9526,15 +9673,15 @@ msgstr "策略" msgid "Strip lines starting with \"#\" in commit message" msgstr "条带化以 \"#\" 开头的提交信息" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "风格" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "主题" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" msgstr "主题:" @@ -9542,7 +9689,7 @@ msgstr "主题:" msgid "Submodule" msgstr "子模块" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "更新子模块(&U)..." @@ -9550,7 +9697,7 @@ msgstr "更新子模块(&U)..." msgid "Submodule Add" msgstr "添加子模块" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." msgstr "添加子模块..." @@ -9558,15 +9705,15 @@ msgstr "添加子模块..." msgid "Submodule Diff" msgstr "比较子模块" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "初始化子模块" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "同步子模块" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "更新子模块" @@ -9574,7 +9721,7 @@ msgstr "更新子模块" msgid "Submodule Update Options" msgstr "子模块更新选项" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" @@ -9589,15 +9736,15 @@ msgstr "项目的子模块:" msgid "Submodules" msgstr "子模块" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "成功" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "切换" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" msgstr "切换 %s 到 %s，版本 %s" @@ -9606,43 +9753,43 @@ msgstr "切换 %s 到 %s，版本 %s" msgid "Switch To" msgstr "切换到" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "切换回上一个窗口区块\n上一区块" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "在单区块与双区块查看模式间切换" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" msgstr "在单区块与双区块查看模式间切换\n切换单/双区块模式" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "切换左侧/右侧视图" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "交换左右内容\n左右交换" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "切换至下个文件窗口" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "切换至下个窗口区块\n下个区块" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "切换至上一个文件窗口" @@ -9650,19 +9797,19 @@ msgstr "切换至上一个文件窗口" msgid "Switch/Checkout" msgstr "切换/检出" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" msgstr "切换/检出" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." msgstr "切换/检出到这个..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" msgstr "切换/检出工作副本到另一个分支/标签" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "互换这个比较的左右双方" @@ -9674,23 +9821,23 @@ msgstr "符号化引用名称" msgid "Symlink" msgstr "符号链接" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" msgstr "同步远端版本库，包括拉取、推送、发送补丁等等" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "同步..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "系统" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "系统处于离线模式。检查 Internet Explorer。" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." @@ -9700,11 +9847,11 @@ msgstr "系统注册表及 INI 文件(如果有) 删除完成。" msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" @@ -9720,7 +9867,7 @@ msgstr "制表占位符" msgid "Tab size:" msgstr "Tab 宽度: " -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "标签" @@ -9728,16 +9875,16 @@ msgstr "标签" msgid "Tag (FF)" msgstr "标签 (FF)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "标签信息" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "标记工作副本为 %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "标签" @@ -9745,11 +9892,11 @@ msgstr "标签" msgid "Tags:" msgstr "标签:" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "任务" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "任务窗格" @@ -9761,11 +9908,11 @@ msgstr "临时文件（包括 Gravatar 图像）" msgid "Test" msgstr "测试" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "仅测试" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "文本文件 (*.txt)|*.txt|全部 (*.*)|*.*||" @@ -9773,13 +9920,19 @@ msgstr "文本文件 (*.txt)|*.txt|全部 (*.*)|*.*||" msgid "Thai" msgstr "Thai" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" msgstr "远端配置已更改。\n您想保存还是放弃更改？" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "“最近 xx” 选项应该是数字值。\n应该 > 0" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" @@ -9787,64 +9940,78 @@ msgid "" "Do you really want to delete it?" msgstr "分支“%s”是一个远端分支。\n\n您确定要删除它吗？" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" msgstr "区块大小与加入/删除的行数不符！" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "提交消息不能为空" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "凭证助手 URL “%s”已经存在。您要覆盖它吗？" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" msgstr "凭证助手已经更改。您要保存还是放弃更改？" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" msgstr "当前的工作副本有变更。\n您要储藏(stash)这些变更吗？" -#. Resource IDs: (68) +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "在您打开“日志信息”对话框时，日志信息的默认限量。\n注意：如果要在“日志信息”对话框中显示所有提交，\n您可以右击“从”日期框，然后选择“无限制”选项。" + +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" msgstr "差异比较引擎中止，错误信息：\n%s" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" msgstr "输入的源引用不明确。\n您必须确保目标唯一！您可以添加“refs/heads/”作为分支的前缀，添加“refs/tags/”作为标签的前缀。" -#. Resource IDs: (64) +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "获取的分支在当前分支的基础上进行快进。\n\n合并？或是仍然打开变基对话框？" + +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" msgstr "文件 %s 不存在！" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" msgstr "补丁文件中找不到文件: %s！" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" msgstr "文件“%s“不在您的工作副本中。\n您要选择另一个文件去比较吗？" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" @@ -9853,15 +10020,15 @@ msgid "" "Do you want to remove the file?" msgstr "文件\n%s\n是空的。 是否删除？" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" msgstr "文件过大" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "文件过大，无法打开。" -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" @@ -9869,7 +10036,7 @@ msgid "" "already exists! Do you want to overwrite it?" msgstr "文件\n%s\n已存在！您要覆盖它吗？" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9877,14 +10044,14 @@ msgid "" "is not a valid text file!" msgstr "文件\n%s\n不是一个有效的文本文件！" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" msgstr "文件夹 %s\n中包含了未受版本控制的文件和/或修改过的文件。您要删除它吗？" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" @@ -9893,78 +10060,78 @@ msgid "" "Would you like to create it first?" msgstr "文件夹 \n%s\n不存在。\n是否要先创建？" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" msgstr "Hook 脚本返回了一个错误: \n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "无法显示图片。" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." msgstr "不能创建问题跟踪器提供者。请检查它是否已经正确安装。" -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "问题跟踪器提供者不能验证参数字符串" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" msgstr "新文件的标示行应该位于第 %d 行！" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "行号必须在 %d 至 %d 之间" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." msgstr "本地分支“%s”不能快进到远端分支“%s”。" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "本地和远端分支名称为空。继续吗？" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" msgstr "本地分支/标签名称为空。这将导致一个远端分支/标签被删除。\n继续吗？" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." -msgstr "保存的最大动作记录行数。\n如果新增的行超过此限制，最旧的行会被删除。" +msgstr "最多保存的动作记录行数。\n如果新增的行超过此限制，最旧的行会被删除。" -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." msgstr "操作失败。" -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." msgstr "参数“/path”和“/pathfile”互斥。\n您只能指定其中的一个。" -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" msgstr "补丁文件不能顺利地应用到 %s，并且没有提供版本信息。\n无法完成应用补丁！" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9974,7 +10141,7 @@ msgid "" "do not match!" msgstr "补丁文件似乎已经过期！文件中的\n%s\n行与补丁文件中的\n%s\n行不符合！" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9985,7 +10152,7 @@ msgid "" "Do you want to proceed anyway?" msgstr "输入的 PATH/URL 似乎在 Windows 上非法！\n您可以继续尝试，但可能会出现错误。\n\n正确的 Windows 路径不能包含 “<<>|\"?*:” 或以下设备名: \ncom1-com9，lpt1-lpt9，prn，aux，con，nul，clock$\n\n您想继续尝试吗？" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9996,36 +10163,43 @@ msgid "" "matches it better. Do you want to use the suggested path instead?" msgstr "路径\n%s\n似乎不符合补丁文件中的路径。\n不过 TortoiseGitMerge 找到了更好的路径\n%s。\n您想改为使用建议的路径吗？" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" msgstr "该进程仍在运行中。\n您确定要中止吗？" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "该正则表达式是无效的！\n请输入一个有效的正则表达式。" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" msgstr "远端“%s”已经存在。\n您要覆盖它吗？" -#. Resource IDs: (80) +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "远程分支未变更。\n\n仍然打开编辑对话框？" + +#. Resource IDs: (1267) msgid "The repository was successfully created." msgstr "版本库创建成功。" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" msgstr "选择的文件尚有一个或多个冲突标记。\n您确定要将其标记为已解决吗？" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" @@ -10033,7 +10207,7 @@ msgid "" "Commit the submodule now or ignore dirty changes?" msgstr "子模块\"%s\"不洁净。\n只提交到父工程的变更不能记录或保存到子模块。\n立即提交子模块的修改，或者直接忽略改动？" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" @@ -10042,7 +10216,7 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "目标文件夹\n%s\n是一个特殊文件夹，不应该是一个版本库的根目录！\n您确定要在这个文件夹中初始化一个 git 版本库吗？" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" @@ -10051,26 +10225,26 @@ msgid "" "Are you sure you want to initialize a git repository inside that folder?" msgstr "目标文件夹\n%s\n不是空的！\n您确定要在此文件夹里面创建一个 git 版本库吗？" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "文本是相同的，但文件不匹配。\n发现下列差异：" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." msgstr "对选定文件进行分析的最长时间，单位为秒。\n如果设置过小，自动完成列表会很快显示出来，\n但是可能并没有扫描所有的文件。" -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" msgstr "选择的两个URL不是从相同的来源建立的。\n不能显示它们之间的日志！" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" @@ -10080,34 +10254,34 @@ msgstr "该工作树并不干净，并且含有未暂存的变更。\n审阅并 msgid "Their file:" msgstr "远端文件:" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "远端文件（theirs）" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" msgstr "子模块中包含的目录中有修改或未版本控制的对象。\n那些文件不会在提交列表中列出，您需要单独提交。" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." msgstr "除 Tortoise 所用以外，现在还有 %d 个已安装的图标覆盖。" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "有多个可进行编辑的视图。\n您要保存哪个视图？" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." msgstr "没有可用的问题跟踪器。" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" @@ -10116,85 +10290,85 @@ msgid "" "If you click YES, then you have to manually resolve the conflicts in another editor!" msgstr "%d 行还有尚未处理的冲突！\n请在保存之前先解决它们。\n您确定要在还有冲突时保存文件吗？\n如果您选择“是”，之后必须自行在其他编辑器中处理冲突！" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" msgstr "有未保存的修改！\n您要保存所做的修改吗？" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." msgstr "没有待添加的内容，所有文件和文件夹已在在版本库中或是被全局配置文件忽略。" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" msgstr "知识库" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." msgstr "这里有比当前打开的文档更新的文档，包含了程序关闭前所做的修改。" -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "此栏必填且不能为空。" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." msgstr "无效 URL。\n请输入 URL。" -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "这是一个无效路径！\n正确的路径不能包含“<<>|\"?*:”或以下设备名: \ncom1-com9，lpt1-lpt9，prn，aux，con，nul，clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." msgstr "在日志对话框仍在载入提交时，此操作不能进行。" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "找不到本程序链接的 %s (包含于 %s)，可能 %s 的已安装版本不兼容。" -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "系统中找不到本程序需要的 %s。" -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." msgstr "该属性只能设置在文件夹上，不能在文件上设置。" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "远端名称和其他名称冲突\n请使用其他名称" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." msgstr "这个操作要求一个干净的工作区" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" -msgstr "这将删除您在应用程序中使用的命令记录，恢复到默认菜单和工具栏的可视化命令集合。它不会撤销任何显式的的定制。您确定吗？" +msgstr "这将删除您在应用程序中使用的命令记录，恢复到默认菜单和工具栏的可视化命令集合。它不会撤销任何显式的的自定义。您确定吗？" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" msgstr "三路比较" @@ -10210,14 +10384,14 @@ msgstr "水平堆叠(&Z)" msgid "To" msgstr "至" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" msgstr "如果这不是一个官方的远端，为了避免获取到错误的标签，建议您禁用获取标签选项。\n禁用获取标签吗？" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" @@ -10229,13 +10403,13 @@ msgstr "要清除临时文件，您应该确定没有其他 TortoiseGit 应用 msgid "To:" msgstr "至:" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" msgstr "切换单/双页显示\n切换单/双页显示" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "切换过滤器" @@ -10247,11 +10421,11 @@ msgstr "工具栏" msgid "Toolbar Name" msgstr "工具栏名称" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "工具栏操作" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "工具栏内部错误。请联系您的应用程序销售商。" @@ -10267,16 +10441,16 @@ msgstr "工具" msgid "Tools:" msgstr "工具:" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d，版本 %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10286,20 +10460,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit 检查到文件“%s”不存在，但已标记为“添加”。\n“提交”对话框不能处理它。\n\n您想从索引中删除它吗？" +"Do you want to restore or remove it from the index?" +msgstr "TortoiseGit 检测到文件“%s”不存在，但已标记为“添加”或者“修改”。\n“提交”对话框不能处理它。\n\n您想从索引中恢复或者删除它吗？" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" msgstr "TortoiseGit 检测到类似的文件名。您要同时更名\n文件 %s 吗？" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit 将不会显示下列图标覆盖：%s" @@ -10308,18 +10482,18 @@ msgstr "TortoiseGit 将不会显示下列图标覆盖：%s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." msgstr "TortoiseGitBlame 已经配置成版本库 \"%s\"。不能动态切换到版本库 (\"%s\") 。" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame，版本 %d.%d.%d.%d" @@ -10335,7 +10509,7 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" @@ -10343,7 +10517,7 @@ msgstr "TortoiseGitIDiff" msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" msgstr "TortoiseGitIDiff - 一个图形差异比较工具，包含于 TortoiseGit" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10357,16 +10531,16 @@ 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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10375,18 +10549,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." msgstr "TortoiseGitMerge不能处理这个补丁文件。文件 \"%s\" 出现多次。" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10425,11 +10599,11 @@ msgstr "跟踪" msgid "Tracked Remote Branch:" msgstr "跟踪远端分支:" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "跟踪的分支" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" msgstr "从 %s 开始传输" @@ -10438,39 +10612,35 @@ msgstr "从 %s 开始传输" msgid "Transparent &color..." msgstr "透明色(&C)..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "去掉行尾空格" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." msgstr "试试“清理”。如果无效，您需要重新检出文件。" -#. Resource IDs: (73) -msgid "Try again" -msgstr "再试一次" - #. Resource IDs: (65535) msgid "Turkish" msgstr "Turkish" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "调整 TortoiseGit 设置" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "类型" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" msgstr "类型" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL 和目录不能留空。" @@ -10494,24 +10664,24 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "无法加载邮件系统功能。" -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." msgstr "不能处理命令，服务器忙。" -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "无法读取 %1，该文件已经被其他人打开。" -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "无法读取只写属性。" -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" @@ -10519,91 +10689,95 @@ msgid "" "from the top pane in the log dialog." msgstr "无法重构工作副本路径！\n文件被更名后可能发生这种情况。\n请在该文件上打开“日志”对话框并从对话框上部的\n面板中还原更名操作。" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "无法写入只读属性。" -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "无法写入 %1，它可能是只读或者已被其他人打开。" -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "取消选中" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "撤销" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "撤销 %d 个操作" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "撤销 1 个操作" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." -msgstr "撤销增加..." +msgstr "撤销添加..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "撤消上一次操作\n撤消" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "撤销最后的修改\n撤销" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "预期外的文件格式。" -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "取消 skip-worktree 和 assume-unchanged 标记" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "展开" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "未格式化的文本\n没有任何格式的文本" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" msgstr "与HEAD版本的标准差异(&D)" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "未知" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "未知深度" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "取消此块" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "未解决的冲突！" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "取消跟踪分支" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "未命名" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "未版本控制" @@ -10611,7 +10785,7 @@ msgstr "未版本控制" msgid "Unversioned files mark parent folder as modified" msgstr "如果文件夹包含未版本控制的文件，标识父文件夹为已修改" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "正在将 %s 去除版本控制" @@ -10624,23 +10798,23 @@ msgstr "向上" msgid "Update" msgstr "更新" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" msgstr "显示引用" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "更新子模块" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "更新" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "更新 ActiveX 对象" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "更新索引" @@ -10652,30 +10826,26 @@ msgstr "使用默认图片(&D): " msgid "Use &one-pane view as default for 2-file diff" msgstr "对两个文件进行比较时默认使用单窗口方式(&O)" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "使用其他文本块(&O)" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "使用“现有”文本块" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "先使用“现有”文本块，然后才是“到来”" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "使用“到来”文本块" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "先使用“到来”文本块，然后才是“现有”" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "使用块" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "使用HTTP路径组件" @@ -10696,15 +10866,15 @@ msgstr "使用小包(针对慢速网络连接)(&P)" msgid "Use Unified Diff from &clipboard" msgstr "使用剪贴板上的标准差异(&C)" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." msgstr "使用其他名称，或者使用“强制”选项覆盖已存在的。" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." msgstr "使用其他名称或者使用“覆盖分支”选项。" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10714,7 +10884,7 @@ msgstr "使用左边视图中的全部内容\n使用左边文件" msgid "Use block from left before right" msgstr "从左到右使用块" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10724,25 +10894,25 @@ msgstr "从左到右使用视图中的块\n从左到右使用块" msgid "Use block from right before left" msgstr "从右到左使用块" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "从右到左使用视图中的块\n从右到左使用块" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "使用两个文本块（这个块最前）" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "使用两个文本块（这个块最后）" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "使用配置的服务器" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "使用左边文件块" @@ -10758,15 +10928,15 @@ msgstr "当前分支颜色使用本地分支颜色" msgid "Use recycle bin when reverting" msgstr "在还原时使用回收站" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "使用正则表达式" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "使用右侧内容" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "使用空格" @@ -10774,61 +10944,61 @@ msgstr "使用空格" msgid "Use system locale for date/time" msgstr "对日期/时间使用系统区域" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "使用“现有”文本块(&M)" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "使用“到来”文本块(&T)" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "先使用“现有”文本块(&I)" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "先使用“现有”文本块\n先使用“现有”文本块，然后才是“到来”" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "使用“现有”文本块\n使用“现有”文本块" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "先使用“他们的”文本块(&H)" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "先使用“到来”文本块\n先使用“到来”文本块，然后才是“现有”" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "使用“到来”文本块\n使用“到来”文本块" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "使用左边视图中的文本块\n使用左边的块" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "使用此文本块(&I)" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." -msgstr "使用当前时间设置提交日期之作者日期。" +msgstr "使用当前时间作为作者的提交日期。" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10836,7 +11006,7 @@ msgid "" "%s" msgstr "使用找到的路径。\n应用补丁至\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" @@ -10848,21 +11018,21 @@ msgstr "使用原路径。\n应用补丁至\n%s" msgid "Use this" msgstr "使用这个" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "使用整个文件(&W)" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "将内容添加至左侧" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" msgstr "使用其他文件(&F)" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." -msgstr "用于当前分支修改的提示" +msgstr "覆盖（重写）当前分支的顶点提交（tip）。" #. Resource IDs: (65535) msgid "User Email:" @@ -10876,11 +11046,11 @@ msgstr "用户信息" msgid "User Name:" msgstr "用户名:" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" msgstr "用户操作已取消" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" @@ -10890,11 +11060,11 @@ msgstr "在提交前必须设置用户名和电子邮箱。\n是否现在设置 msgid "User&name:" msgstr "用户名(&N):" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" msgstr "用户名称: " -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10913,7 +11083,7 @@ msgid "" "/line:" msgstr "有效的命令行选项：\n/base: <基础文件的路径>\n/basename: <显示在视图标题的名称>\n/theirs: <远端文件的路径>\n/theirsname: <显示在视图标题的名称>\n/mine: <现有文件的路径>\n/minename: <显示在视图标题的名称>\n/merged: <合并后文件的路径>\n/mergedname: <显示在视图标题的名称>\n/diff: <标准差异文件的路径>\n/patchpath: <目标文件夹路径>\n/saverequired\n/saverequiredonconflicts\n/oneway <强制单向视图>\n/line: <跳转到指定行号>" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "值" @@ -10921,24 +11091,24 @@ msgstr "值" msgid "Version" msgstr "版本" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "版本 %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "版本1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "版本1 (较新提交时间)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "版本2 (基础)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "版本2 (基础) (较新提交时间)" @@ -10946,11 +11116,11 @@ msgstr "版本2 (基础) (较新提交时间)" msgid "Version Information" msgstr "版本信息" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" msgstr "版本:" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "已版本控制" @@ -10962,23 +11132,27 @@ msgstr "Vietnamese" msgid "View" msgstr "视图" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "查看 .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "查看补丁" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "查看补丁>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "在Web浏览器中查看路径的版本(&W)" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "在其他编辑器中查看版本" @@ -10990,11 +11164,11 @@ msgstr "查看系统级 gitconfig(&W)" msgid "Visit our website" msgstr "浏览我们的网站" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -11005,7 +11179,7 @@ msgid "" "To set the values to their default, delete the value text." msgstr "警告：\n仅在您明确知道这些设置的意义时修改它们！\n要恢复值到默认设置，删除值内容即可。" -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "等待" @@ -11013,7 +11187,7 @@ msgstr "等待" msgid "Wait for the script to finish" msgstr "等待脚本运行结束" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "等待输入" @@ -11021,15 +11195,15 @@ msgstr "等待输入" msgid "Walk Be&haviour" msgstr "遍历方法(&H)" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "警告" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" msgstr "警告！" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" @@ -11037,7 +11211,7 @@ msgid "" "Do you really want to continue?" msgstr "警告：“%s”将被永久删除。这个操作不能被恢复！\n\n您确定要继续吗？" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "Web" @@ -11045,56 +11219,56 @@ msgstr "Web" msgid "Western European" msgstr "西欧" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" -msgstr "在激活后，当单击右键时保持 SHIFT 键按下即可将 TortoiseGit 菜单增加到右键菜单" +msgstr "在激活后，当单击右键时保持 SHIFT 键按下即可将 TortoiseGit 菜单添加到右键菜单" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" msgstr "在应用补丁时，如必要，忽略上下文行的空白变更" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" msgstr "当关闭一个正在运行 git 进程的进度对话框时，在关闭前要求确认" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" msgstr "在启用时，在拖放文件/文件夹时将可使用 TortoiseGit 的上下文菜单（即右键菜单）项" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "当启用时，较大的版本号将列为首位。这是因为最近的版本可能更为有用。" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" msgstr "启用时，在“提交”对话框中列出的受版本控制的项目会被自动选择" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." msgstr "当补丁进行非干净的合并失败时，如果补丁记录有 blob 的单元并且我们本地的 blob 可供应用，后退到三路合并。" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." msgstr "如果远端名称为空，在您键入 URL 时，远端名称将自动填充为“origin”，因此这不是您的必填项。" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" msgstr "是否只引用标签，或者所有标签或所有引用" @@ -11104,15 +11278,15 @@ msgid "" "authentication and/or encryption." msgstr "当运行后台服务进程时，该版本库的所有数据都会暴露于外，无须验证身份与加密。" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "空白符的变化（制表符、空格）" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "空白字符" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "窗口位置" @@ -11120,15 +11294,15 @@ msgstr "窗口位置" msgid "Windows" msgstr "窗口" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11172,11 +11346,11 @@ msgstr "Windows-1258" msgid "Within a file:" msgstr "在文件中:" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "在同个文件内" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "工作副本" @@ -11184,29 +11358,25 @@ msgstr "工作副本" msgid "Working Tree Path:" msgstr "工作副本路径:" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "工作目录中的变更" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "长行折行" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "在右边视图边界换行\n换行" -#. Resource IDs: (73) -msgid "Yes" -msgstr "是" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "全部选是" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." msgstr "您已经安装了最新版本。" @@ -11216,51 +11386,51 @@ msgid "" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." msgstr "您可以在这里禁用特定的图标覆盖处理器。\n已禁用的图标覆盖将不会使用覆盖槽，以便允许其他的外壳扩展设置它们的图标覆盖。" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "您只能粘贴尺寸为 %d x %d 的位图！" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "您不能创建多于 %d 个自定义工具栏！" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." msgstr "您不能在文件夹上设置此属性，它只能设置在文件上！\n如果您要为该文件夹中所有文件设置该属性，\n您必须选中“递归”选项。" -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." msgstr "您不能通过重命名更改此引用的类型。" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." msgstr "您已安装的 Git for Windows (https://msysgit.github.io/) 是旧版本，包含有安全问题。\n\n您应该考虑升级到 1.9.5+。" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." msgstr "您选择了“包括未被版本控制的\"。\n这实际包括了调用“git clean -fd”命令，于是已忽略的文件/目录将被直接删除到回收站。" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "您标记了已更改的块。如何决策这些块的保存？" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" msgstr "您有尚未保存的已修改的设置。\n现在要保存吗？" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" @@ -11268,67 +11438,67 @@ msgid "" "Do you really want to show the diff for so many items at once?" msgstr "您选择了 %d 个项目要显示差异。\n这些项目中的每一个都会打开一个差异查看器实例。\n您确定想要一次打开如此多的差异比较程序吗？" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" msgstr "您尚未输入问题编号！\n您确定要就这样提交吗？" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "您还没有输入您的 Signed-Off-By！" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." msgstr "您标记了一些文件为“提交后恢复”。\n您想要现在就恢复吗？这可能丢失这些文件在标记后的所有变更。" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "您可以定义最多 %d 个工具。" -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" msgstr "您必须为提交输入一个日志信息" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." msgstr "您必须重新启动操作系统才能使更改生效。" -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" msgstr "您必须为 zip 文件选择一个文件名！" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "您选择了一个文件夹。\n导出只能是一个(zip)文件。" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." msgstr "您选择了一个未受版本控制的文件。\n该文件将会在您提交时被加入版本控制。" -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "您应该输入一段文本！" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "您应该选择一个图片！" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" msgstr "您已经把图标集从 %s 修改为 %s。\n此更改将在您的计算机重启或您注销后再登录后生效！" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." @@ -11338,7 +11508,7 @@ msgstr "您过去输入过的日志信息已被保存。\n点击这里阅读历 msgid "Your version is:" msgstr "您的版本是: " -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" msgstr "您的版本是: %d.%d.%d.%d" @@ -11348,10 +11518,10 @@ msgid "Zip File" msgstr "Zip 文件" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "缩小(&M)" +msgid "Zoo&m out\t-" +msgstr "缩小(&M)\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "窗口" @@ -11363,80 +11533,80 @@ msgstr "放大(&I)" msgid "Zoom &Out" msgstr "缩小(&O)" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "缩放至原始尺寸" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "放大\n放大" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "缩小\n缩小" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "放大(&N)" +msgid "Zoom i&n\t+" +msgstr "放大(&N)\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "放大" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "缩小" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "缩放至合适大小" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "缩放以适应高度" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "缩放以适应宽度" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[默认]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[未分配]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" msgstr "“%s”包含一个git版本库。它不能作为一个子模块正常工作。\n您想删除 .git 并同时把全部文件加入到上级版本库，还是将它作为独立版本库在子目录中保留它？" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" msgstr "“%s”包含一个 git 子模块。它很可能在拷贝后不能在目的目录正常工作。\n您想删除 .git 并同时添加全部文件到顶层版本库， 还是忽略可能的问题并保留它？" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." msgstr "\"%s\" 无效。" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" msgstr "\"%s\"不是git版本库" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" @@ -11450,15 +11620,15 @@ msgstr "_弹出_" msgid "add \"cherry picked from\"" msgstr "添加“摘取从\"" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" -msgstr "增加" +msgstr "添加" #. Resource IDs: (65535) msgid "added files" -msgstr "增加文件" +msgstr "添加文件" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" msgstr "未命名文件" @@ -11466,14 +11636,19 @@ msgstr "未命名文件" msgid "and support the developers" msgstr "并请支持开发者" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "假定有效" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "作者" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "作者 (>= 0.5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" msgstr "基于 TortoiseSVN (http://www.tortoisesvn.net/)" @@ -11506,30 +11681,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" msgstr "注解" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "冲突" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "复制自 \r\n%s - 版本 %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "天" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "已删除" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "差异来自管道输入" @@ -11541,7 +11716,7 @@ msgstr "虚拟" msgid "eMail settings" msgstr "邮件设置" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11550,16 +11725,16 @@ msgid "" "%s" msgstr "完成导出\n%s\n至\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "外部" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" msgstr "git 未能顺利结束 (退出码 %d)" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "忽略" @@ -11567,15 +11742,15 @@ msgstr "忽略" msgid "include &untracked" msgstr "包括未版本控制的(&U)" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "未完成" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "继承" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "保留本地项目" @@ -11583,7 +11758,7 @@ msgstr "保留本地项目" msgid "keep the file lists in English" msgstr "用英语保存文件列表" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11592,7 +11767,7 @@ msgid "" "%s = %ld" msgstr "行: %d(+) %d(-) 文件: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11607,11 +11782,11 @@ msgstr "行: %d(+) %d(-) 文件: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %l msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "合并" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "缺少" @@ -11619,7 +11794,7 @@ msgstr "缺少" msgid "missing/deleted/replaced" msgstr "丢失/已删除/已替换" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" msgstr "修改" @@ -11627,7 +11802,7 @@ msgstr "修改" msgid "modified/copied" msgstr "修改/复制" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "月" @@ -11635,40 +11810,44 @@ msgstr "月" msgid "new branch" msgstr "新建分支" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "否" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "此命令尚无描述" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "未受版本控制" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "无" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "常规" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "没有找到" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "有障碍" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "在 %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "像素" @@ -11676,11 +11855,11 @@ msgstr "像素" msgid "possible or real conflict/obstructed" msgstr "可能或确实有冲突/有障碍" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "季度" @@ -11688,35 +11867,35 @@ msgstr "季度" msgid "renamed" msgstr "更名" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "已替换" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "扫描路径:" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "跳过工作树" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "切换到\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "关心子模块的变更" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "至 %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "至 %s" @@ -11725,35 +11904,35 @@ msgstr "至 %s" msgid "u&nknown changes" msgstr "未知变更(&N)" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "周" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - 全部Windows用户" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" msgstr "wincred - 当前Windows用户" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" msgstr "wincred - 仅仅本版本库" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" msgstr "winstore - 当前Windows用户" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" msgstr "winstore - 仅仅本版本库" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "年" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "是" diff --git a/Languages/Tortoise_zh_TW.po b/Languages/Tortoise_zh_TW.po index 433e873cf..a2c3d590b 100644 --- a/Languages/Tortoise_zh_TW.po +++ b/Languages/Tortoise_zh_TW.po @@ -15,10 +15,10 @@ msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" -"Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" +"Report-Msgid-Bugs-To: https://tortoisegit.org/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-04-06 14:27+0000\n" -"Last-Translator: ch cooli \n" +"PO-Revision-Date: 2015-08-02 16:59+0000\n" +"Last-Translator: Sven Strickroth \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/tortoisegit/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,7 @@ msgstr "" "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#. Resource IDs: (188) +#. Resource IDs: (3002) # msgid/msgstr fields for Accelerator keys # Format is: "ID:xxxxxx:VACS+X" where: # ID:xxxxx = the menu ID corresponding to the accelerator @@ -46,278 +46,278 @@ msgstr "! %d" #. Resource IDs: (1262) msgid "# authors shown individually:" -msgstr "# 個別顯示作者：" +msgstr "只顯示前 # 個作者：" -#. Resource IDs: (357) +#. Resource IDs: (5702) #, c-format msgid "%.2f MiB transferred" -msgstr "已傳送 %.2f MiB" +msgstr "傳輸了 %.2f MiB" -#. Resource IDs: (3868) +#. Resource IDs: (61878) #, c-format msgid "%1 contained an unexpected object." -msgstr "%1 含有預期之外的物件。" +msgstr "%1 包含未預期的物件。" -#. Resource IDs: (3867) +#. Resource IDs: (61859) #, c-format msgid "%1 contains an incorrect path." -msgstr "%1 含有不正確的路徑。" +msgstr "%1 包含不正確的路徑。" -#. Resource IDs: (3868) +#. Resource IDs: (61879) #, c-format msgid "%1 contains an incorrect schema." -msgstr "%1 含有不正確的綱要。" +msgstr "%1 包含不正確的結構描述。" -#. Resource IDs: (3868) +#. Resource IDs: (61877) #, c-format msgid "%1 has a bad format." -msgstr "%1 格式錯誤。" +msgstr "%1 的格式不正確。" -#. Resource IDs: (3867) +#. Resource IDs: (61858) #, c-format msgid "%1 was not found." -msgstr "找不到 %1。" +msgstr "找不到 %1 。" -#. Resource IDs: (601) +#. Resource IDs: (9611) #, c-format msgid "%1!d! Day ago" msgstr "%1!d!天前" -#. Resource IDs: (601) +#. Resource IDs: (9612) #, c-format msgid "%1!d! Days ago" msgstr "%1!d!天前" -#. Resource IDs: (601) +#. Resource IDs: (9613) #, c-format msgid "%1!d! Hour ago" msgstr "%1!d!小時前" -#. Resource IDs: (601) +#. Resource IDs: (9614) #, c-format msgid "%1!d! Hours ago" msgstr "%1!d!小時前" -#. Resource IDs: (601) +#. Resource IDs: (9615) #, c-format msgid "%1!d! Minute ago" msgstr "%1!d!分鐘前" -#. Resource IDs: (601) +#. Resource IDs: (9607) #, c-format msgid "%1!d! Month ago" msgstr "%1!d!個月前" -#. Resource IDs: (601) +#. Resource IDs: (9608) #, c-format msgid "%1!d! Months ago" msgstr "%1!d!個月前" -#. Resource IDs: (602) +#. Resource IDs: (9617) #, c-format msgid "%1!d! Second ago" msgstr "%1!d!秒前" -#. Resource IDs: (602) +#. Resource IDs: (9618) #, c-format msgid "%1!d! Seconds ago" msgstr "%1!d!秒前" -#. Resource IDs: (601) +#. Resource IDs: (9609) #, c-format msgid "%1!d! Week ago" msgstr "%1!d!星期前" -#. Resource IDs: (601) +#. Resource IDs: (9610) #, c-format msgid "%1!d! Weeks ago" msgstr "%1!d!星期前" -#. Resource IDs: (601) +#. Resource IDs: (9605) #, c-format msgid "%1!d! Year ago" msgstr "%1!d!年前" -#. Resource IDs: (601) +#. Resource IDs: (9606) #, c-format msgid "%1!d! Years ago" msgstr "%1!d!年前" -#. Resource IDs: (90) +#. Resource IDs: (1436) #, c-format msgid "%1!d! items selected" -msgstr "%1!d! 項目已選取" +msgstr "已選取 %1!d! 項目" -#. Resource IDs: (602) +#. Resource IDs: (9616) #, c-format msgid "%1!d! minutes ago" msgstr "%1!d!分鐘前" -#. Resource IDs: (90) +#. Resource IDs: (1434) #, c-format msgid "%1!s!" msgstr "%1!s!" -#. Resource IDs: (90) +#. Resource IDs: (1432) #, c-format msgid "" "%1!s!\r\n" "Showing %2!d! files, %3!d! submodules and %4!d! folders, %5!d! items in total" -msgstr "%1!s!\n顯示 %2!d! 檔案, %3!d! 子模組 及 %4!d! 資料夾, 總共 %5!d! 項目" +msgstr "%1!s!\n顯示 %2!d! 檔案，%3!d! 子模組，%4!d! 資料夾，總共 %5!d! 項目" -#. Resource IDs: (90) +#. Resource IDs: (1435) #, c-format msgid "" "%1!s!\r\n" "Size %2!s!" msgstr "%1!s!\n大小 %2!s!" -#. Resource IDs: (3860) +#. Resource IDs: (61744) #, c-format msgid "" "%1: %2\n" "Continue running script?" -msgstr "%1: %2\n要繼續執行？" +msgstr "%1: %2\n要繼續執行指令碼嗎?" -#. Resource IDs: (3859) +#. Resource IDs: (61729) #, c-format msgid "" "%1\n" "Cannot find this file.\n" "Verify that the correct path and file name are given." -msgstr "%1\n找不到這個檔案。\n請確定輸入了正確的路徑和檔案名稱。" +msgstr "%1找不到這個檔案。\n請確認指定的路徑和檔名是否正確。" -#. Resource IDs: (91) +#. Resource IDs: (1446) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" msgstr "%HOME%/.gitconfig 或 %XDGHOME%/git/config" -#. Resource IDs: (357) +#. Resource IDs: (5704) #, c-format msgid "%I64d Bytes transferred" -msgstr "傳輸了 %I64d k位元組" +msgstr "傳輸了 %I64d 位元組" -#. Resource IDs: (357) +#. Resource IDs: (5701) #, c-format msgid "%I64d KiB transferred" -msgstr "已傳送 %I64d MiB" +msgstr "傳輸了 %I64d KiB" -#. Resource IDs: (75) +#. Resource IDs: (1191) #, c-format msgid "%d commits ahead \"%s\"" -msgstr "%d 個版本在前面 \"%s\"" +msgstr "%d 個版本領先「%s」" -#. Resource IDs: (1256) +#. Resource IDs: (20083) #, c-format msgid "%d files changed" -msgstr "%d 個檔案已修改" +msgstr "修改了 %d 個檔案" -#. Resource IDs: (65) +#. Resource IDs: (1033) #, c-format msgid "%d files removed." -msgstr "%d 個檔案已移除." +msgstr "移除了 %d 個檔案。" -#. Resource IDs: (69) +#. Resource IDs: (1096) #, c-format msgid "%d files reverted to %s." -msgstr "%d 個檔案已還原到 %s." +msgstr "復原了 %d 個檔案到 %s。" -#. Resource IDs: (169) +#. Resource IDs: (2701) #, c-format msgid "%d files selected, %d files total" -msgstr "選擇了 %d 個檔案, 共有 %d 個檔案" +msgstr "選擇了 %d 個檔案，共 %d 個檔案" -#. Resource IDs: (246) +#. Resource IDs: (3935) #, c-format msgid "%d most active author(s) with at least %d commits each (%d %%)" -msgstr "%d 個最活躍的作者 (至少有 %d(%d%%) 次提交數)" +msgstr "前 %d 個最活躍的作者（至少有 %d(%d%%) 次提交數）" -#. Resource IDs: (8) +#. Resource IDs: (113) #, c-format msgid "" "%i%% alpha\n" "click to toggle alpha\n" "double click to automatically toggle alpha" -msgstr "%i%% 半透明\n單擊以切換半透明模式\n雙擊以自動切換半透明模式" +msgstr "%i%% 半透明\n點擊時，會在透明值百分比 0 和 100 之間互相切換\n雙擊時，則會自動互相切換" -#. Resource IDs: (226) +#. Resource IDs: (3602) #, c-format msgid "%ld minute(s) and %ld second(s)" msgstr "%ld 分鐘 %ld 秒" -#. Resource IDs: (7) +#. Resource IDs: (110) #, c-format msgid "%ld of %ld" -msgstr "%ld 之 %ld" +msgstr "%ld / %ld" -#. Resource IDs: (226) +#. Resource IDs: (3600) #, c-format msgid "%s - at revision: %d" -msgstr "%s - 於版本： %d" +msgstr "%s - 於版本：%d" -#. Resource IDs: (3887) +#. Resource IDs: (62186) #, c-format msgid "%s [Recovered]" msgstr "%s [已復原]" -#. Resource IDs: (226) +#. Resource IDs: (3603) #, c-format msgid "%s in %s" msgstr "%s 於 %s" -#. Resource IDs: (87) +#. Resource IDs: (1383) #, c-format msgid "%s requires Git >= %s" msgstr "%s 需要 Git >= %s" -#. Resource IDs: (357) +#. Resource IDs: (5703) #, c-format msgid "%s, at %s" msgstr "%s，於 %s" -#. Resource IDs: (151) +#. Resource IDs: (2400) #, c-format msgid "%s: Working Tree" -msgstr "%s: 工作目錄" +msgstr "%s：工作目錄" -#. Resource IDs: (145) +#. Resource IDs: (2317) #, c-format msgid "%s\\Export (%d) of %s" msgstr "%s\\匯出 (%d) 筆%s" -#. Resource IDs: (145) +#. Resource IDs: (2316) #, c-format msgid "%s\\Export of %s" msgstr "%s\\匯出 %s" -#. Resource IDs: (3850) +#. Resource IDs: (61585, 61586) #, c-format msgid "" "%s\n" "%s" msgstr "%s\n%s" -#. Resource IDs: (376) +#. Resource IDs: (6005) #, c-format msgid "" "%s\n" "Could not be cleanly patched." -msgstr "%s\n無法修補" +msgstr "%s\n無法補綴。" -#. Resource IDs: (145) +#. Resource IDs: (2305) #, c-format msgid "" "%s\n" "Do you want to remove it anyway?" msgstr "%s\n確定真的要移除嗎？" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "" "%s\n" "is a directory, not a file!\n" "TortoiseGitMerge can't diff directories." -msgstr "%s\n是目錄, 不是檔案!\nTortoiseGitMerge 無法比對目錄差異." +msgstr "「%s」\n是目錄，並不是檔案！\nTortoiseGitMerge 無法比較目錄差異。" #. Resource IDs: (16923) msgid "&..." @@ -325,15 +325,19 @@ msgstr "&..." #. Resource IDs: (1656) msgid "&3 way merge" -msgstr "3路合併(&3)" +msgstr "三方合併(&3)" + +#. Resource IDs: (1154) +msgid "&Abort" +msgstr "中止(&A)" #. Resource IDs: (57664) msgid "&About TortoiseGitBlame..." -msgstr "關於 TortoiseGitBlame(&A)..." +msgstr "關於 TortoiseGitBlame (&A)..." #. Resource IDs: (57664) msgid "&About TortoiseGitMerge..." -msgstr "關於 TortoiseGitMerge" +msgstr "關於 TortoiseGitMerge (&A)..." #. Resource IDs: (16920) msgid "&Activate" @@ -341,11 +345,11 @@ msgstr "啟動(&A)" #. Resource IDs: (1382) msgid "&Add" -msgstr "增加(&A)" +msgstr "加入(&A)" #. Resource IDs: (17075) msgid "&Add >>" -msgstr "增加(&A) >>" +msgstr "加入(&A) >>" #. Resource IDs: (1505) msgid "&Add Filter" @@ -353,19 +357,19 @@ msgstr "新增過濾器(&A)" #. Resource IDs: (1382) msgid "&Add New/Save" -msgstr "增加/保存(&A)" +msgstr "新增／保存(&A)" -#. Resource IDs: (68) +#. Resource IDs: (1079) msgid "&Add it" -msgstr "增加它(&A)" +msgstr "追加它(&A)" -#. Resource IDs: (1064) +#. Resource IDs: (17018) msgid "&Add or Remove Buttons" msgstr "新增或移除按鈕(&A)" -#. Resource IDs: (8, 1098) +#. Resource IDs: (124, 1098) msgid "&Add..." -msgstr "增加(&A)..." +msgstr "加入(&A)..." #. Resource IDs: (1090, 1093) msgid "&Advanced..." @@ -389,11 +393,11 @@ msgstr "套用補綴(&A)" #. Resource IDs: (1013) msgid "&Apply unified diff" -msgstr "套用單一差異檔(&A)" +msgstr "套用統合式差異檔(&A)" #. Resource IDs: (65535) msgid "&Arguments:" -msgstr "參數(&A)：" +msgstr "引數(&A):" #. Resource IDs: (16645) msgid "&Assign" @@ -401,39 +405,39 @@ msgstr "指派(&A)" #. Resource IDs: (16633) msgid "&Associate double-click event with:" -msgstr "設定雙擊事件關連(&A)：" +msgstr "將按兩下事件與下列項目產生關聯(&A):" -#. Resource IDs: (1066) +#. Resource IDs: (17041) msgid "&Auto Hide" msgstr "自動隱藏(&A)" #. Resource IDs: (65535) msgid "&Autoclose Git.exe dialog:" -msgstr "自動關閉 git.exe 視窗：" +msgstr "自動關閉 git.exe 視窗(&A)：" #. Resource IDs: (1505) msgid "&Autoload Putty Key" -msgstr "自動載入putty鑰(&A)" +msgstr "自動載入 Putty 金鑰(&A)" #. Resource IDs: (1015) msgid "&Backup original file" -msgstr "備份原始檔(&B)" +msgstr "備份原來的檔案(&B)" -#. Resource IDs: (13) +#. Resource IDs: (203) msgid "&Blame" msgstr "譴責(&B)" -#. Resource IDs: (1254) +#. Resource IDs: (20048) msgid "&Blame changes" msgstr "譴責變更(&B)" -#. Resource IDs: (322, 1252) +#. Resource IDs: (5150, 20025) msgid "&Blame revisions" msgstr "譴責修訂(&B)" #. Resource IDs: (65535) msgid "&Blue:" -msgstr "藍(&B)：" +msgstr "藍色(&B):" #. Resource IDs: (65535) msgid "&Border:" @@ -445,15 +449,15 @@ msgstr "分支(&B)" #. Resource IDs: (4566) msgid "&Branch:" -msgstr "分支(&B):" +msgstr "分支(&B)：" #. Resource IDs: (1382) msgid "&Browse Dir" msgstr "瀏覽目錄(&B)" -#. Resource IDs: (1251) +#. Resource IDs: (20013) msgid "&Browse repository" -msgstr "瀏覽檔案庫(&B)" +msgstr "瀏覽版本庫(&B)" #. Resource IDs: (1001, 1009) msgid "&Browse..." @@ -465,11 +469,11 @@ msgstr "按鈕外觀(&B)..." #. Resource IDs: (65535) msgid "&Button text:" -msgstr "按鈕文字(&B)：" +msgstr "按鈕文字(&B):" #. Resource IDs: (1051) msgid "&CD-ROM" -msgstr "光碟機(&R)" +msgstr "光碟機(&C)" #. Resource IDs: (2) msgid "&Cancel" @@ -477,19 +481,19 @@ msgstr "取消(&C)" #. Resource IDs: (65535) msgid "&Categories:" -msgstr "類別(&C):" +msgstr "分類(&C):" #. Resource IDs: (65535) msgid "&Category:" -msgstr "類別(&C)：" +msgstr "分類(&C):" #. Resource IDs: (65535) msgid "&Choose commands from:" -msgstr "選擇命令從(&C)：" +msgstr "選取命令(&C):" -#. Resource IDs: (8) +#. Resource IDs: (126) msgid "&Clean up..." -msgstr "清理(&C)" +msgstr "清理(&C)..." #. Resource IDs: (57632) msgid "&Clear" @@ -511,31 +515,35 @@ msgstr "關閉視窗(&C)" msgid "&Command:" msgstr "命令(&C)：" -#. Resource IDs: (1625) +#. Resource IDs: (1514, 1625) msgid "&Commit" msgstr "提交(&C)" #. Resource IDs: (355) msgid "&Commit submodule..." -msgstr "提交子模組(&C) ..." +msgstr "提交子模組(&C)..." -#. Resource IDs: (68) +#. Resource IDs: (1080) msgid "&Commit w/o" -msgstr "強制提交(&C)" +msgstr "徑自提交(&C)" -#. Resource IDs: (8) +#. Resource IDs: (122) msgid "&Commit..." msgstr "提交(&C)..." -#. Resource IDs: (1252) +#. Resource IDs: (1757, 20024) msgid "&Compare revisions" msgstr "比對版本差異(&C)" -#. Resource IDs: (92) +#. Resource IDs: (1462) msgid "&Compressed Graph" msgstr "壓縮圖型(&C)" -#. Resource IDs: (501, 1367, 1471, 57634) +#. Resource IDs: (1159) +msgid "&Continue" +msgstr "繼續(&C)" + +#. Resource IDs: (1367, 1471, 8000, 57634) msgid "&Copy" msgstr "複製(&C)" @@ -555,11 +563,11 @@ msgstr "自訂(&C)" msgid "&Default" msgstr "預設(&D)" -#. Resource IDs: (11, 70, 16617, 16912) +#. Resource IDs: (1, 168, 1114, 16617, 16912) msgid "&Delete" msgstr "刪除(&D)" -#. Resource IDs: (17) +#. Resource IDs: (271) msgid "&Delete (keep local)" msgstr "刪除並保留檔案(&D)" @@ -567,55 +575,59 @@ msgstr "刪除並保留檔案(&D)" msgid "&Delete Filter" msgstr "刪除過濾器(&D)" -#. Resource IDs: (70) +#. Resource IDs: (1116) msgid "&Delete remote && local" msgstr "刪除遠端及本地(&D)" #. Resource IDs: (65535) msgid "&Detect moved or copied lines" -msgstr "偵測已移動及複製的行(&D)" +msgstr "偵測「移動行」或「複製行」(&D)" #. Resource IDs: (65535) msgid "&Detect moved or copied lines:" -msgstr "偵測已移動及複製的行(&D):" +msgstr "偵測「移動行」或「複製行」(&D)：" -#. Resource IDs: (12) +#. Resource IDs: (176) msgid "&Diff" -msgstr "比對差異(&D)" +msgstr "比較差異(&D)" -#. Resource IDs: (14) +#. Resource IDs: (214) msgid "&Diff with previous version" -msgstr "與前一個版本比對(&D)" +msgstr "與前一個版本比較(&D)" #. Resource IDs: (65535) msgid "&Directory:" -msgstr "目錄(&D)" +msgstr "目錄(&D)：" #. Resource IDs: (32789) msgid "&Disabled" -msgstr "已停用(&D)" +msgstr "停用(&D)" -#. Resource IDs: (71) +#. Resource IDs: (1126) msgid "&Discard" -msgstr "放棄(&D)" +msgstr "丟棄(&D)" #. Resource IDs: (1412) msgid "&Do the same for the rest" msgstr "對其餘的作相同處理(&D)" -#. Resource IDs: (1066) +#. Resource IDs: (17040) msgid "&Docking" -msgstr "視窗停駐(&D)" +msgstr "停駐(&D)" #. Resource IDs: (1032) msgid "&Don't ask me again" msgstr "不再詢問(&D)" +#. Resource IDs: (1153) +msgid "&Don't show this message again" +msgstr "不再顯示此訊息(&D)" + #. Resource IDs: (1384) msgid "&Down" msgstr "向下(&D)" -#. Resource IDs: (78, 1710) +#. Resource IDs: (1236, 1710) msgid "&Download" msgstr "下載(&D)" @@ -623,11 +635,11 @@ msgstr "下載(&D)" msgid "&Edit" msgstr "編輯(&E)" -#. Resource IDs: (84) +#. Resource IDs: (1340) msgid "&Edit .git/config" -msgstr "編輯(&E) .git/config" +msgstr "編輯 .git/config (&E)" -#. Resource IDs: (1559) +#. Resource IDs: (1502) msgid "&Edit ALL" msgstr "編輯全部(&E)" @@ -635,7 +647,7 @@ msgstr "編輯全部(&E)" msgid "&Edit Filter" msgstr "編輯過濾器(&E)" -#. Resource IDs: (12) +#. Resource IDs: (186) msgid "&Edit conflicts" msgstr "編輯衝突(&E)" @@ -649,7 +661,7 @@ msgstr "電郵補綴(&E)" #. Resource IDs: (65535) msgid "&Email:" -msgstr "&電郵:" +msgstr "電郵(&E)：" #. Resource IDs: (1023) msgid "&Enable Proxy Server" @@ -660,12 +672,12 @@ msgid "&Enable edit" msgstr "啟用編輯(&E)" #. Resource IDs: (32771) -msgid "&Exit" -msgstr "離開(&E)" +msgid "&Exit\tCtrl+W" +msgstr "離開(&E)\tCtrl+W" -#. Resource IDs: (323) +#. Resource IDs: (5152) msgid "&Export selection to..." -msgstr "匯出選取範圍至(&E)..." +msgstr "匯出選取的檔案至(&E)..." #. Resource IDs: (1092, 1095) msgid "&External" @@ -675,39 +687,39 @@ msgstr "外部(&E)" msgid "&File" msgstr "檔案(&F)" -#. Resource IDs: (1, 57636) +#. Resource IDs: (1) msgid "&Find" msgstr "搜尋(&F)" -#. Resource IDs: (57636) +#. Resource IDs: (32787, 57636) msgid "&Find\tCtrl+F" msgstr "搜尋(&F)\tCtrl+F" #. Resource IDs: (32778) -msgid "&Fit images in window" -msgstr "圖片符合視窗大小(&F)" +msgid "&Fit images in window\tF" +msgstr "圖片符合視窗大小(&F)\tF" #. Resource IDs: (1050) msgid "&Fixed drives" -msgstr "硬式磁碟(&F)" +msgstr "固定磁碟機(&F)" -#. Resource IDs: (1065) +#. Resource IDs: (17039) msgid "&Floating" msgstr "浮動(&F)" -#. Resource IDs: (1638, 32782) +#. Resource IDs: (1452, 32782) msgid "&Follow renames" msgstr "跟隨重新命名(&F)" #. Resource IDs: (65535) msgid "&Font for log messages:" -msgstr "訊息紀錄字型(&F):" +msgstr "日誌訊息字型(&F)：" #. Resource IDs: (65535) msgid "&Font:" msgstr "字型(&F)：" -#. Resource IDs: (1521) +#. Resource IDs: (1480, 1521) msgid "&Force" msgstr "強制(&F)" @@ -717,7 +729,7 @@ msgstr "強制變基(rebase)(&F)" #. Resource IDs: (1608) msgid "&From:" -msgstr "從(&F)" +msgstr "從(&F)：" #. Resource IDs: (2153) msgid "&Git Style Commit (--rmdir)" @@ -727,7 +739,7 @@ msgstr "Git形式提交(--rmdir)(&G)" msgid "&Go to\tCtrl+G" msgstr "前往(&G)\tCtrl+G" -#. Resource IDs: (91) +#. Resource IDs: (1454) msgid "&Gray Unrelated Changed Paths" msgstr "以灰色顯示無關的變動路徑(&G)" @@ -739,7 +751,7 @@ msgstr "綠(&G)：" msgid "&HEAD" msgstr "&HEAD" -#. Resource IDs: (12, 57670, 65535) +#. Resource IDs: (190, 57670, 65535) msgid "&Help" msgstr "說明(&H)" @@ -747,7 +759,7 @@ msgstr "說明(&H)" msgid "&Help Topics" msgstr "說明主題(&H)" -#. Resource IDs: (149, 1066, 3842) +#. Resource IDs: (149, 17042, 61457) msgid "&Hide" msgstr "隱藏 (&H)" @@ -755,14 +767,14 @@ msgstr "隱藏 (&H)" msgid "&Icon Set:" msgstr "圖示集(&I)：" -#. Resource IDs: (72) +#. Resource IDs: (1142, 1156) msgid "&Ignore" msgstr "忽略(&I)" -#. Resource IDs: (15) +#. Resource IDs: (231) #, c-format msgid "&Ignore %d items by name" -msgstr "依名稱忽略 %d 項(&I)" +msgstr "依名稱忽略 %d 個項目(&I)" #. Resource IDs: (32786) msgid "&Ignore whitespace" @@ -773,14 +785,14 @@ msgid "&Image" msgstr "影像(&I)" #. Resource IDs: (32790) -msgid "&Image info" -msgstr "影像資訊(&I)" +msgid "&Image info\tI" +msgstr "影像資訊(&I)\tI" #. Resource IDs: (16505) msgid "&Image only" msgstr "僅影像(&I)" -#. Resource IDs: (9) +#. Resource IDs: (131) msgid "&Import..." msgstr "匯入(&I)..." @@ -792,7 +804,7 @@ msgstr "初始目錄(&I)：" msgid "&Initialize submodules (--init)" msgstr "初始化子模組(&I) (--init)" -#. Resource IDs: (81) +#. Resource IDs: (1288) msgid "&Install" msgstr "安裝(&I)" @@ -804,17 +816,17 @@ msgstr "載入時跳至第一個差異處(&J)" msgid "&Keep CR" msgstr "保持换行符號(&K)" -#. Resource IDs: (68) +#. Resource IDs: (1087) msgid "&Keep current state" -msgstr "保持現時狀態(&K)" +msgstr "保持目前狀態(&K)" -#. Resource IDs: (92) +#. Resource IDs: (1458) msgid "&Labels" msgstr "標記(&L)" #. Resource IDs: (65535) msgid "&Language:" -msgstr "語系(&L):" +msgstr "語系(&L)：" #. Resource IDs: (16653) msgid "&Large Icons" @@ -836,7 +848,7 @@ msgstr "限制(&L)：" msgid "&Line number" msgstr "行號 (&L)" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "&Line number (%d - %d)" msgstr "行號 (&L) (%d - %d)" @@ -853,21 +865,21 @@ msgstr "清單檢視(&L)" msgid "&Local Branch:" msgstr "本地分支(&L)：" -#. Resource IDs: (92) +#. Resource IDs: (1456) msgid "&Local branches" msgstr "本地分支(&L)" #. Resource IDs: (1504) msgid "&Local:" -msgstr "本地(&L)" +msgstr "本地(&L)：" #. Resource IDs: (65535) msgid "&Luminence:" -msgstr "亮度(&L):" +msgstr "亮度(&L)：" #. Resource IDs: (65535) msgid "&Max line length for inline diffs" -msgstr "比對行內差異的長度上限(&M)" +msgstr "比較行內差異的長度上限(&M)" #. Resource IDs: (16543) msgid "&Menu animations:" @@ -877,11 +889,11 @@ msgstr "選單動畫效果(&M)：" msgid "&Menu contents:" msgstr "選單內容(&M)：" -#. Resource IDs: (1735) +#. Resource IDs: (1580, 1735) msgid "&Merge" msgstr "合併 (&M)" -#. Resource IDs: (9) +#. Resource IDs: (129) msgid "&Merge..." msgstr "合併(&M)..." @@ -895,7 +907,7 @@ msgstr "記錄信息(&M)" #. Resource IDs: (1241) msgid "&Message:" -msgstr "記錄信息(&M):" +msgstr "訊息(&M)：" #. Resource IDs: (16925) msgid "&Minimize" @@ -907,11 +919,11 @@ msgstr "已移動的方塊" #. Resource IDs: (1515) msgid "&Name" -msgstr "名字(&N)" +msgstr "名稱(&N)" #. Resource IDs: (65535) msgid "&Name:" -msgstr "名字(&N):" +msgstr "名稱(&N)：" #. Resource IDs: (65535) msgid "&Navigate" @@ -937,6 +949,10 @@ msgstr "下一個(&N) >" msgid "&Next Page" msgstr "下一頁(&N)" +#. Resource IDs: (109, 1162) +msgid "&No" +msgstr "否(&N)" + #. Resource IDs: (16632) msgid "&No double-click event" msgstr "無雙擊事件(&N)" @@ -953,11 +969,11 @@ msgstr "無(&N)" msgid "&Notepad2" msgstr "&Notepad2" -#. Resource IDs: (1, 66) +#. Resource IDs: (1, 1043) msgid "&OK" msgstr "確定(&O)" -#. Resource IDs: (3845) +#. Resource IDs: (61505) msgid "&One Page" msgstr "單頁(&O)" @@ -965,19 +981,15 @@ msgstr "單頁(&O)" msgid "&Onto" msgstr "建於(&O)" -#. Resource IDs: (101, 1251, 32773, 57601) +#. Resource IDs: (1602, 20014) msgid "&Open" msgstr "開啟(&O)" -#. Resource IDs: (84) +#. Resource IDs: (1337) msgid "&Open Git for Windows WebSite" msgstr "開啟 Git for Windows 網站" -#. Resource IDs: (32774) -msgid "&Open..." -msgstr "開啟(&O)..." - -#. Resource IDs: (57601) +#. Resource IDs: (32773, 32774, 57601) msgid "&Open...\tCtrl+O" msgstr "開啟(&O)...\tCtrl+O" @@ -987,29 +999,29 @@ msgstr "選項(&O)" #. Resource IDs: (65535) msgid "&Overlay Icon:" -msgstr "覆蓋圖示(&O)" +msgstr "覆蓋圖示(&O)：" #. Resource IDs: (32772) -msgid "&Overlay images" -msgstr "覆蓋圖示(&O)" +msgid "&Overlay images\tO" +msgstr "覆蓋圖示(&O)\tO" -#. Resource IDs: (1411, 65535) +#. Resource IDs: (1411, 5002, 65535) msgid "&Password:" msgstr "密碼(&P)：" -#. Resource IDs: (15, 501, 1253) +#. Resource IDs: (225, 8002, 20039, 57637) msgid "&Paste" msgstr "貼上(&P)" -#. Resource IDs: (1560) +#. Resource IDs: (1503) msgid "&Pick ALL" msgstr "選取全部(&P)" #. Resource IDs: (1414) msgid "&Port:" -msgstr "埠(&P):" +msgstr "埠(&P)：" -#. Resource IDs: (1069) +#. Resource IDs: (17091) msgid "&Print Preview" msgstr "預覽列印(&P)" @@ -1017,11 +1029,15 @@ msgstr "預覽列印(&P)" msgid "&Print..." msgstr "列印(&P)..." -#. Resource IDs: (66) +#. Resource IDs: (32782) +msgid "&Print...\tCtrl+P" +msgstr "列印(&P)...\tCtrl+P" + +#. Resource IDs: (9677) msgid "&Proceed" msgstr "繼續(&P)" -#. Resource IDs: (76) +#. Resource IDs: (1208) msgid "&Pull" msgstr "拉取(&P)" @@ -1029,13 +1045,17 @@ msgstr "拉取(&P)" msgid "&Push all branches" msgstr "推送所有分支(&P)" -#. Resource IDs: (72) +#. Resource IDs: (1136) msgid "&ReCommit" msgstr "重新提交(&R)" +#. Resource IDs: (1581) +msgid "&Rebase" +msgstr "變基(&R)" + #. Resource IDs: (1246) msgid "&Recent messages" -msgstr "最近的紀錄訊息(&R)" +msgstr "最近的記錄訊息(&R)" #. Resource IDs: (1694) msgid "&Recursive" @@ -1043,15 +1063,15 @@ msgstr "遞迴(&R)" #. Resource IDs: (65535) msgid "&Red:" -msgstr "紅色(&R):" +msgstr "紅色(&R)：" -#. Resource IDs: (1253) +#. Resource IDs: (20036) msgid "&Redo" msgstr "取消復原(&R)" #. Resource IDs: (1579) msgid "&Ref:" -msgstr "參考點(&R)：" +msgstr "參照(&R)：" #. Resource IDs: (1382) msgid "&Refresh" @@ -1061,7 +1081,7 @@ msgstr "重新整理(&R)" msgid "&Regular Expression" msgstr "正規表示式(&R)" -#. Resource IDs: (97) +#. Resource IDs: (1546) msgid "&Remind me later" msgstr "稍後再提醒(&R)" @@ -1069,7 +1089,7 @@ msgstr "稍後再提醒(&R)" msgid "&Remote Branch:" msgstr "遠端分支(&R)：" -#. Resource IDs: (92) +#. Resource IDs: (1457) msgid "&Remote branches" msgstr "遠端分支(&R)" @@ -1077,7 +1097,7 @@ msgstr "遠端分支(&R)" msgid "&Remote:" msgstr "遠端(&R)：" -#. Resource IDs: (1100, 1385, 16646) +#. Resource IDs: (1100, 1385, 1569, 16646) msgid "&Remove" msgstr "移除(&R)" @@ -1089,47 +1109,51 @@ msgstr "從索引中移除此檔案(&R)" msgid "&Replace" msgstr "取代(&R)" -#. Resource IDs: (15) +#. Resource IDs: (227) msgid "&Repo-browser" -msgstr "檔案庫瀏覽器(&R)" +msgstr "版本庫瀏覽器(&R)" #. Resource IDs: (16613, 16624) msgid "&Reset" -msgstr "重置(&R)" +msgstr "重設(&R)" -#. Resource IDs: (1019) +#. Resource IDs: (16300) msgid "&Reset Toolbar" msgstr "重設工具列(&R)" #. Resource IDs: (1355) msgid "&Reset filter" -msgstr "重置過濾器 (&R)" +msgstr "重設過濾器 (&R)" #. Resource IDs: (16657) msgid "&Reset my usage data" -msgstr "重設個人使用紀錄(&R)" +msgstr "重設我的使用狀況資料(&R)" #. Resource IDs: (16910) msgid "&Reset to Default" msgstr "還原至預設值(&R)" -#. Resource IDs: (66) +#. Resource IDs: (1045) msgid "&Resolved" msgstr "已解決(&R)" -#. Resource IDs: (69) +#. Resource IDs: (1090) msgid "&Restore" msgstr "還原(&R)" -#. Resource IDs: (68) +#. Resource IDs: (1086) msgid "&Restore old state" msgstr "還原舊狀態(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (1155) +msgid "&Retry" +msgstr "重試(&R)" + +#. Resource IDs: (20022) msgid "&Revert change by this commit" msgstr "復原這個版本的變更(&R)" -#. Resource IDs: (1252) +#. Resource IDs: (20027) msgid "&Revert changes by these commits" msgstr "復原這些版本的變更(&R)" @@ -1139,9 +1163,9 @@ msgstr "SSH 用戶端(&S)：" #. Resource IDs: (65535) msgid "&Saturation:" -msgstr "飽和度(&B):" +msgstr "飽和度(&S)：" -#. Resource IDs: (71, 16921, 57603) +#. Resource IDs: (1125, 16921) msgid "&Save" msgstr "儲存(&S)" @@ -1149,23 +1173,27 @@ msgstr "儲存(&S)" msgid "&Save authentication" msgstr "儲存認證(&S)" -#. Resource IDs: (272, 32806) +#. Resource IDs: (4351, 32806) msgid "&Save graph as..." msgstr "圖形另存新檔(&S)..." -#. Resource IDs: (322) +#. Resource IDs: (5151) msgid "&Save list of selected files to..." msgstr "儲存選擇的檔案清單至(&S)..." -#. Resource IDs: (84) +#. Resource IDs: (32776) +msgid "&Save\tCtrl+S" +msgstr "儲存(&S)\tCtrl+S" + +#. Resource IDs: (1336) msgid "&Set Git path" msgstr "設定 Git 路徑(&S)" #. Resource IDs: (1486) msgid "&Set upstream/track remote branch" -msgstr "設定上游/追蹤遠端分支(&S)" +msgstr "設定「上游／追蹤」遠端分支(&S)" -#. Resource IDs: (9) +#. Resource IDs: (133) msgid "&Settings" msgstr "設定(&S)" @@ -1183,19 +1211,19 @@ msgstr "顯示文字標籤(&S)" #. Resource IDs: (65535) msgid "&Signing key ID:" -msgstr "&Signing key ID:" +msgstr "&Signing key ID：" -#. Resource IDs: (66) +#. Resource IDs: (1044) msgid "&Skip" msgstr "跳過(&S)" #. Resource IDs: (1524) msgid "&Squash" -msgstr "聚合(&S)" +msgstr "壓合(&S)" -#. Resource IDs: (1561) +#. Resource IDs: (1499) msgid "&Squash ALL" -msgstr "聚合全部(&S)" +msgstr "壓合全部(&S)" #. Resource IDs: (1616) msgid "&Start" @@ -1205,7 +1233,7 @@ msgstr "開始(&S)" msgid "&Start Group" msgstr "啟動群組(&S)" -#. Resource IDs: (86) +#. Resource IDs: (1371) msgid "&Stash" msgstr "藏起(&S)" @@ -1223,9 +1251,9 @@ msgstr "符號檢視(&S)" #. Resource IDs: (65535) msgid "&Tab size:" -msgstr "Tab 寬度(&T):" +msgstr "&Tab 寬度：" -#. Resource IDs: (1069) +#. Resource IDs: (17088) msgid "&Tabbed Document" msgstr "分頁的文件(&T)" @@ -1233,13 +1261,13 @@ msgstr "分頁的文件(&T)" msgid "&Tag" msgstr "標籤(&T)" -#. Resource IDs: (91) +#. Resource IDs: (1455) msgid "&Tags" msgstr "標籤(&T)" #. Resource IDs: (65535) msgid "&Tags:" -msgstr "標籤(&T):" +msgstr "標籤(&T)：" #. Resource IDs: (16915) msgid "&Text" @@ -1269,7 +1297,7 @@ msgstr "工具列及停駐視窗" msgid "&Toolbars:" msgstr "工具列(&T)：" -#. Resource IDs: (9) +#. Resource IDs: (135) msgid "&TortoiseGit" msgstr "&TortoiseGit" @@ -1279,27 +1307,31 @@ msgstr "&TortoiseGitMerge" #. Resource IDs: (1605) msgid "&Trunk:" -msgstr "主幹(&T)" +msgstr "主幹(&T)：" + +#. Resource IDs: (1158) +msgid "&Try Again" +msgstr "再試一次(&T)" -#. Resource IDs: (3845) +#. Resource IDs: (61506) msgid "&Two Page" msgstr "雙頁(&T)" #. Resource IDs: (1076, 65535) msgid "&URL:" -msgstr "&URL:" +msgstr "&URL：" -#. Resource IDs: (1253, 57643) +#. Resource IDs: (20035, 57643) msgid "&Undo" msgstr "復原(&U)" -#. Resource IDs: (110) +#. Resource IDs: (1758) msgid "&Unified diff" -msgstr "單一差異 (&U)" +msgstr "統合式差異 (&U)" -#. Resource IDs: (1256) +#. Resource IDs: (20081) msgid "&Unified diff with" -msgstr "單一差異檔(&U)" +msgstr "統合式差異檔(&U)" #. Resource IDs: (1061) msgid "&Unknown drives" @@ -1309,23 +1341,23 @@ msgstr "未知磁碟(&U)" msgid "&Up" msgstr "向上(&U)" -#. Resource IDs: (1253) +#. Resource IDs: (20047) msgid "&Update item to revision" msgstr "更新項目至版本(&U)" #. Resource IDs: (4567) msgid "&Upstream:" -msgstr "上游(&U)" +msgstr "上游(&U)：" #. Resource IDs: (1184) msgid "&Use auto-completion of file paths and keywords" msgstr "使用自動完成檔案名稱及關鍵字(&U)" -#. Resource IDs: (1005, 1410, 65535) +#. Resource IDs: (1005, 1076, 1410, 65535) msgid "&Username:" -msgstr "用戶名稱(&U)：" +msgstr "帳號(&U)：" -#. Resource IDs: (65535) +#. Resource IDs: (1777, 65535) msgid "&View" msgstr "檢視(&V)" @@ -1333,9 +1365,9 @@ msgstr "檢視(&V)" msgid "&View:" msgstr "檢視(&V)：" -#. Resource IDs: (1568) +#. Resource IDs: (65535) msgid "&Warn on missing Signed-Off-By on commit" -msgstr "在提交記錄中缺少Signed-Off-By時發出警告" +msgstr "提交缺少 Signed-Off-By 時發出警告(&W)" #. Resource IDs: (1203) msgid "&Whole Project" @@ -1349,54 +1381,58 @@ msgstr "符合全字(&W)" msgid "&Within file" msgstr "在檔案之內(&W)" +#. Resource IDs: (108, 1161) +msgid "&Yes" +msgstr "是(&Y)" + #. Resource IDs: (1657) msgid "&ignore space change" -msgstr "忽略空格變更(&i)" +msgstr "忽略空格變更(&I)" #. Resource IDs: (1498) msgid "&known changes" msgstr "已知的變更(&K)" -#. Resource IDs: (88) +#. Resource IDs: (1396) msgid "(TortoiseGit default)" msgstr "(TortoiseGit 預設)" -#. Resource IDs: (85) +#. Resource IDs: (1349) #, c-format msgid "(from %s)" msgstr "(由 %s)" -#. Resource IDs: (213) +#. Resource IDs: (3405) msgid "(no changelist)" msgstr "(沒有變更列表)" -#. Resource IDs: (314) +#. Resource IDs: (5013) msgid "(no line number)" msgstr "(無行號)" -#. Resource IDs: (214) +#. Resource IDs: (3412) msgid "(no value)" msgstr "(無此值)" -#. Resource IDs: (314) +#. Resource IDs: (5009) msgid "(not found)" msgstr "(找不到)" -#. Resource IDs: (245) +#. Resource IDs: (3908) msgid "(unknown)" msgstr "(不明)" -#. Resource IDs: (188) +#. Resource IDs: (3001) #, c-format msgid "+ %d" msgstr "+ %d" -#. Resource IDs: (188) +#. Resource IDs: (3000) #, c-format msgid "- %d" msgstr "- %d" -#. Resource IDs: (86) +#. Resource IDs: (1360) msgid "- all -" msgstr "- 全部 -" @@ -1404,13 +1440,14 @@ msgstr "- 全部 -" msgid "--&all" msgstr "全部 (--&all)" -#. Resource IDs: (1007) +#. Resource IDs: (16108) msgid "" "-------------------------------------------------------------------------------------------" msgstr "-------------------------------------------------------------------------------------------" #. Resource IDs: (1002, 1003, 1021, 1022, 1036, 1089, 1104, 1324, 1333, 1382, -#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672) +#. 1383, 1384, 1474, 1483, 1484, 1541, 1542, 1551, 1583, 1584, 1664, 1672, +#. 1778) msgid "..." msgstr "..." @@ -1418,9 +1455,9 @@ msgstr "..." msgid "....." msgstr "....." -#. Resource IDs: (91) +#. Resource IDs: (1448) msgid ".git/config in the repository root" -msgstr ".git/config 在根目錄" +msgstr "在版本庫根目錄下的 .git/config" #. Resource IDs: (1691) msgid ".git/info/exclude" @@ -1428,15 +1465,15 @@ msgstr ".git/info/exclude" #. Resource IDs: (1690) msgid ".gitignore in the containing directories of the items" -msgstr ".gitignore 在包含的目錄" +msgstr "在該檔案的目錄下的 .gitignore" #. Resource IDs: (1689) msgid ".gitignore in the repository root" -msgstr ".gitignore 在根目錄" +msgstr "在版本庫根目錄下的 .gitignore " -#. Resource IDs: (91) +#. Resource IDs: (1447) msgid ".tgitconfig in the repository root" -msgstr ".tgitconfig 在根目錄" +msgstr "在版本庫根目錄下的 .tgitconfig" #. Resource IDs: (1020) msgid "< &Previous" @@ -1450,31 +1487,31 @@ msgstr "<...>" msgid "<<" msgstr "<<" -#. Resource IDs: (76) +#. Resource IDs: (1201) msgid "" msgstr "<所有分支>" -#. Resource IDs: (65) +#. Resource IDs: (1034) msgid "" msgstr "<由 Git 自動產生>" -#. Resource IDs: (93) +#. Resource IDs: (1477) msgid "" msgstr "<本地分支>" -#. Resource IDs: (76) +#. Resource IDs: (1202) msgid "" msgstr "<沒有分支>" -#. Resource IDs: (1069) +#. Resource IDs: (17095) msgid "" msgstr "<分隔線>" -#. Resource IDs: (1007) +#. Resource IDs: (16104) msgid "" msgstr "<未命名>" -#. Resource IDs: (145) +#. Resource IDs: (2309) msgid "" "TortoiseGit is a shell extension.\n" "That means it is integrated into the Windows explorer.\n" @@ -1483,66 +1520,66 @@ msgid "" "And read the manual!" msgstr "TortoiseGit 是 shell 延伸程式。\n它與 Windows 檔案總管整合。\n要使用 TortoiseGit 請從檔案總管中右鍵點擊任何目錄\n以帶出快顯式選單。從那裡就可以找到所有 TortoiseGit 的指令\n並請閱讀說明書！" -#. Resource IDs: (84) +#. Resource IDs: (1333) msgid "" "Warning: It has not been checked if these branches have been fully " "merged into HEAD." -msgstr "警告: 未檢查這些分支是否已完全合併進 HEAD" +msgstr "警告： 未檢查這些分支是否已完全合併進 HEAD" -#. Resource IDs: (84) +#. Resource IDs: (1334) msgid "Warning: This action will remove the branches on the remote." -msgstr "警告: 這會移除遠端的分支" +msgstr "警告： 這會移除遠端的分支" -#. Resource IDs: (84) +#. Resource IDs: (1332) msgid "Warning: This branch is not fully merged into HEAD." -msgstr "警告: 這分支未完全合併進 HEAD" +msgstr "警告： 該分支未完全合併進 HEAD" -#. Resource IDs: (68) +#. Resource IDs: (1084) msgid "" "Current HEAD Detached, you are working on (no branch).\n" "Do you want to create a branch now?" -msgstr "現在的 HEAD 脫離了，你正在 (沒有分支)工作。\n要現在建立分支嗎？" +msgstr "目前的 HEAD 脫離了，你正在（沒有分支）工作。\n要現在建立分支嗎？" -#. Resource IDs: (70) +#. Resource IDs: (1118) msgid "Do you really want to delete ALL stash?" -msgstr "確定要刪除 所有 藏起?" +msgstr "確定要刪除 所有 藏起？" -#. Resource IDs: (72) +#. Resource IDs: (1143) msgid "Stash Apply failed!!!" msgstr "藏起套用失敗" -#. Resource IDs: (85) +#. Resource IDs: (1344) msgid "Stash POP failed!!!" msgstr "藏起取出失敗" -#. Resource IDs: (72) +#. Resource IDs: (1137) msgid "Stash failed!!!" msgstr "藏起失敗" -#. Resource IDs: (66) +#. Resource IDs: (1046) msgid "" "previous rebase directory rebase-apply still exists but mbox given\n" "\n" "Do you want to" -msgstr "前一個變基目錄 rebase-apply 仍存在，但 mbox given\n\n你想" +msgstr "前一個變基目錄 rebase-apply 仍存在，但 mbox given\n\n你想要" -#. Resource IDs: (85) +#. Resource IDs: (1346) msgid "Stash Apply failed, there are conflicts" msgstr "藏起套用失敗，因為有衝突" -#. Resource IDs: (85) +#. Resource IDs: (1345) msgid "Stash POP failed, there are conflicts" msgstr "藏起取出失敗，因為有衝突" -#. Resource IDs: (84) +#. Resource IDs: (1343) msgid "Stash Apply successful" msgstr "藏起套用成功" -#. Resource IDs: (84) +#. Resource IDs: (1342) msgid "Stash POP successful" msgstr "藏起取出成功" -#. Resource IDs: (72) +#. Resource IDs: (1138) msgid "Stash Success" msgstr "藏起成功" @@ -1550,7 +1587,7 @@ msgstr "藏起成功" msgid "" msgstr "<描述>" -#. Resource IDs: (209) +#. Resource IDs: (3339) msgid "" msgstr "<新變更列表>" @@ -1562,77 +1599,77 @@ msgstr "<佔位符>" msgid "?" msgstr "?" -#. Resource IDs: (85) +#. Resource IDs: (1357) msgid "" "A branch with the same name as your entered tag name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." -msgstr "與你輸入的標籤相同名稱的分支已經存在(所以短參考點是無棱兩可的)，這可能導致一些問題，所以應盡量避免" +msgstr "與你輸入的標籤相同名稱的分支已經存在(所以短參照是模稜兩可的)，這可能導致一些問題，所以應盡量避免" -#. Resource IDs: (85) +#. Resource IDs: (1352) msgid "A branch with this name already exists." msgstr "相同名稱的分支已經存在" -#. Resource IDs: (69) +#. Resource IDs: (1088) msgid "" "A merge process is active, so this commit will be a merge commit. In order " "to abort a merge, you have to perform a reset or forced checkout." -msgstr "合併過程進行中，所以這個提交將會是一個合併提交。要中止合併，你需要進行重置或強行取出。" +msgstr "合併程序進行中，所以這個提交將會是一個合併提交。要中止合併，你需要進行重設或強行取出。" -#. Resource IDs: (201) +#. Resource IDs: (3203) msgid "A newer version is available. Please download the current version!" msgstr "發現較新的版本，請下載！" -#. Resource IDs: (195) +#. Resource IDs: (3104) msgid "" "A newline separated list of paths for which icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are included too." -msgstr "以換行分隔的列表, 包含要顯示圖示覆蓋的目錄.\r\n如果你在路徑後面加上 '*', 那麼此路徑下的所有檔案及子目錄也都會顯示." +msgstr "以換行分隔的列表，包含要顯示圖示覆蓋的目錄。\r\n如果你在路徑後面加上「*」，那麼此路徑下的所有檔案及子目錄也都會顯示。" -#. Resource IDs: (197) +#. Resource IDs: (3145) msgid "" "A newline separated list of paths for which no context menu is shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow the context menu on all paths." -msgstr "以換行分隔的列表，列出的目錄不顯示圖示覆蓋。\r\n如果你在路徑後面加上 '*'， 那麼此路徑下的所有檔案及子目錄也都不會顯示。\n列表為空時表示所有路徑都顯示圖示覆蓋。" +msgstr "以換行分隔的列表，列出的目錄不顯示快顯功能表。\n如果你在路徑後面加上「*」， 那麼此路徑下的所有檔案及子目錄也都不會顯示。\n列表為空時表示所有路徑都顯示快顯功能表。" -#. Resource IDs: (194) +#. Resource IDs: (3103) msgid "" "A newline separated list of paths for which no icon overlays are shown.\r\n" "If you add an '*' char at the end of a path, then all files and subdirs inside that path are excluded too.\r\n" "An empty list will allow overlays on all paths." -msgstr "以換行分隔的列表，列出的目錄不顯示圖示覆蓋。\r\n如果你在路徑後面加上 '*'，那麼此路徑下的所有檔案及子目錄也都不會顯示。\r\n列表為空時表示所有路徑都顯示圖示覆蓋。" +msgstr "以換行分隔的列表，列出的目錄不顯示圖示覆蓋。\r\n如果你在路徑後面加上「*」，那麼此路徑下的所有檔案及子目錄也都不會顯示。\r\n列表為空時表示所有路徑都顯示圖示覆蓋。" -#. Resource IDs: (3843) +#. Resource IDs: (61474) msgid "A required resource was unavailable." msgstr "找不到需要的資源檔。" -#. Resource IDs: (85) +#. Resource IDs: (1358) msgid "" "A tag with the same name as your entered branch name already exists (so the short ref is ambiguous).\n" "This can cause problems so you should avoid it." -msgstr "與你輸入的分支相同名稱的標籤已經存在(所以短參考點是無棱兩可的)，這可能導致一些問題，所以應盡量避免" +msgstr "與你輸入的分支相同名稱的標籤已經存在(所以短參照是模稜兩可的)，這可能導致一些問題，所以應盡量避免" -#. Resource IDs: (85) +#. Resource IDs: (1353) msgid "A tag with this name already exists." msgstr "相同名稱的標籤已經存在" -#. Resource IDs: (79) +#. Resource IDs: (1252) msgid "" "A viewer program for GNU diff files (patch files).\r\n" "If you don't have one use NotePad." -msgstr "用來檢視 GNU 差異檔 (補綴檔) 的程式。\r\n如果沒有，可以使用記事本。" +msgstr "用來檢視 GNU 差異檔（補綴檔） 的程式。\n如果不知道要使用哪一個，可以考慮使用記事本。" -#. Resource IDs: (66) +#. Resource IDs: (1042) msgid "A&bort" msgstr "中止(&B)" -#. Resource IDs: (9) +#. Resource IDs: (134) msgid "A&bout" msgstr "關於(&B)" #. Resource IDs: (1) msgid "A&pply" -msgstr "套用(&p)" +msgstr "套用(&P)" #. Resource IDs: (1128) msgid "Abbreviate renamings" @@ -1642,23 +1679,23 @@ msgstr "縮寫重新命名" msgid "Abbreviated size" msgstr "縮寫長度" -#. Resource IDs: (2, 73, 1565) +#. Resource IDs: (2, 1565) msgid "Abort" -msgstr "放棄" +msgstr "中止" -#. Resource IDs: (15) +#. Resource IDs: (224) msgid "Abort &Merge" -msgstr "放棄合併(&M)" +msgstr "中止合併(&M)" #. Resource IDs: (4592) msgid "Abort Merge" -msgstr "放棄合併" +msgstr "中止合併" -#. Resource IDs: (15) +#. Resource IDs: (229) msgid "Aborts a running merge." -msgstr "放棄進行中的合併" +msgstr "中止進行中的合併。" -#. Resource IDs: (156) +#. Resource IDs: (57664) msgid "About" msgstr "關於" @@ -1678,39 +1715,39 @@ msgstr "關於 TortoiseGitMerge" msgid "Accept certificate" msgstr "接受憑證" -#. Resource IDs: (3867) +#. Resource IDs: (61861) #, c-format msgid "Access to %1 was denied." msgstr "拒絕存取 %1。" -#. Resource IDs: (77, 319, 604) +#. Resource IDs: (1222, 5101, 9657) msgid "Action" msgstr "行動" #. Resource IDs: (65535) msgid "Action log" -msgstr "行為紀錄" +msgstr "行為日誌" -#. Resource IDs: (1251) +#. Resource IDs: (20001) msgid "Actions" msgstr "行動" -#. Resource IDs: (3826) +#. Resource IDs: (61203) msgid "Activate Task List" msgstr "目前工作列表" -#. Resource IDs: (1066) +#. Resource IDs: (17043) msgid "Active Files" msgstr "啟用中檔案" -#. Resource IDs: (3865) +#. Resource IDs: (61838) #, c-format msgid "" "ActiveX objects cannot be saved while exiting Windows!\n" "Discard all changes to %1?" msgstr "ActiveX 物件無法在離開視窗時儲存！\n要放棄所有對 %1 的更動嗎？" -#. Resource IDs: (77, 155, 209, 229) +#. Resource IDs: (155, 1229, 3330, 3657) msgid "Add" msgstr "加入" @@ -1718,10 +1755,10 @@ msgstr "加入" msgid "Add &Signed-off-by" msgstr "加入 &Signed-off-by" -#. Resource IDs: (1253) +#. Resource IDs: (20034) #, c-format msgid "Add '%s' to dictionary" -msgstr "將 '%s' 加入字典" +msgstr "將「%s」加入字典" #. Resource IDs: (323) msgid "Add Remote" @@ -1729,17 +1766,17 @@ msgstr "加入遠端伺服器" #. Resource IDs: (1482) msgid "Add \"&Signed-off-by\"" -msgstr "加入 \"&Signed-off-by\"" +msgstr "加入「&Signed-off-by」" -#. Resource IDs: (98) +#. Resource IDs: (1556) msgid "Add another commit?" -msgstr "加入另一個提交?" +msgstr "加入另一個提交？" -#. Resource IDs: (110) +#. Resource IDs: (1750) msgid "Add extension specific diff program" -msgstr "根據副檔名加入差異比對程式" +msgstr "根據副檔名加入比較差異程式" -#. Resource IDs: (110) +#. Resource IDs: (1751) msgid "Add extension specific merge program" msgstr "根據副檔名加入合併程式" @@ -1747,97 +1784,97 @@ msgstr "根據副檔名加入合併程式" msgid "Add new files automatically to Git" msgstr "自動加入新檔案至 Git" -#. Resource IDs: (13) +#. Resource IDs: (194) msgid "Add to &ignore list" msgstr "加入忽略列表(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17083) msgid "Add to Quick Access Toolbar" msgstr "新增至快速存取工具列" -#. Resource IDs: (209, 1279) +#. Resource IDs: (1279, 3341) msgid "Add..." msgstr "加入..." #. Resource IDs: (171) msgid "Add/Edit Extension Specific Diff/Merge Program" -msgstr "加入/編輯針對副檔名的差異比對/合併工具" +msgstr "「加入／編輯」針對副檔名的「比較差異／合併」工具" -#. Resource IDs: (73, 264, 1257, 1549, 65535) +#. Resource IDs: (1163, 1549, 1705, 4221, 20102, 65535) msgid "Added" msgstr "已加入" -#. Resource IDs: (145) +#. Resource IDs: (2307) #, c-format msgid "" "Added the file pattern(s)\n" "%s\n" "to the ignore list." -msgstr "加入檔名樣式(們)\n%s\n至忽略列表。" +msgstr "已加入檔名樣式(們)\n%s\n至忽略列表。" -#. Resource IDs: (263) +#. Resource IDs: (4201) msgid "Adding" msgstr "正在加入" -#. Resource IDs: (9) +#. Resource IDs: (139) msgid "Adds file(s) to Git control" msgstr "加入檔案至 Git 版本控制" -#. Resource IDs: (13) +#. Resource IDs: (195) msgid "Adds the selected file(s) or the filemask to the 'ignore' list" msgstr "將選定的檔案遮罩加入忽略列表" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "" "Adjust the settings\n" "Settings" msgstr "調校設定值\n設定" -#. Resource IDs: (340) +#. Resource IDs: (340, 1398) msgid "Advanced" msgstr "進階" #. Resource IDs: (170) msgid "Advanced Diff/Merge Settings" -msgstr "進階差異比對/合併設定" +msgstr "進階「比較差異／合併」設定" -#. Resource IDs: (110) +#. Resource IDs: (1754) msgid "Advanced diff settings" -msgstr "進階差異比對設定" +msgstr "進階「比較差異」設定" -#. Resource IDs: (110) +#. Resource IDs: (1755) msgid "Advanced merge settings" msgstr "進階合併設定" -#. Resource IDs: (606) +#. Resource IDs: (9685) msgid "All" msgstr "全部" -#. Resource IDs: (1007) +#. Resource IDs: (16110) msgid "All Commands" msgstr "全部命令" -#. Resource IDs: (3841) +#. Resource IDs: (61442) msgid "All Files (*.*)" msgstr "所有檔案 (*.*)" -#. Resource IDs: (157) +#. Resource IDs: (2500) msgid "All Files (*.*)|*.*||" msgstr "所有檔案 (*.*)|*.*||" -#. Resource IDs: (1256) +#. Resource IDs: (20084) msgid "All Parents" msgstr "所有父版本" -#. Resource IDs: (93) +#. Resource IDs: (1478) msgid "All local branches" msgstr "所有本地分支" -#. Resource IDs: (96) +#. Resource IDs: (1531) msgid "All refs" -msgstr "所有參考點" +msgstr "所有參照" -#. Resource IDs: (96) +#. Resource IDs: (1530) msgid "All tags" msgstr "所有標籤" @@ -1845,49 +1882,49 @@ msgstr "所有標籤" msgid "All tags only" msgstr "只包括全部標籤" -#. Resource IDs: (1008) +#. Resource IDs: (16112) msgid "" "All your changes will be lost! Do you really want to reset all toolbars and " "menus?" -msgstr "全部的變更都會消失！確定要重置所有工具列和選單嗎？" +msgstr "全部的變更都會消失！確定要重設所有工具列和選單嗎？" -#. Resource IDs: (1008) +#. Resource IDs: (16115) msgid "" "All your changes will be lost! Do you really want to reset the keyboard " "assignments?" -msgstr "全部的變更都會消失！確定要重置鍵盤配置嗎？" +msgstr "全部的變更都會消失！確定要重設鍵盤配置嗎？" -#. Resource IDs: (1008) +#. Resource IDs: (16113) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the menu '%s'?" -msgstr "全部的變更都會消失！確定要重置選單 '%s' 嗎？" +msgstr "全部的變更都會消失！確定要重設選單「%s」嗎？" -#. Resource IDs: (1007) +#. Resource IDs: (16111) #, c-format msgid "" "All your changes will be lost! Do you really want to reset the toolbar '%s'?" -msgstr "全部的變更都會消失！確定要重置工具列 '%s' 嗎？" +msgstr "全部的變更都會消失！確定要重設工具列「%s」嗎？" -#. Resource IDs: (2062) +#. Resource IDs: (32976) msgid "" "Allow Editing for this view\n" "Allow Edit" msgstr "允許在此視窗中編輯\n允許編輯" -#. Resource IDs: (90) +#. Resource IDs: (1438) msgid "Allow to use custom Gravatar URL" -msgstr "容許使用自訂的 Gravatar URL" +msgstr "允許使用自訂的 Gravatar URL" -#. Resource IDs: (97) +#. Resource IDs: (1542) msgid "" "Allows to create an empty commit which only has a commit message and no " "files (cf. git commit --allow-empty)." -msgstr "允許產生一個只有提交訊息而沒有任何檔案修改的空提交 (參考: git commit --allow-empty)" +msgstr "允許產生一個只有提交訊息而沒有任何檔案修改的空提交（參考：git commit --allow-empty）" -#. Resource IDs: (66) +#. Resource IDs: (1048) msgid "Already up to date." -msgstr "己經是最新的" +msgstr "已經是最新的。" #. Resource IDs: (1482) msgid "Always push to the selected remote archive for this local branch" @@ -1901,24 +1938,24 @@ msgstr "永遠推送這本地分支到已選遠端分支" msgid "Always show long format" msgstr "永遠顯示長格式" -#. Resource IDs: (197) +#. Resource IDs: (3143) msgid "Always use the system locale settings to show times and dates" msgstr "一律使用系統語系顯示時間與日期" -#. Resource IDs: (67) +#. Resource IDs: (1068) msgid "Amend" -msgstr "更正" +msgstr "修訂" #. Resource IDs: (1555) msgid "Amend &Last Commit" -msgstr "修改上次提交" +msgstr "修訂上次提交" -#. Resource IDs: (80) +#. Resource IDs: (1265) msgid "" "An alternative editor. Which should preferably support *nix line endings." -msgstr "編輯器，能夠支援*nix換行符號" +msgstr "編輯器，能夠支援 *nix 換行符號。" -#. Resource IDs: (78) +#. Resource IDs: (1245) #, c-format msgid "" "An external diff program used\r\n" @@ -1927,9 +1964,9 @@ msgid "" "You can specify the following parameters to the path:\r\n" "%base: the base file\r\n" "%mine: the modified file" -msgstr "用來比對不同版本間檔案差\r\n異的外部程式.\r\n\r\n你可以指定以下的參數至路徑中:\r\n%base : 檔案名稱\r\n%mine : 修改過的檔案." +msgstr "用來比較不同版本間檔案差異\n的外部程式。\n\n你可以指定以下的參數至路徑中：\n%base：比較基準檔案\n%mine：修改過的檔案" -#. Resource IDs: (79) +#. Resource IDs: (1250) #, c-format msgid "" "An external merge program used\r\n" @@ -1940,36 +1977,36 @@ msgid "" "%theirs: the file as it is in the repository\r\n" "%mine: your own file, with your changes\r\n" "%base: the original file without your changes" -msgstr "用來解決衝突檔案\r\n的外部程式, \r\n\r\n你可以指定以下參數至路徑中:\r\n%merged : 發生衝突的檔案存放位置\r\n%theirs : 倉儲中存放的檔案\r\n%mine : 包含你所做變更的檔案\r\n%base : 不包含你所做變更的原始檔" +msgstr "用來解決衝突檔案\r\n的外部程式，\r\n\r\n你可以指定以下參數至路徑中：\r\n%merged : 發生衝突的檔案存放位置\r\n%theirs : 版本庫中存放的檔案\r\n%mine : 包含你所做變更的檔案\r\n%base : 不包含你所做變更的原始檔" -#. Resource IDs: (3867) +#. Resource IDs: (61862) #, c-format msgid "An incorrect file handle was associated with %1." msgstr "%1 關聯到不正確的檔案代碼." -#. Resource IDs: (3843) +#. Resource IDs: (61476) msgid "An unknown error has occurred." msgstr "發生不明錯誤." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61857, 61873) #, c-format msgid "An unknown error occurred while accessing %1." msgstr "存取 %1 時發生不明錯誤." -#. Resource IDs: (63) +#. Resource IDs: (1006) #, c-format msgid "An unknown line type was found in line %d !" -msgstr "在第 %d 行發現不明型態資料!" +msgstr "在第 %d 行發現不明型態資料！" -#. Resource IDs: (96) +#. Resource IDs: (1529) msgid "Annotated tags" msgstr "含附註的標籤" -#. Resource IDs: (251) +#. Resource IDs: (4015) msgid "Append right block" msgstr "附加右方區塊" -#. Resource IDs: (251) +#. Resource IDs: (4012) msgid "Append this block to left" msgstr "附加這個區塊至左方" @@ -1981,11 +2018,11 @@ msgstr "應用程式窗框選單：" msgid "Apply &Patch..." msgstr "套用補綴(&P)..." -#. Resource IDs: (20) +#. Resource IDs: (309) msgid "Apply Patch Serial..." msgstr "套用補綴序列(&P)..." -#. Resource IDs: (603) +#. Resource IDs: (5002, 9635) msgid "Apply Patch..." msgstr "套用補綴..." @@ -1993,15 +2030,15 @@ msgstr "套用補綴..." msgid "Apply Patches" msgstr "套用補綴" -#. Resource IDs: (22) +#. Resource IDs: (346) msgid "Apply a series of patches from a mailbox" -msgstr "從郵箱套用補綴序列" +msgstr "從郵箱(mailbox)套用補綴序列" #. Resource IDs: (1072) msgid "Apply unified diff" -msgstr "套用單一差異檔" +msgstr "套用統合式差異檔" -#. Resource IDs: (156, 626) +#. Resource IDs: (218, 10012) msgid "Aqua Style" msgstr "水藍色樣式" @@ -2009,98 +2046,98 @@ msgstr "水藍色樣式" msgid "Arabic" msgstr "阿拉伯" -#. Resource IDs: (1495) +#. Resource IDs: (1492, 1495) msgid "Arbitrary &URL:" -msgstr "任意 &URL:" +msgstr "任意 &URL：" -#. Resource IDs: (1258) +#. Resource IDs: (20119) msgid "Are you sure to reset columns?" -msgstr "確定要重設所有欄位?" +msgstr "確定要重設所有欄位？" -#. Resource IDs: (68) +#. Resource IDs: (1075) msgid "Are you sure you want to abort the rebase process?" -msgstr "確定要中止變基過程？" +msgstr "確定要中止變基程序？" -#. Resource IDs: (145) +#. Resource IDs: (2308) msgid "Are you sure you want to mark the conflicted file(s) as resolved?" msgstr "確定要把衝突的檔案(們)標記為已解決嗎？" -#. Resource IDs: (79) +#. Resource IDs: (1256) #, c-format msgid "" "Are you sure you want to revert %d item(s)? You will lose all changes" " since the last update!" msgstr "確定要復原 %d 項目嗎？從上一版本之後的所有變更都會消失！" -#. Resource IDs: (91) +#. Resource IDs: (1450) #, c-format msgid "Are you sure you want to save to \"%s\"?" -msgstr "是否要儲存至 \"%s\"？" +msgstr "是否要儲存至「%s」？" #. Resource IDs: (32793) -msgid "Arrange &vertical" -msgstr "垂直排列(&V)" +msgid "Arrange &vertical\tV" +msgstr "垂直排列(&V)\tV" -#. Resource IDs: (264) +#. Resource IDs: (4210) #, c-format msgid "Assigned to changelist '%s'" msgstr "指定為變更列表 '%s'" #. Resource IDs: (16528) msgid "Assigned to:" -msgstr "指定給:" +msgstr "指定給：" -#. Resource IDs: (10) +#. Resource IDs: (144) msgid "Assume Unchanged" msgstr "假設沒有變更" -#. Resource IDs: (1550) +#. Resource IDs: (11027, 20115) msgid "Assume valid/unchanged" -msgstr "假設有效/沒有變更" +msgstr "假設「有效／沒有變更」" #. Resource IDs: (1550) msgid "Assume valid/unchanged (\"Needs-lock\" in TortoiseSVN)" -msgstr "假設有效/沒有變更 (TortoiseSVN 中的 \"Needs-lock\")" +msgstr "假設「有效／沒有變更」（TortoiseSVN 中的「Needs-lock」）" #. Resource IDs: (32792) msgid "At file &creation" msgstr "在檔案建立時(&C)" -#. Resource IDs: (2054) +#. Resource IDs: (32862) msgid "At file creation" msgstr "在檔案建立時" -#. Resource IDs: (77) +#. Resource IDs: (1221) #, c-format msgid "At revision: %d" -msgstr "於版本: %d" +msgstr "於版本：%d" -#. Resource IDs: (84) +#. Resource IDs: (1330) msgid "At the moment, you can only rename branches." msgstr "這時候只能重新命名分支。" -#. Resource IDs: (3843) +#. Resource IDs: (61473) msgid "Attempted an unsupported operation." msgstr "試圖進行不支援的作業." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61870, 61875) #, c-format msgid "Attempted to access %1 past its end." msgstr "試圖存取超過 %1 長度的部分." -#. Resource IDs: (3868) +#. Resource IDs: (61876) #, c-format msgid "Attempted to read from the writing %1." msgstr "試圖讀取寫入中的 %1." -#. Resource IDs: (3868) +#. Resource IDs: (61874) #, c-format msgid "Attempted to write to the reading %1." msgstr "試圖寫入讀取中的 %1." #. Resource IDs: (65535) msgid "Attention: This command affects the whole working tree!" -msgstr "注意:這個命令影響整個工作目錄！" +msgstr "注意：這個命令影響整個工作目錄！" #. Resource IDs: (131, 160) msgid "Authentication" @@ -2110,19 +2147,19 @@ msgstr "認證" msgid "Authentication data" msgstr "認證資料" -#. Resource IDs: (207, 1251) +#. Resource IDs: (3311, 20003) msgid "Author" msgstr "作者" -#. Resource IDs: (605) +#. Resource IDs: (9678) msgid "Author Email" msgstr "作者電郵" #. Resource IDs: (65535) msgid "Author:\t\t\t\tStefan Kueng" -msgstr "作者:\t\t\t\tStefan Kueng" +msgstr "作者：\t\t\t\tStefan Kueng" -#. Resource IDs: (116) +#. Resource IDs: (1852) msgid "Authors" msgstr "作者" @@ -2134,49 +2171,49 @@ msgstr "作者欄有大小寫之分" msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" -msgstr "作者:\tFrank Li (lznuaa@gmail.com),\n\t\tSven Strickroth (email@cs-ware.de)" +msgstr "作者：\tFrank Li (lznuaa@gmail.com),\n\t\tSven Strickroth (email@cs-ware.de)" #. Resource IDs: (65535) msgid "Auto CrLf convert" -msgstr "自動轉換DOS\\UNIX換行符號" +msgstr "自動轉換 DOS\\UNIX 換行符號" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "自動轉換DOS\\UNIX換行符號:" +msgstr "自動轉換換行符號：" -#. Resource IDs: (1003) +#. Resource IDs: (16033) msgid "Auto Hide" msgstr "自動隱藏" -#. Resource IDs: (1003) +#. Resource IDs: (16036) msgid "Auto Hide All" msgstr "自動隱藏全部" #. Resource IDs: (1631) msgid "Auto&Crlf" -msgstr "自動轉換換行符號(&C)" +msgstr "Auto&Crlf" -#. Resource IDs: (222) +#. Resource IDs: (3542) msgid "Auto-close if no conflicts" msgstr "無衝突時自動關閉視窗" -#. Resource IDs: (222) +#. Resource IDs: (3541) msgid "Auto-close if no errors" msgstr "無錯誤時自動關閉" -#. Resource IDs: (222) +#. Resource IDs: (3544) msgid "Auto-close if no further options are available" msgstr "無更多選項時自動關閉" -#. Resource IDs: (222) +#. Resource IDs: (3543) msgid "Auto-close if no merges, adds or deletes" -msgstr "無合併, 新增, 刪除時自動關閉" +msgstr "無合併、新增、刪除時自動關閉" -#. Resource IDs: (195) +#. Resource IDs: (3114) msgid "" "Auto-complete suggests words (usually class or member names)\r\n" "from the files that you have changed as you type a log message." -msgstr "在輸入記錄訊息時, 自動從這次有修改的檔案內\r\n容中提示單字(通常是類別或成員的名字)." +msgstr "在輸入日誌訊息時，自動從這次有修改的檔案內容中\n提示單字（通常是類別或成員的名稱）。" #. Resource IDs: (1505) msgid "AutoLoad Putty &Key" @@ -2186,7 +2223,7 @@ msgstr "自動載入putty鑰(&K)" msgid "Autoload Putty &Key" msgstr "自動載入putty鑰(&K)" -#. Resource IDs: (438) +#. Resource IDs: (7001) msgid "Automatic" msgstr "自動" @@ -2206,7 +2243,7 @@ msgstr "平均" msgid "B&rowse..." msgstr "瀏覽(&R)..." -#. Resource IDs: (1064) +#. Resource IDs: (17020) msgid "Back" msgstr "上一步" @@ -2218,7 +2255,7 @@ msgstr "背景色" msgid "Baltic" msgstr "波羅的海" -#. Resource IDs: (246) +#. Resource IDs: (3934) msgid "Bar Graph" msgstr "長條圖" @@ -2232,63 +2269,63 @@ msgstr "基於" #. Resource IDs: (65535) msgid "Base file:" -msgstr "基礎檔案:" +msgstr "基礎檔案：" #. Resource IDs: (1005) msgid "Based on TortoiseIDiff of TortoiseSVN" msgstr "基於 TortoiseSVN 的 TortoiseIDiff" -#. Resource IDs: (1) +#. Resource IDs: (8) msgid "Basic Info" msgstr "基本資訊" #. Resource IDs: (65535) msgid "Between files:" -msgstr "檔案之間" +msgstr "檔案之間(-C)：" #. Resource IDs: (5060) msgid "Big5 (Traditional)" msgstr "Big5 (繁體)" -#. Resource IDs: (11) +#. Resource IDs: (163) msgid "Bisect bad" msgstr "二分法 - 壞的" -#. Resource IDs: (9) +#. Resource IDs: (137) msgid "Bisect good" msgstr "二分法 - 好的" -#. Resource IDs: (11) +#. Resource IDs: (171) msgid "Bisect reset" msgstr "二分法 - 重設" -#. Resource IDs: (9, 4574) +#. Resource IDs: (136, 4574) msgid "Bisect start" msgstr "二分法 - 開始" -#. Resource IDs: (3850) +#. Resource IDs: (61584) msgid "" "Bitmap\n" "a bitmap" msgstr "點陣圖\n點陣圖" -#. Resource IDs: (156, 626) +#. Resource IDs: (216, 10010) msgid "Black Style" msgstr "黑色樣式" -#. Resource IDs: (1252) +#. Resource IDs: (20016, 65535) msgid "Blame" msgstr "譴責" -#. Resource IDs: (1) +#. Resource IDs: (5) msgid "Blame error" msgstr "譴責錯誤" -#. Resource IDs: (32776) +#. Resource IDs: (20049, 32796) msgid "Blame previous revision" msgstr "譴責前一修訂" -#. Resource IDs: (13) +#. Resource IDs: (205) msgid "Blames each line of a file on an author" msgstr "列出檔案每一行的作者" @@ -2296,26 +2333,30 @@ msgstr "列出檔案每一行的作者" msgid "Blend alpha" msgstr "混合半透明" -#. Resource IDs: (156, 626) +#. Resource IDs: (156) +msgid "Blocks" +msgstr "" + +#. Resource IDs: (215, 10009) msgid "Blue Style" msgstr "藍色樣式" -#. Resource IDs: (1) +#. Resource IDs: (10) msgid "Body" msgstr "內文" -#. Resource IDs: (83) +#. Resource IDs: (1325) msgid "" "Both /logmsg and /logmsgfile were specified!\n" "Only one of those can be specified." -msgstr "同時指定了 /logmsg 和 /logsmgfile!\n請指定其中一個參數." +msgstr "同時指定了「/logmsg」和「/logsmgfile」！\n請指定其中一個參數。" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "" "Both the path to the patch file and the target path must be absolute paths!" msgstr "補綴檔路徑及目標路徑須為絕對路徑！" -#. Resource IDs: (188) +#. Resource IDs: (3006) msgid "Bottom View:" msgstr "底部檢視：" @@ -2325,34 +2366,34 @@ msgstr "瀏覽(&O)..." #. Resource IDs: (1510) msgid "Branc&h:" -msgstr "分支(&H)" +msgstr "分支(&H)：" -#. Resource IDs: (82, 1500, 1512, 1579, 1586) +#. Resource IDs: (1300, 1512, 1527, 1579, 1586) msgid "Branch" msgstr "分支" -#. Resource IDs: (604) +#. Resource IDs: (9649) #, c-format msgid "" "Branch %s behind %s\r\n" "%s will fastforward to %s" -msgstr "分支%s是%s的子節點\r\n%s能直接遷移到%s" +msgstr "分支 %s 是 %s 的子節點\n%s 將快進到 %s" -#. Resource IDs: (93) +#. Resource IDs: (1476) msgid "Branch (FF)" -msgstr "分支(直接遷移)" +msgstr "分支（快進）" -#. Resource IDs: (68) +#. Resource IDs: (1077) msgid "Branch Name" msgstr "分支名稱" -#. Resource IDs: (64) +#. Resource IDs: (1021) msgid "Branch/Tag name is invalid." -msgstr "分支/標籤名字無效" +msgstr "「分支／標籤」名稱無效" -#. Resource IDs: (602) +#. Resource IDs: (9619) msgid "Branch/Tag name must not be empty or is invalid." -msgstr "分支/標籤名字無效或空白" +msgstr "「分支／標籤」名稱無效或空白" #. Resource IDs: (1518) msgid "Branch:" @@ -2362,25 +2403,25 @@ msgstr "分支：" msgid "Bro&wse" msgstr "瀏覽(&W)" -#. Resource IDs: (21) +#. Resource IDs: (333) msgid "Browse References" -msgstr "瀏覽參考點" +msgstr "瀏覽參照" -#. Resource IDs: (78) +#. Resource IDs: (1246) msgid "Browse for the external diff program" -msgstr "尋找外部比對差異工具" +msgstr "尋找外部比較差異工具" #. Resource IDs: (322) msgid "Browse references" -msgstr "瀏覽參考點" +msgstr "瀏覽參照" #. Resource IDs: (1069) msgid "Browse..." msgstr "瀏覽..." -#. Resource IDs: (1251) +#. Resource IDs: (20006) msgid "Bug-ID" -msgstr "Bug編號" +msgstr "Bug 編號" #. Resource IDs: (1578) msgid "Bug-ID e&xpression:" @@ -2388,11 +2429,11 @@ msgstr "Bug 編號表示式(&X)：" #. Resource IDs: (1119) msgid "Bug-ID/Issue-Nr:" -msgstr "Bug編號 / 問題編號:" +msgstr "臭蟲編號／問題編號：" -#. Resource IDs: (117) +#. Resource IDs: (1856) msgid "Bug-IDs" -msgstr "Bug編號" +msgstr "Bug 編號" #. Resource IDs: (65535) msgid "BugTraq" @@ -2406,7 +2447,7 @@ msgstr "Bugtraq 正規表示式測試器 - TortoiseGit" msgid "Button Appearance" msgstr "按鈕外觀" -#. Resource IDs: (1382) +#. Resource IDs: (1382, 1559) msgid "Button1" msgstr "Button1" @@ -2420,27 +2461,27 @@ msgstr "立即檢查(&H)" #. Resource IDs: (65535) msgid "C&ommands:" -msgstr "命令(&O):" +msgstr "命令(&O)：" -#. Resource IDs: (77) +#. Resource IDs: (1216) msgid "C&reate branch/tag from revision" -msgstr "從版本建立分支/標記(&R)" +msgstr "從版本建立「分支／標記」(&R)" #. Resource IDs: (65535) msgid "C&urrent Keys:" -msgstr "目前按鍵(&U):" +msgstr "目前按鍵(&U)：" -#. Resource IDs: (501) +#. Resource IDs: (8001) msgid "C&ut" msgstr "剪下(&U)" -#. Resource IDs: (3697) +#. Resource IDs: (59137) msgid "CAP" msgstr "CAP" #. Resource IDs: (65535) msgid "CC:" -msgstr "抄送:" +msgstr "副本：" #. Resource IDs: (1741) msgid "Calculate" @@ -2448,13 +2489,13 @@ msgstr "計算" #. Resource IDs: (1127) msgid "Can double-click in log list to compare with previous revision" -msgstr "可使用雙擊與前一個版本比對" +msgstr "可在日誌列表上使用雙擊與前一個版本比對" -#. Resource IDs: (3865) +#. Resource IDs: (61824) msgid "Can not activate a static ActiveX object." msgstr "無法啟動靜態的 ActiveX 物件" -#. Resource IDs: (82) +#. Resource IDs: (1303) #, c-format msgid "" "Can't copy \n" @@ -2463,82 +2504,82 @@ msgid "" "%s" msgstr "無法複製 \n%s\n 至 \n%s" -#. Resource IDs: (1001) +#. Resource IDs: (16010) msgid "Can't copy bitmap image into the clipboard!" msgstr "無法複製點陣影像至剪貼簿!" -#. Resource IDs: (1001) +#. Resource IDs: (16003) msgid "Can't create a new image!" msgstr "無法建立新影像!" -#. Resource IDs: (1001) +#. Resource IDs: (16007) msgid "Can't customize menus!" -msgstr "無法自訂選單!" +msgstr "無法自訂選單！" -#. Resource IDs: (1001) +#. Resource IDs: (16004) msgid "Can't paste bitmap image from the clipboard!" msgstr "無法從剪貼簿上貼上點陣圖!" -#. Resource IDs: (2, 73, 1069) +#. Resource IDs: (2, 110, 1157, 1466, 17101) msgid "Cancel" msgstr "取消" -#. Resource IDs: (315) +#. Resource IDs: (5025) msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" msgstr "取消\n不要離開 TortoiseGitMerge" -#. Resource IDs: (315) +#. Resource IDs: (5028) msgid "" "Cancel\n" "Don't switch the views" msgstr "取消\n不切換顯示" -#. Resource IDs: (314) +#. Resource IDs: (5021) msgid "" "Cancel\n" "Keep the empty file." msgstr "取消\n保留空檔案。" -#. Resource IDs: (315) +#. Resource IDs: (5035) msgid "" "Cancel\n" "Resolve the conflicts first." msgstr "取消\n先消除衝突。" -#. Resource IDs: (315) +#. Resource IDs: (5037) msgid "" "Cancel\n" "Stay with current files" msgstr "取消\n保留目前的檔案" -#. Resource IDs: (315) +#. Resource IDs: (5039) msgid "" "Cancel\n" "Stay with current settings" -msgstr "取消\n保留目前設定" +msgstr "取消\n保留目前的設定" -#. Resource IDs: (70) +#. Resource IDs: (1107) msgid "" "Cannot combine commits now.\r\n" "Make sure you are viewing the log of your current branch and no filters are applied." -msgstr "現在無法合併提交\r\n請確定你正在檢視當前分支及沒有套用過濾器" +msgstr "現在無法合併這些提交\n請確定在日誌中只有檢視目前分支並且沒有套用過濾器，同時確認這些提交是連續的。" -#. Resource IDs: (94) +#. Resource IDs: (1495) msgid "" "Cannot force updating current branch. Use reset command if you want to do " "so." -msgstr "將與當前分支產生同名衝突而無法新建分支. 可使用重置命令移動當前分支來達到相同結果." +msgstr "將與目前分支產生同名衝突而無法新建分支。可使用重設命令移動目前分支來達到相同結果。" -#. Resource IDs: (1) +#. Resource IDs: (4) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." -msgstr "無法顯示譴責，\"%s\"不被版本控制" +msgstr "無法顯示譴責，「%s」尚未被 git 版本控制。" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "Cannot show diff because of inconsistent newlines in the file." -msgstr "無法比對差異, 因為檔案中的換行字元不一致." +msgstr "無法比較差異，因為檔案中的換行字元不一致。" #. Resource IDs: (16926) msgid "Casca&de" @@ -2548,13 +2589,13 @@ msgstr "顯層式顯示 (&D)" msgid "Cascaded context menu" msgstr "階層式快顯功能表" -#. Resource IDs: (117) +#. Resource IDs: (1857) msgid "Case-sensitive" msgstr "區分大小寫" #. Resource IDs: (65535) msgid "Cate&gories:" -msgstr "類別(&G):" +msgstr "類別(&G)：" #. Resource IDs: (65535) msgid "Celtic" @@ -2566,95 +2607,95 @@ msgstr "中歐" #. Resource IDs: (65535) msgid "Certificate verification failed!" -msgstr "憑證驗證失敗!" +msgstr "憑證驗證失敗！" #. Resource IDs: (1697) msgid "Change log" -msgstr "變更記錄" +msgstr "變更日誌" -#. Resource IDs: (3601) +#. Resource IDs: (57606) msgid "" "Change the printer and printing options\n" "Print Setup" msgstr "列印設定" -#. Resource IDs: (3601) +#. Resource IDs: (57605) msgid "" "Change the printing options\n" "Page Setup" msgstr "頁面設定" -#. Resource IDs: (626) +#. Resource IDs: (10000) msgid "" "Change the style of the application\n" "Change Style" msgstr "變更應用程式的樣式\n變更樣式" -#. Resource IDs: (3825) +#. Resource IDs: (61185) msgid "Change the window position" msgstr "更改視窗位置" -#. Resource IDs: (3825) +#. Resource IDs: (61184) msgid "Change the window size" msgstr "更改視窗大小" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "Change type" -msgstr "變更類別" +msgstr "變更類型" #. Resource IDs: (199) msgid "Changed Files" msgstr "已變動的檔案" -#. Resource IDs: (324) +#. Resource IDs: (5171) #, c-format msgid "Changed files between %s and %s" msgstr "%s 至 %s 間變更的檔案" -#. Resource IDs: (324) +#. Resource IDs: (5170) #, c-format msgid "Changed files between %s, %s and %s, %s" msgstr "%s, %s 至 %s, %s 間變更的檔案" -#. Resource IDs: (163) +#. Resource IDs: (2600) #, c-format msgid "Changed files: %d" msgstr "已變動檔案數：%d" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "Changed lines including added/deleted files" -msgstr "變更行數包含新增/刪除的檔案" +msgstr "統計變更行數，包含「已加入／已刪除」的檔案" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "Changed lines including added/deleted files by date" -msgstr "變更行數包含新增/刪除的檔案按日期" +msgstr "依日期統計變更行數，包含「已加入／已刪除」的檔案" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "Changed lines not including added/deleted files" -msgstr "變更行數不包含新增/刪除的檔案" +msgstr "統計變更行數，不包含「已加入／已刪除」的檔案" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "Changed lines not including added/deleted files by date" -msgstr "變更行數不包含新增/刪除的檔案按日期" +msgstr "依日期統計變更行數，不包含「已加入／已刪除」的檔案" -#. Resource IDs: (264) +#. Resource IDs: (4215) #, c-format msgid "Changelist %s moved" msgstr "移動了變更列表 %s" #. Resource IDs: (1242) msgid "Changes made (double-click on file for diff):" -msgstr "變動(雙點可查詢細節):" +msgstr "變更（雙擊檔案可檢視差異）：" -#. Resource IDs: (2060) +#. Resource IDs: (32956) msgid "Changes the style of the application" msgstr "變更程式的樣式" #. Resource IDs: (65535) msgid "Char position where to show a border line in commit text boxes:" -msgstr "在提交文字框中要顯示邊線的字符位置" +msgstr "在提交訊息文字框中要顯示邊線的字符位置：" -#. Resource IDs: (3887) +#. Resource IDs: (1376, 62178) msgid "Check" msgstr "勾選" @@ -2666,63 +2707,63 @@ msgstr "檢查更新 - TortoiseGit" msgid "Check For Updates..." msgstr "檢查更新..." -#. Resource IDs: (13) +#. Resource IDs: (192) msgid "Check for modi&fications" msgstr "檢查變動(&F)" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Check the path and/or URL you've entered." -msgstr "請檢查你輸入的路徑或 URL." +msgstr "請檢查你輸入的路徑或 URL。" -#. Resource IDs: (194) +#. Resource IDs: (3102) msgid "" "Check those menu entries you want to appear in the top context menu instead " "of the TortoiseGit submenu" -msgstr "勾選你希望出現在第一層選單, 而不是子選單中的選單項目" +msgstr "勾選你希望出現在第一層選單的選單項目，而不是出現在 TortoiseGit 子選單中。" -#. Resource IDs: (173) +#. Resource IDs: (2753) msgid "" "Check those menu entries you want to appear only in the extended context " "menu (SHIFT + left click)" -msgstr "選擇你想移到擴展右鍵選單的項目(需要按住Shift鍵)" +msgstr "選擇你想移到擴展右鍵選單的項目（需要按住 Shift 鍵）" -#. Resource IDs: (81) +#. Resource IDs: (1280) msgid "Check to show relative times in log messages" -msgstr "在歷史記錄中顯示相對時間" +msgstr "在日誌中顯示相對時間" -#. Resource IDs: (80) +#. Resource IDs: (1279) msgid "Check to use a less verbose date and time format in log messages" -msgstr "勾選可在記錄訊息中使用較簡短的日期及時間" +msgstr "勾選後可在日誌中使用較簡短的日期及時間" #. Resource IDs: (1700) msgid "Check:" -msgstr "勾選:" +msgstr "勾選：" -#. Resource IDs: (77) +#. Resource IDs: (1225, 3650) msgid "Checkout" msgstr "取出" -#. Resource IDs: (93) +#. Resource IDs: (1486) msgid "Checkout with merge" msgstr "取出並合併" -#. Resource IDs: (67) +#. Resource IDs: (1056) msgid "Cherry Pick" msgstr "摘取" -#. Resource IDs: (70) +#. Resource IDs: (1104) msgid "Cherry Pick failed" msgstr "摘取失敗" -#. Resource IDs: (1257) +#. Resource IDs: (20101) msgid "Cherry Pick selected commits..." msgstr "摘取選中的版本..." -#. Resource IDs: (1255) +#. Resource IDs: (20066) msgid "Cherry Pick this commit..." msgstr "摘取這個版本" -#. Resource IDs: (90) +#. Resource IDs: (1424) msgid "Cherry-pick failed! Skip this commit?" msgstr "摘取失敗！跳過這個版本？" @@ -2730,94 +2771,94 @@ msgstr "摘取失敗！跳過這個版本？" msgid "Chinese" msgstr "中文" -#. Resource IDs: (602) +#. Resource IDs: (9621) msgid "Choose Repository" -msgstr "選擇倉儲" +msgstr "選擇版本庫" -#. Resource IDs: (88) +#. Resource IDs: (1395) msgid "Chronological reversed (git default)" msgstr "按時間倒序 (git 預設)" #. Resource IDs: (4572) msgid "Clean" -msgstr "清除" +msgstr "清理" #. Resource IDs: (1630) msgid "Clean Type" -msgstr "清除類型" +msgstr "清理類型" -#. Resource IDs: (96) +#. Resource IDs: (1521) msgid "Clean permanently" msgstr "永久刪除" -#. Resource IDs: (96) +#. Resource IDs: (1520) msgid "Clean to recycle bin" msgstr "移到資源回收筒" -#. Resource IDs: (76) +#. Resource IDs: (1213) msgid "Clean up stale remote branches" -msgstr "清除陳舊的遠端分支" +msgstr "清理陳舊的遠端分支" -#. Resource IDs: (145) +#. Resource IDs: (2304) msgid "Cleaning up" -msgstr "正在清除." +msgstr "正在清理" -#. Resource IDs: (146) +#. Resource IDs: (2332) msgid "Cleaning up." -msgstr "正在清除." +msgstr "正在清理。" -#. Resource IDs: (83) +#. Resource IDs: (1324) #, c-format msgid "" "Cleanup failed to process the following paths:\n" "%s" -msgstr "清理以下路徑時發生錯誤:\n%s" +msgstr "清理以下路徑時發生錯誤：\n「%s」" -#. Resource IDs: (79) +#. Resource IDs: (1257) #, c-format msgid "" "Cleanup has successfully processed the following paths:\n" "%s" -msgstr "以下路徑已清理完成:\n%s" +msgstr "以下路徑已清理完成：\n「%s」" -#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427) +#. Resource IDs: (1273, 1275, 1276, 1279, 1281, 1427, 1726) msgid "Clear" msgstr "清除" -#. Resource IDs: (1057) +#. Resource IDs: (16909) msgid "" "Clear Tool\n" "Clear" msgstr "清除工具\n清除" -#. Resource IDs: (196) +#. Resource IDs: (3127) #, c-format msgid "Clears %ld URLs stored for %ld working trees" -msgstr "清除了 %ld 組 URL (自 %ld 份工作目錄)" +msgstr "清除 %ld 組 URL（自 %ld 份工作目錄）" -#. Resource IDs: (196) +#. Resource IDs: (3126) #, c-format msgid "Clears %ld log messages stored for %ld working trees" -msgstr "清除了 %ld 組訊息紀錄 (自 %ld 份工作目錄)" +msgstr "清除 %ld 組日誌訊息（自 %ld 份工作目錄）" -#. Resource IDs: (196) +#. Resource IDs: (3129) #, c-format msgid "" "Clears %ld username/password pairs, %ld ssl certificates and %ld usernames" -msgstr "清除了 %ld 組帳號密碼, %ld 份 SSL 憑證, 以及 %ld 組帳號" +msgstr "清除 %ld 組「帳號／密碼」配對、%ld 份 SSL 憑證、以及 %ld 組帳號" -#. Resource IDs: (197) +#. Resource IDs: (3139) #, c-format msgid "Clears cached logs from %ld repositories" -msgstr "從 %ld 個倉儲中清除快取紀錄訊息" +msgstr "從 %ld 個版本庫中清除快取日誌訊息" -#. Resource IDs: (195) +#. Resource IDs: (3105) msgid "" "Clears the stored authentication.\r\n" "You will have to enter your username/password again for all repositories." -msgstr "清除儲存的認證.\r\n你需要為全部的倉儲重新輸入帳號和密碼." +msgstr "清除儲存的認證。\n你需要為全部的版本庫重新輸入帳號和密碼。" -#. Resource IDs: (196) +#. Resource IDs: (3128) #, c-format msgid "Clears the stored sizes and positions of %ld dialogs" msgstr "清除儲存的 %ld 個視窗位置及大小" @@ -2826,7 +2867,7 @@ msgstr "清除儲存的 %ld 個視窗位置及大小" msgid "Click here to go to the website" msgstr "點擊這裡前往網站" -#. Resource IDs: (170) +#. Resource IDs: (2705) msgid "Click here to select a recently typed message" msgstr "點擊這裡以選擇最近輸入過的訊息" @@ -2834,83 +2875,83 @@ msgstr "點擊這裡以選擇最近輸入過的訊息" msgid "" "Click on \"Advanced\" to specify alternate diff programs based on file " "extension" -msgstr "點擊 \"進階設定\" 可根據不同副檔名指定不同的差異比對程式" +msgstr "點擊「進階設定」可根據不同副檔名指定不同的比較差異程式" #. Resource IDs: (65535) msgid "" "Click on \"Advanced\" to specify alternate merge programs based on file " "extension" -msgstr "點擊 \"進階設定\" 可根據不同副檔名指定不同合併程式" +msgstr "點擊「進階設定」可根據不同副檔名指定不同合併程式" -#. Resource IDs: (2058) +#. Resource IDs: (32914) msgid "" "Click to see commands to move blocks of text\n" "Use text blocks" msgstr "使用" -#. Resource IDs: (257) +#. Resource IDs: (4100) msgid "Clipboard" msgstr "剪貼簿" -#. Resource IDs: (606) +#. Resource IDs: (9691, 9694) msgid "Clone" msgstr "克隆" #. Resource IDs: (1572) msgid "Clone Existing Repository" -msgstr "克隆存在的倉儲" +msgstr "克隆存在的版本庫" -#. Resource IDs: (22) +#. Resource IDs: (349) msgid "Clone a repository" -msgstr "克隆倉儲" +msgstr "克隆版本庫" #. Resource IDs: (1653) msgid "Clone into Bare Repo" -msgstr "克隆成純倉儲" +msgstr "克隆成純版本庫" -#. Resource IDs: (14) +#. Resource IDs: (223) msgid "Clone..." msgstr "克隆..." -#. Resource IDs: (2, 1003, 1007, 1064) +#. Resource IDs: (1, 2, 16032, 16105, 17023) msgid "Close" msgstr "關閉" -#. Resource IDs: (1065) +#. Resource IDs: (17025) msgid "Close Full Screen" msgstr "關閉全螢幕" -#. Resource IDs: (3633) +#. Resource IDs: (58112) msgid "" "Close Print Preview\n" "&Close" msgstr "關閉列印預覽\n關閉(&C)" -#. Resource IDs: (222) +#. Resource IDs: (3540) msgid "Close manually" msgstr "手動關閉" -#. Resource IDs: (3841) +#. Resource IDs: (61445) msgid "" "Close print preview mode\n" "Cancel Preview" msgstr "取消預覽列印" -#. Resource IDs: (3601) +#. Resource IDs: (57602) msgid "" "Close the active document\n" "Close" msgstr "關閉文件" -#. Resource IDs: (3825) +#. Resource IDs: (61190) msgid "Close the active window and prompts to save the documents" msgstr "關閉目前視窗並提示儲存文件" -#. Resource IDs: (156) +#. Resource IDs: (32870) msgid "Collapse" msgstr "摺疊" -#. Resource IDs: (2055) +#. Resource IDs: (32870) msgid "" "Collapse unchanged sections\n" "Collapse" @@ -2936,7 +2977,7 @@ msgstr "色彩：" msgid "Combine One Mail" msgstr "合併成一份郵件" -#. Resource IDs: (1255) +#. Resource IDs: (20065) msgid "Combine to one commit" msgstr "合併到一個提交" @@ -2944,11 +2985,11 @@ msgstr "合併到一個提交" msgid "Comman&ds:" msgstr "命令(&D)：" -#. Resource IDs: (220, 1002) +#. Resource IDs: (3506, 16029) msgid "Command" msgstr "命令" -#. Resource IDs: (198) +#. Resource IDs: (3154) msgid "Command Line" msgstr "命令列" @@ -2956,7 +2997,7 @@ msgstr "命令列" msgid "Command Line To Execute:" msgstr "要執行的命令列：" -#. Resource IDs: (3857) +#. Resource IDs: (61705) msgid "Command failed." msgstr "命令失敗。" @@ -2964,49 +3005,49 @@ msgstr "命令失敗。" msgid "Commands" msgstr "命令" -#. Resource IDs: (67, 77, 135, 229, 1083, 1383, 1514) +#. Resource IDs: (135, 1070, 1083, 1228, 1383, 1514, 3658, 65535) msgid "Commit" msgstr "提交" -#. Resource IDs: (96) +#. Resource IDs: (1526) #, c-format msgid "Commit %s is NOT visible right now." msgstr "現在看不到提交 %s" -#. Resource IDs: (94) +#. Resource IDs: (1496) #, c-format msgid "Commit %s not found in \"%s\". Update submodule now?" -msgstr "提交 %s 沒在 \"%s\" 中被找到。立即更新子模組？" +msgstr "提交「%s 」沒在「%s」中被找到。立即更新子模組？" -#. Resource IDs: (1255) +#. Resource IDs: (20074) msgid "Commit Date" msgstr "提交日期" -#. Resource IDs: (1255) +#. Resource IDs: (20073) msgid "Commit Email" msgstr "提交者電郵" -#. Resource IDs: (603) +#. Resource IDs: (9643) msgid "Commit Finish" msgstr "完成提交" -#. Resource IDs: (1260) +#. Resource IDs: (20158) msgid "Commit Info" msgstr "提交資訊" -#. Resource IDs: (66) +#. Resource IDs: (1055) msgid "Commit Message" msgstr "提交訊息" -#. Resource IDs: (1255) +#. Resource IDs: (20072) msgid "Commit Name" -msgstr "提交者名字" +msgstr "提交者" #. Resource IDs: (1750) msgid "Commit Ordering:" msgstr "提交排列：" -#. Resource IDs: (96) +#. Resource IDs: (1525) msgid "Commit super project" msgstr "提交上層專案" @@ -3014,93 +3055,93 @@ msgstr "提交上層專案" msgid "Commit to:" msgstr "提交至：" -#. Resource IDs: (209, 1255) +#. Resource IDs: (3333, 20070) msgid "Commit..." msgstr "提交..." -#. Resource IDs: (244) +#. Resource IDs: (3900) msgid "Commits by author" -msgstr "依作者排序的提交紀錄" +msgstr "依作者排序的提交記錄" -#. Resource IDs: (244) +#. Resource IDs: (3901) msgid "Commits by date" -msgstr "依日期排序的提交紀錄" +msgstr "依日期排序的提交記錄" -#. Resource IDs: (604) +#. Resource IDs: (9663) #, c-format msgid "Commits each %s" -msgstr "每個提交 %s" +msgstr "每%s的提交數" #. Resource IDs: (1135) msgid "Commits each week:" -msgstr "每週提交:" +msgstr "每週提交：" -#. Resource IDs: (9) +#. Resource IDs: (138) msgid "Commits your changes to the repository" -msgstr "將你所做的修改送交至倉儲" +msgstr "提交你的修改至版本庫" -#. Resource IDs: (605) +#. Resource IDs: (9679) msgid "Committer Email" msgstr "提交者電郵" -#. Resource IDs: (170) +#. Resource IDs: (2707) msgid "" "Committing an unversioned folder will not recursively add its child items!\n" "You might want to add these folders recursively by using the 'Add...' context menu item.\n" "\n" "Are you sure that you want to continue the commit?" -msgstr "提交無版本控制的資料夾並不會自動加入底下的子項目!\n使用 '加入...' 選項可以加入底下全部的子資料夾和檔案.\n\n確定要進行送交嗎?" +msgstr "提交無版本控制的資料夾並不會自動加入底下的子項目！\n使用「加入...」快顯功能表選項可以加入底下全部子資料夾下的檔案。\n\n確定要進行提交嗎？" #. Resource IDs: (65535) msgid "Common Name:" -msgstr "憑證名稱:" +msgstr "憑證名稱：" -#. Resource IDs: (2054) +#. Resource IDs: (32848) msgid "Compare &HEAD revisions" msgstr "比較 &HEAD 版本" -#. Resource IDs: (79) +#. Resource IDs: (1249) msgid "Compare selected refs" -msgstr "比對已選的參考點" +msgstr "比對已選的參照" -#. Resource IDs: (64) +#. Resource IDs: (1020) msgid "Compare two files" msgstr "比對兩個檔案" -#. Resource IDs: (156) +#. Resource IDs: (32871) msgid "Compare whitespaces" msgstr "比對空白字元" -#. Resource IDs: (1251) +#. Resource IDs: (20009) msgid "Compare with &working tree" msgstr "與工作目錄比對(&W)" -#. Resource IDs: (138) +#. Resource IDs: (2200) msgid "Compare with b&ase" msgstr "與基礎檔比對(&A)" -#. Resource IDs: (1251) +#. Resource IDs: (20012, 32797) msgid "Compare with previous revision" msgstr "與前一個版本比對" -#. Resource IDs: (2055) +#. Resource IDs: (32871) msgid "" "Compares all whitespaces when diffing\n" "Compare whitespaces" msgstr "比對所有空白字元\n比對空白字元" -#. Resource IDs: (12) +#. Resource IDs: (177) msgid "" "Compares the file with the last committed revision to show you the changes " "you made" msgstr "比對此檔案與上次送交的版本並列出你所做的變動" -#. Resource IDs: (120) +#. Resource IDs: (1904) #, c-format msgid "Comparing %s to %s" msgstr "正在比對 %s 與 %s" -#. Resource IDs: (74) +#. Resource IDs: (1170) msgid "Completed" msgstr "完畢" @@ -3114,15 +3155,15 @@ msgstr "組態來源" #. Resource IDs: (65535) msgid "Config type:" -msgstr "組態類別：" +msgstr "組態類型：" -#. Resource IDs: (7) +#. Resource IDs: (102, 500) msgid "Configure Filter Regexes" msgstr "設定過濾器正規表示式 " #. Resource IDs: (236) msgid "Configure Hook Scripts" -msgstr "設定掛勾指令檔" +msgstr "設定掛鉤指令檔" #. Resource IDs: (284) msgid "Configure Issue Tracker Integration" @@ -3132,29 +3173,29 @@ msgstr "設定 Bug 追蹤系統整合功能" msgid "" "Configure alternative editor. Preferably one which can handle *nix line " "endings." -msgstr "設定用來比對不同版本檔案的工具程式，最好能處理*nix檔案." +msgstr "設定用來比對不同版本檔案的工具程式，最好能處理 *nix 檔案。" #. Resource IDs: (65535) msgid "Configure the program used for comparing different revisions of files" -msgstr "設定用來比對不同版本檔案的工具程式." +msgstr "設定用來比對不同版本檔案的工具程式" #. Resource IDs: (65535) msgid "Configure the program used to resolve conflicted files." -msgstr "設定用來解決衝突檔案的工具程式." +msgstr "設定用來解決衝突檔案的工具程式。" #. Resource IDs: (65535) msgid "Configure viewer program for GNU diff files (patch files)" -msgstr "設定檢視 GNU 差異檔(補綴檔)的工具程式." +msgstr "設定檢視 GNU 差異檔（補綴檔）的檢視器" #. Resource IDs: (1768) msgid "Confirm to kill running git process" msgstr "確認停止執行中的 git 程序" -#. Resource IDs: (1257, 4568) +#. Resource IDs: (4568, 20105) msgid "Conflict" msgstr "衝突" -#. Resource IDs: (67) +#. Resource IDs: (1067) msgid "Conflict Files" msgstr "衝突檔案" @@ -3162,145 +3203,145 @@ msgstr "衝突檔案" msgid "Conflict resolved" msgstr "已解決衝突" -#. Resource IDs: (263, 65535) +#. Resource IDs: (2708, 4204, 65535) msgid "Conflicted" msgstr "衝突" -#. Resource IDs: (86) +#. Resource IDs: (1370) msgid "Conflicts" msgstr "衝突" -#. Resource IDs: (188) +#. Resource IDs: (3005) #, c-format msgid "Conflicts: %d" -msgstr "衝突: %d" +msgstr "衝突：%d" #. Resource IDs: (16520) msgid "Context Menus: " -msgstr "快顯式選單:" +msgstr "快顯功能表：" #. Resource IDs: (65535) msgid "Context lines for patches" msgstr "補綴檔上下文行數" -#. Resource IDs: (67, 73, 1564) +#. Resource IDs: (1069, 1564) msgid "Continue" msgstr "繼續" -#. Resource IDs: (1001) +#. Resource IDs: (16013) msgid "Contract docked window" msgstr "縮短停駐的視窗" -#. Resource IDs: (501) +#. Resource IDs: (8004) msgid "Convert spaces to tabs" msgstr "將空白轉為 Tabs" -#. Resource IDs: (501) +#. Resource IDs: (8003) msgid "Convert tabs to spaces" msgstr "將 Tabs 轉為空白" -#. Resource IDs: (1253) +#. Resource IDs: (20038) msgid "Cop&y" msgstr "複製(&Y)" -#. Resource IDs: (73) +#. Resource IDs: (1164) msgid "Copied" msgstr "已複製" -#. Resource IDs: (78, 1257, 16991) +#. Resource IDs: (1235, 16991, 20108, 57634) msgid "Copy" msgstr "複製" -#. Resource IDs: (229) +#. Resource IDs: (3655) #, c-format msgid "Copy %s to %s, Revision %s" -msgstr "複製 %s 至 %s, 版本 %s" +msgstr "複製 %s 至 %s，版本 %s" -#. Resource IDs: (1255, 32778) +#. Resource IDs: (20067, 32800) msgid "Copy SHA-1 to clipboard" msgstr "複製 SHA-1 到剪貼薄" -#. Resource IDs: (1057) +#. Resource IDs: (16907) msgid "" "Copy Tool\n" "Copy" msgstr "複製工具\n複製" -#. Resource IDs: (209) +#. Resource IDs: (3336) msgid "Copy all information to clipboard" msgstr "複製所有訊息到剪貼簿" -#. Resource IDs: (146) +#. Resource IDs: (2335) msgid "Copy and rename" msgstr "複製及重新命名" -#. Resource IDs: (1252) +#. Resource IDs: (20017) msgid "Copy log messages to clipboard" -msgstr "複製記錄訊息到剪貼簿" +msgstr "複製日誌訊息到剪貼簿" -#. Resource IDs: (32777) +#. Resource IDs: (32801) msgid "Copy log to clipboard" -msgstr "複製記錄到剪貼簿" +msgstr "複製日誌到剪貼簿" -#. Resource IDs: (209) +#. Resource IDs: (3335) msgid "Copy paths to clipboard" msgstr "複製路徑到剪貼簿" -#. Resource IDs: (90) +#. Resource IDs: (1425) msgid "Copy ref names" -msgstr "複製參考點名稱" +msgstr "複製參照名稱" -#. Resource IDs: (323) +#. Resource IDs: (5153) msgid "Copy selection to cli&pboard" msgstr "複製選取區域至剪貼簿(&P)" -#. Resource IDs: (3603) +#. Resource IDs: (57634) msgid "" "Copy the selection and put it on the Clipboard\n" "Copy" msgstr "將選擇的區塊複製至剪貼簿\n複製" -#. Resource IDs: (1252) +#. Resource IDs: (20031) msgid "Copy to clipboard" msgstr "複製至剪貼簿" -#. Resource IDs: (98) +#. Resource IDs: (1552) #, c-format msgid "Copy: New name for %s" -msgstr "複製: %s 的新名稱" +msgstr "複製：「%s」的新名稱" -#. Resource IDs: (80) +#. Resource IDs: (1274) #, c-format msgid "Copying %s" msgstr "正在複製 %s" -#. Resource IDs: (80) +#. Resource IDs: (1273) msgid "Copying..." -msgstr "正在複製..." +msgstr "正在複製．．．" #. Resource IDs: (1001) msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "版權所有 (C) 2009-2015 TortoiseGit" -#. Resource IDs: (1254) +#. Resource IDs: (20053) msgid "Corrections" msgstr "修正" -#. Resource IDs: (81) +#. Resource IDs: (1292) #, c-format msgid "Could not add %s to the ignore list!" -msgstr "無法加入 %s 至忽略列表!" +msgstr "無法加入「%s」至忽略列表！" -#. Resource IDs: (201) +#. Resource IDs: (3204) msgid "Could not check for a newer version!" -msgstr "無法檢查新版!" +msgstr "無法檢查新版！" -#. Resource IDs: (93) +#. Resource IDs: (1475) #, c-format msgid "Could not check for a newer version! %s (Error code: 0x%08X)" -msgstr "無法檢查新版! %s (錯誤編號: 0x%08X)" +msgstr "無法檢查新版！%s（錯誤編：0x%08X）" -#. Resource IDs: (81) +#. Resource IDs: (1289) #, c-format msgid "" "Could not copy the files!\n" @@ -3308,127 +3349,127 @@ msgid "" "%s" msgstr "無法複製檔案!\n\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61864) #, c-format msgid "Could not create %1 because the directory is full." msgstr "因為目錄已滿, %1 無法建立." -#. Resource IDs: (83) +#. Resource IDs: (1323) msgid "Could not determine the last committed revision!" msgstr "無法判斷最後提交的版本!" -#. Resource IDs: (565) +#. Resource IDs: (9031) msgid "Could not find Super-project" msgstr "無法找到上層專案" -#. Resource IDs: (81) +#. Resource IDs: (1285) msgid "Could not get the status!" -msgstr "無法取得狀態!" +msgstr "無法取得狀態！" -#. Resource IDs: (3867) +#. Resource IDs: (61860) #, c-format msgid "Could not open %1 because there are too many open files." msgstr "無法開啟 %1, 因為已經開啟過多的檔案." -#. Resource IDs: (69) +#. Resource IDs: (1100) #, c-format msgid "" "Could not open the file\n" "%s" msgstr "無法開啟檔案\n%s" -#. Resource IDs: (3867) +#. Resource IDs: (61863) #, c-format msgid "Could not remove %1 because it is the current directory." -msgstr "%1 是目前目錄, 無法移除." +msgstr "%1 是目前目錄，無法移除。" -#. Resource IDs: (82) +#. Resource IDs: (1309) #, c-format msgid "Could not remove %s from the ignore list" msgstr "無法從忽略列表中移除 %s" -#. Resource IDs: (70) +#. Resource IDs: (1108) msgid "Could not reset to first commit (first step). Aborting..." -msgstr "無法重設到第一個提交(第一步). 中止中..." +msgstr "無法重設到第一個提交（第一步）。中止中．．．" -#. Resource IDs: (70) +#. Resource IDs: (1109) msgid "Could not reset to last commit (second step). Aborting..." -msgstr "無法重設到最後一個提交(第二步). 中止中..." +msgstr "無法重設到最後一個提交（第二步）。中止中．．．" -#. Resource IDs: (70) +#. Resource IDs: (1111) msgid "Could not reset to original HEAD." msgstr "無法重設到原先的 HEAD" -#. Resource IDs: (81) +#. Resource IDs: (1287) #, c-format msgid "" "Could not retrieve URL of the file!\n" "%s" -msgstr "無法取得檔案的 URL!\n%s" +msgstr "無法取得檔案的 URL！\n%s" -#. Resource IDs: (66) +#. Resource IDs: (1040) #, c-format msgid "" "Could not retrieve revision %s of the file %s.\n" "Patching is not possible!" -msgstr "無法取得 %s 版本的 %s 檔案.\n無法進行補綴!" +msgstr "無法取得 %s 版本的 %s 檔案。\n無法進行補綴！" -#. Resource IDs: (64) +#. Resource IDs: (1015) msgid "Could not start TortoiseGitBlame" msgstr "無法啟動TortoiseGitBlame" -#. Resource IDs: (81) +#. Resource IDs: (1293) #, c-format msgid "" "Could not start diff viewer!\n" "\n" "%s" -msgstr "無法啟動差異檢視器!\n\n%s" +msgstr "無法啟動比較差異檢視器！\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1282) #, c-format msgid "" "Could not start external diff program!\n" "\n" "%s" -msgstr "無法啟動外部差異比對工具!\n\n%s" +msgstr "無法啟動外部比較差異工具！\n\n%s" -#. Resource IDs: (81) +#. Resource IDs: (1290) #, c-format msgid "" "Could not start external merge program!\n" "\n" "%s" -msgstr "無法啟動外部合併工具!\n\n%s" +msgstr "無法啟動外部合併工具！\n\n%s" -#. Resource IDs: (3857) +#. Resource IDs: (61702) msgid "Could not start print job." msgstr "無法啟動列印工作." -#. Resource IDs: (83) +#. Resource IDs: (1326) #, c-format msgid "" "Could not start text viewer!\n" "\n" "%s" -msgstr "無法啟動文字檢視器!\n\n%s" +msgstr "無法啟動文字檢視器！\n\n%s" -#. Resource IDs: (603) +#. Resource IDs: (9632) msgid "Could not start the Putty Agent (pageant)." msgstr "無法啟動 Putty Agent (pageant)" -#. Resource IDs: (1253) +#. Resource IDs: (20033) msgid "Could not start thread!" -msgstr "無法啟動執行緒!" +msgstr "無法啟動執行緒！" #. Resource IDs: (1501) msgid "Coun&t" msgstr "計數(&T)" -#. Resource IDs: (94) +#. Resource IDs: (1502) #, c-format msgid "Count: %u matches." -msgstr "計數: %u 筆符合。" +msgstr "計數：%u 筆符合。" #. Resource IDs: (1683) msgid "Create &Library" @@ -3436,17 +3477,17 @@ msgstr "建立媒體櫃(&L)" #. Resource IDs: (1641) msgid "Create .gitignore file" -msgstr "建立.gitignore檔案" +msgstr "建立 .gitignore 檔案" -#. Resource IDs: (82) +#. Resource IDs: (1298) msgid "Create Branch" msgstr "建立分支" -#. Resource IDs: (1254) +#. Resource IDs: (20060) msgid "Create Branch at this version..." msgstr "在這版本建立分支..." -#. Resource IDs: (9) +#. Resource IDs: (130) msgid "Create Branch..." msgstr "建立分支..." @@ -3458,80 +3499,80 @@ msgstr "建立變更列表" msgid "Create New Branch" msgstr "建立新分支" -#. Resource IDs: (20) +#. Resource IDs: (308) msgid "Create Patch Serial..." msgstr "建立補綴序列..." -#. Resource IDs: (81) +#. Resource IDs: (1294) msgid "Create Tag" msgstr "建立標籤" -#. Resource IDs: (1254) +#. Resource IDs: (20061) msgid "Create Tag at this version..." msgstr "在這版本建立標籤..." -#. Resource IDs: (20) +#. Resource IDs: (307) msgid "Create Tag..." msgstr "建立標籤..." -#. Resource IDs: (3601) +#. Resource IDs: (57600) msgid "" "Create a new document\n" "New" msgstr "建立一個新的文件\n新" -#. Resource IDs: (604) +#. Resource IDs: (9651) msgid "" "Create a shallow clone with a history truncated to the specified number of " "revisions. A shallow repository has a number of limitations (you cannot " "clone or fetch from it, nor push from nor into it), but is adequate if you " "are only interested in the recent history of a large project with a long " "history, and would want to send in fixes as patches." -msgstr "建立一個淺層克隆的倉儲。這個倉儲有限定數量的歷史記錄(你不能克隆、拉取、獲取和推送）。你僅僅感興趣最近的歷史和發送補綴。" +msgstr "建立一個淺層克隆的版本庫。這個版本庫只含有限定版本數量的歷史記錄，因此你不能克隆、拉取、獲取和推送，但足夠你查看最近有興趣的歷史以及發送補綴。" -#. Resource IDs: (156) +#. Resource IDs: (32828) msgid "Create patch file" msgstr "建立補綴檔" -#. Resource IDs: (72) +#. Resource IDs: (1150) msgid "Create pull &request" msgstr "建立拉取要求(&R)" -#. Resource IDs: (8) +#. Resource IDs: (123) msgid "Create repositor&y here..." -msgstr "在此建立倉儲(&Y)..." +msgstr "在此建立版本庫(&Y)..." -#. Resource IDs: (85) +#. Resource IDs: (1347) msgid "Created" msgstr "已建立" -#. Resource IDs: (10) +#. Resource IDs: (148) msgid "Creates a branch or tag" msgstr "建立一個分支或標籤" -#. Resource IDs: (76) +#. Resource IDs: (1203) msgid "Creates a library folder with special settings for Git working trees" msgstr "建立一個媒體櫃資料夾並含有為Git工作目錄的特別設定" -#. Resource IDs: (2052) +#. Resource IDs: (32828) msgid "" "Creates a patch file from the differences of the two files\n" "Create patch file" msgstr "根據兩個檔案的差異建立補綴檔\n建立補綴檔" -#. Resource IDs: (10) +#. Resource IDs: (147) msgid "Creates a repository database at the current location" -msgstr "在目前位址建立檔案資料庫" +msgstr "在目前位置建立版本資料庫" -#. Resource IDs: (14) +#. Resource IDs: (208) msgid "Creates a unified diff file with all changes you made" -msgstr "建立包含你所有修改的統一變動檔" +msgstr "建立包含你所有修改的統合式差異檔" -#. Resource IDs: (605) +#. Resource IDs: (9676) msgid "Creating pull-request..." -msgstr "正在建立拉取要求‧‧‧" +msgstr "正在建立拉取要求．．．" -#. Resource IDs: (89) +#. Resource IDs: (1418) msgid "Credential helper must not be empty." msgstr "憑證助手不能為空" @@ -3543,7 +3584,7 @@ msgstr "憑據助手：" msgid "Credentials" msgstr "憑據" -#. Resource IDs: (1253) +#. Resource IDs: (20037) msgid "Cu&t" msgstr "剪下(&T)" @@ -3551,30 +3592,30 @@ msgstr "剪下(&T)" msgid "Current" msgstr "目前" -#. Resource IDs: (65535) +#. Resource IDs: (1784, 65535) msgid "Current Branch" -msgstr "當前分支" +msgstr "目前分支" #. Resource IDs: (65535) msgid "Current Branch:" -msgstr "當前分支:" +msgstr "目前分支：" -#. Resource IDs: (603) +#. Resource IDs: (9645) #, c-format msgid "" "Current branch %s is up to date\r\n" "\r\n" " If you want to force the rebase even if the current branch is a descendant of the commit you are rebasing onto, please check below \"Force Rebase\" checkbox." -msgstr "當前分支%s已經是最新\n\n如果你想強制變基，請選擇下面“強制變基”選項" +msgstr "目前分支「%s」已經是最新\n\n如果你想強制變基，請選擇下面「強制變基」選項。" #. Resource IDs: (1113) msgid "Current version is:" -msgstr "目前版本是:" +msgstr "目前版本是：" -#. Resource IDs: (201) +#. Resource IDs: (3201) #, c-format msgid "Current version is: %s" -msgstr "目前版本是: %s" +msgstr "目前版本是：%s" #. Resource IDs: (17079) msgid "Cus&tomize..." @@ -3584,7 +3625,7 @@ msgstr "自定(&T)..." msgid "Custom" msgstr "自訂" -#. Resource IDs: (1007, 17074) +#. Resource IDs: (16103, 17074) msgid "Customize" msgstr "自訂" @@ -3592,19 +3633,19 @@ msgstr "自訂" msgid "Customize Keyboard" msgstr "自訂鍵盤" -#. Resource IDs: (1069) +#. Resource IDs: (17096) msgid "Customize Quick Access Toolbar" msgstr "自訂快速存取工具列" -#. Resource IDs: (1068) +#. Resource IDs: (17085) msgid "Customize Quick Access Toolbar..." msgstr "自訂快速存取工具列..." -#. Resource IDs: (1258) +#. Resource IDs: (20125) msgid "Customize..." msgstr "自訂..." -#. Resource IDs: (3603) +#. Resource IDs: (57635) msgid "" "Cut the selection and put it on the Clipboard\n" "Cut" @@ -3616,90 +3657,94 @@ msgstr "西里爾" #. Resource IDs: (1624) msgid "DCommit Type" -msgstr "DCommit類型" +msgstr "DCommit 類型" -#. Resource IDs: (14) +#. Resource IDs: (216) msgid "Daemon" msgstr "守護行程" -#. Resource IDs: (208, 1251) +#. Resource IDs: (3312, 20004) msgid "Date" msgstr "日期" -#. Resource IDs: (68) +#. Resource IDs: (1078) msgid "Date Last Commit" msgstr "上次提交日期" -#. Resource IDs: (1008) +#. Resource IDs: (9684, 16114) msgid "Default" msgstr "預設" -#. Resource IDs: (1007) +#. Resource IDs: (16106) msgid "Default Menu" msgstr "預設選單" -#. Resource IDs: (1007) +#. Resource IDs: (16107) msgid "Default application menu. Appears when no documents are open." msgstr "預設程式選單. 沒開啟文件時使用." +#. Resource IDs: (65535) +msgid "Default limitation of log messages:" +msgstr "日誌訊息預設限量：" + #. Resource IDs: (1064) msgid "Default to UTF-8 encoding" msgstr "預設使用 UTF-8 編碼" -#. Resource IDs: (1002, 1256, 4571) +#. Resource IDs: (4571, 16020, 20092) msgid "Delete" msgstr "刪除" -#. Resource IDs: (81) +#. Resource IDs: (1281) #, c-format msgid "Delete %d branches" msgstr "刪除 %d 個分支" -#. Resource IDs: (80) +#. Resource IDs: (1271) #, c-format msgid "Delete %d remote branches" msgstr "刪除 %d 個遠端分支" -#. Resource IDs: (84) +#. Resource IDs: (1328) #, c-format msgid "Delete %d tags" msgstr "刪除 %d 個標籤" -#. Resource IDs: (70) +#. Resource IDs: (1117) msgid "Delete &local" msgstr "刪除本地(&L)" -#. Resource IDs: (21) +#. Resource IDs: (320) msgid "Delete Ref..." -msgstr "刪除參考點..." +msgstr "刪除參照..." -#. Resource IDs: (87) +#. Resource IDs: (1387) msgid "Delete all tags" msgstr "刪除所有標籤" -#. Resource IDs: (22) +#. Resource IDs: (351) #, c-format msgid "Delete and &ignore %d items by name" -msgstr "依名稱刪除並忽略 %d 項(&I)" +msgstr "依名稱刪除及忽略 %d 個項目(&I)" -#. Resource IDs: (23) +#. Resource IDs: (353) msgid "Delete and add to &ignore list" -msgstr "刪除並加入忽略列表(&I)" +msgstr "刪除並加入至忽略列表(&I)" -#. Resource IDs: (23) +#. Resource IDs: (352) #, c-format msgid "Delete and ignore %d items by &extension" -msgstr "依副檔名刪除並忽略 %d 項(&E)" +msgstr "依副檔名刪除並忽略 %d 個項目(&E)" -#. Resource IDs: (80) +#. Resource IDs: (1278) msgid "Delete branch" msgstr "刪除分支" -#. Resource IDs: (1255) +#. Resource IDs: (20069) msgid "Delete branch/tag" -msgstr "刪除分支/標籤" +msgstr "刪除「分支／標籤」" -#. Resource IDs: (80) +#. Resource IDs: (1268) msgid "Delete remote branch" msgstr "刪除遠端分支" @@ -3707,34 +3752,34 @@ msgstr "刪除遠端分支" msgid "Delete remote tag - TortoiseGit" msgstr "刪除遠端標籤 - TortoiseGit" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Delete remote tags on \"%s\"..." -msgstr "刪除遠端標籤在\"%s\"..." +msgstr "刪除遠端「%s」上的標籤..." -#. Resource IDs: (86) +#. Resource IDs: (1366) msgid "Delete remote tags..." msgstr "刪除遠端標籤 ..." -#. Resource IDs: (605) +#. Resource IDs: (9670) msgid "Delete submodule" msgstr "刪除子模組" -#. Resource IDs: (83) +#. Resource IDs: (1321) msgid "Delete tag" msgstr "刪除標籤" -#. Resource IDs: (85) +#. Resource IDs: (1354) msgid "Delete the existing branch or use a different name." msgstr "刪除現有分支或用另一名稱" -#. Resource IDs: (314) +#. Resource IDs: (5020) msgid "" "Delete\n" "The file is removed." msgstr "刪除\n已刪除檔案。" -#. Resource IDs: (73, 264, 1257, 1551) +#. Resource IDs: (1165, 1513, 1551, 1709, 4223, 20104) msgid "Deleted" msgstr "已刪除" @@ -3742,38 +3787,38 @@ msgstr "已刪除" msgid "Deleted merge conflict" msgstr "刪除分支合併衝突" -#. Resource IDs: (23) +#. Resource IDs: (354) msgid "" "Deletes and adds the selected file(s) or the filemask to the 'ignore' list" -msgstr "將選定的檔案遮罩刪除並加入忽略列表" +msgstr "刪除選定的檔案並將其檔案遮罩加入至忽略列表" -#. Resource IDs: (11) +#. Resource IDs: (169) msgid "Deletes files/folders from version control" -msgstr "從版本控制樹中刪除檔案/資料夾" +msgstr "刪除版本控制樹中的「檔案／資料夾」" -#. Resource IDs: (18) +#. Resource IDs: (272) msgid "Deletes files/folders from version control but keeps the file" -msgstr "從版本控制樹中刪除但保留檔案" +msgstr "刪除版本控制樹中的「檔案／資料夾」，但保留工作目錄中的檔案。" -#. Resource IDs: (198) +#. Resource IDs: (3159) msgid "Deletes the action log file" -msgstr "刪除動作紀錄" +msgstr "刪除動作日誌檔案" -#. Resource IDs: (263) +#. Resource IDs: (4202) msgid "Deleting" msgstr "正在刪除" -#. Resource IDs: (97) +#. Resource IDs: (1547) msgid "Deleting cached data" msgstr "正在刪除快取資料" -#. Resource IDs: (97) +#. Resource IDs: (1545) msgid "Deleting file" msgstr "正在刪除文件" -#. Resource IDs: (88) +#. Resource IDs: (1397) msgid "Deleting remote refs..." -msgstr "正在刪除遠端參考點 ..." +msgstr "正在刪除遠端參照．．．" #. Resource IDs: (65535) msgid "Delivery:" @@ -3791,15 +3836,15 @@ msgstr "Describe" msgid "Describe Strategy" msgstr "Describe 搜尋策略" -#. Resource IDs: (1002) +#. Resource IDs: (1368, 16031) msgid "Description" msgstr "描述" #. Resource IDs: (65535) msgid "Description:" -msgstr "描述:" +msgstr "描述：" -#. Resource IDs: (213) +#. Resource IDs: (3407) msgid "Deselect changelist" msgstr "取消選取變更列表" @@ -3807,33 +3852,33 @@ msgstr "取消選取變更列表" msgid "Destination" msgstr "目的目錄" -#. Resource IDs: (3859) +#. Resource IDs: (61730) msgid "Destination disk drive is full." msgstr "目的磁碟已滿." -#. Resource IDs: (2056) +#. Resource IDs: (32880) msgid "Detect and highlight moved blocks" msgstr "偵測並標示出移動過的區塊" -#. Resource IDs: (2050) +#. Resource IDs: (32793) msgid "Detect moved and copied lines from existing files at any commit" msgstr "偵測所有版本及檔案的移動的和複製的行" -#. Resource IDs: (2050) +#. Resource IDs: (32792) msgid "" "Detect moved and copied lines from existing files at the commit where the " "destination file has been created" msgstr "偵測在目標檔案建立的修訂中已存在的檔案的移動的和複製的行" -#. Resource IDs: (2050) +#. Resource IDs: (32791) msgid "Detect moved and copied lines from files modified in the same commit" msgstr "偵測同一修訂中檔案的移動和複製的行" -#. Resource IDs: (2050) +#. Resource IDs: (32790) msgid "Detect moved or copied lines within a file" msgstr "偵測檔案内移動或複製的行" -#. Resource IDs: (3849) +#. Resource IDs: (61583) msgid "" "Device Independent Bitmap\n" "a device independent bitmap" @@ -3847,13 +3892,17 @@ msgstr "視窗大小與位置" msgid "Dialogs" msgstr "視窗" +#. Resource IDs: (156) +msgid "Diff" +msgstr "" + #. Resource IDs: (1789) msgid "Diff Options" -msgstr "比對差異選項" +msgstr "比較差異選項" -#. Resource IDs: (22) +#. Resource IDs: (344) msgid "Diff Two Commits" -msgstr "比較兩個版本差異" +msgstr "比較兩個提交" #. Resource IDs: (192) msgid "Diff Viewer" @@ -3865,143 +3914,151 @@ msgstr "差異檢視器::合併工具" #. Resource IDs: (65535) msgid "Diff added lines" -msgstr "差異-新增行" +msgstr "差異－加入行" #. Resource IDs: (65535) msgid "Diff command" -msgstr "差異-命令" +msgstr "差異－命令" #. Resource IDs: (65535) msgid "Diff comment" -msgstr "差異-註解" +msgstr "差異－註解" #. Resource IDs: (65535) msgid "Diff file:" -msgstr "差異檔:" +msgstr "差異檔：" #. Resource IDs: (65535) msgid "Diff header" -msgstr "差異-標頭" +msgstr "差異－標頭" -#. Resource IDs: (15) +#. Resource IDs: (232) msgid "Diff later" -msgstr "稍後比對差異" +msgstr "設為比較基準" #. Resource IDs: (65535) msgid "Diff position" -msgstr "差異-位置" +msgstr "差異－位置" #. Resource IDs: (65535) msgid "Diff removed lines" -msgstr "差異-移除行" +msgstr "差異－移除行" -#. Resource IDs: (15) +#. Resource IDs: (234) #, c-format msgid "Diff with \"%s\"" -msgstr "與 \"%s\" 比對差異" +msgstr "比較至「%s」" -#. Resource IDs: (81) +#. Resource IDs: (1291) #, c-format msgid "Diff with parent %d" -msgstr "與父版本 %d 比對" +msgstr "與父版本 %d 比較" #. Resource IDs: (1302) msgid "Difference between" -msgstr "兩者之間的差異:" +msgstr "兩者之間的差異" #. Resource IDs: (1022) msgid "Diffing" msgstr "比較差異" -#. Resource IDs: (2054) +#. Resource IDs: (32851) msgid "Diffing commits" -msgstr "正在比對提交" +msgstr "正在比較提交" -#. Resource IDs: (14) +#. Resource IDs: (215) msgid "Diffs the working tree file with the one before the last commit" -msgstr "比較工作目錄檔案與前次送交版本的差異." +msgstr "比較工作目錄檔案與前次送交版本的差異" -#. Resource IDs: (22) +#. Resource IDs: (345) msgid "Diffs two any commits" -msgstr "比較任個兩個提交" +msgstr "比較任兩個提交" -#. Resource IDs: (71) +#. Resource IDs: (1131) msgid "Dir..." -msgstr "目錄(Dir)..." +msgstr "目錄..." #. Resource IDs: (65535) msgid "Directory:" -msgstr "目錄:" +msgstr "目錄：" #. Resource IDs: (1796) msgid "Disable sounds" msgstr "關閉音效" -#. Resource IDs: (195) +#. Resource IDs: (3116) msgid "" "Disable this option if you have really big working trees and experience\r\n" "too much disk access when browsing the working tree." -msgstr "如果你有很大的工作複本, 在瀏覽工作複本目錄時\r\n曾經發生過大量磁碟動作. 建議取消此選項." +msgstr "如果你有很大的工作複本，並且在瀏覽工作複本目錄時\n曾經發生過大量磁碟動作，則建議取消此選項。" -#. Resource IDs: (97) +#. Resource IDs: (1543) msgid "Disable update checks" msgstr "停用檢查更新" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "Disabled" -msgstr "己停用" +msgstr "已停用" -#. Resource IDs: (3867) +#. Resource IDs: (61869) #, c-format msgid "Disk full while accessing %1." msgstr "存取 %1 時磁碟已滿." -#. Resource IDs: (3860) +#. Resource IDs: (61745) #, c-format msgid "Dispatch exception: %1" -msgstr "分派異常: %1" +msgstr "分派異常：%1" #. Resource IDs: (65535) msgid "Display &buttons in this order" msgstr "依此次序顯示按鈕(&B)" -#. Resource IDs: (3601) +#. Resource IDs: (57609) msgid "" "Display full pages\n" "Print Preview" msgstr "顯示全部頁面\n預覽列印" -#. Resource IDs: (3605) +#. Resource IDs: (57669) msgid "" "Display help for clicked on buttons, menus and windows\n" "Help" msgstr "顯示點選的按鈕, 選單, 或視窗的說明\n說明" -#. Resource IDs: (3605) +#. Resource IDs: (57670) msgid "" "Display help for current task or command\n" "Help" msgstr "顯示目前工作或命令的說明\n說明" -#. Resource IDs: (3605) +#. Resource IDs: (57668) msgid "" "Display instructions about how to use help\n" "Help" msgstr "顯示如何使用說明\n說明" -#. Resource IDs: (3605) +#. Resource IDs: (57664) msgid "" "Display program information, version number and copyright\n" "About" msgstr "顯示檔案資訊, 版本號碼, 以及版權宣告\n關於" -#. Resource IDs: (86) +#. Resource IDs: (1075) +msgid "Display subject and body of commit messages" +msgstr "訊息欄位內容同時顯示「標題」和「內文」" + +#. Resource IDs: (1374) msgid "Do ¬ show me this warning again (if Continue is selected)" -msgstr "不要顯示這警告 (如果選擇繼續)" +msgstr "不再顯示該警告（如果選擇「繼續」）(&N)" -#. Resource IDs: (84) +#. Resource IDs: (1339) msgid "Do ¬ show me this warning again (if Ignore is selected)" -msgstr "不再顯示這警告(若忽略已選) (&N)" +msgstr "不再顯示該警告（如果選擇「忽略」）(&N)" + +#. Resource IDs: (1407) +msgid "Do not auto-select \"missing\" files (deleted, but unstaged)" +msgstr "不要自動選取「遺失」檔案（已從工作目錄中刪除，但未預存到索引中）" #. Resource IDs: (1669) msgid "Do not autoselect submodules" @@ -4009,90 +4066,107 @@ msgstr "不自動選擇子模組" #. Resource IDs: (65535) msgid "Do not show the context menu for the following paths:" -msgstr "在以下路徑中不顯示快顯式選單:" +msgstr "在以下路徑中不顯示快顯功能表：" #. Resource IDs: (1730) msgid "Do not use recycle bin" msgstr "不使用資源回收筒" -#. Resource IDs: (70) +#. Resource IDs: (1119) #, c-format msgid "Do you really want to delete %s?" msgstr "確定要 刪除 %s？" -#. Resource IDs: (1007) +#. Resource IDs: (16109) #, c-format msgid "Do you really want to delete the toolbar '%s'?" -msgstr "確定要刪除工具列 '%s' 嗎?" +msgstr "確定要刪除工具列 '%s' 嗎？" -#. Resource IDs: (97) +#. Resource IDs: (1544) msgid "" "Do you really want to disable automatic update checks for TortoiseGit?\r\n" "\r\n" "Automatic update checks can be re-enabled in TortoiseGit settings on the General page." -msgstr "你真的想要停用 TortoiseGit 的自動檢查更新?\r\n\r\n自動檢查更新可以在 TortoiseGit 的「一般」設定頁中被重新啟用" +msgstr "你真的想要停用 TortoiseGit 的自動檢查更新？\n\n自動檢查更新可以在 TortoiseGit 的「一般」設定頁中被重新啟用。" -#. Resource IDs: (88) +#. Resource IDs: (1392) msgid "Do you really want to mark the selected file(s) as assume-valid?" msgstr "確定要把已選的檔案標記為 assume-valid 嗎？" -#. Resource IDs: (88) +#. Resource IDs: (1393) msgid "Do you really want to mark the selected file(s) as skip-worktree?" msgstr "確定要把已選的檔案標記為 skip-worktree 嗎？" -#. Resource IDs: (145) +#. Resource IDs: (2312) msgid "Do you really want to move this file or folder?" -msgstr "確定要移動這個檔案或資料夾嗎?" +msgstr "確定要移動這個檔案或資料夾嗎？" -#. Resource IDs: (70) +#. Resource IDs: (1112) #, c-format msgid "" "Do you really want to permanently delete the %d selected refs? It can " "NOT be recovered!" -msgstr "確定要永久刪除已選的%d個參考點？這是不能恢復過來的！" +msgstr "確定要永久刪除這 %d 個所選的參照？這是無法還原的！" -#. Resource IDs: (71) +#. Resource IDs: (1568) +#, c-format +msgid "Do you really want to remove \"%s\" from the index?" +msgstr "確定要從索引中移除「%s」？" + +#. Resource IDs: (1128) #, c-format msgid "Do you really want to remove \"%s\"?" -msgstr "確定要移除 \"%s\"？" +msgstr "確定要移除「%s」？" -#. Resource IDs: (69) +#. Resource IDs: (1567) +#, c-format +msgid "" +"Do you really want to remove the %d selected files/directories from the " +"index?" +msgstr "確定要從索引中移除 %d 個「檔案／目錄」？" + +#. Resource IDs: (1566) +#, c-format +msgid "Do you really want to remove the %d selected files/directories?" +msgstr "確定要移除 %d 個「檔案／目錄」？" + +#. Resource IDs: (1089) msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." msgstr "確定要還原這複本？你會丟失所有改動" -#. Resource IDs: (119) +#. Resource IDs: (1890) #, c-format msgid "" "Do you really want to revert all changes in\n" "%s\n" "and go back to this revision? These changes will be reverted by reverse-merging the revisions into your working tree." -msgstr "確定要復原\n%s\n中的所有變更並回到這個版本? 這些變更將會反向合併至工作目錄." +msgstr "確定要復原\n%s\n中的所有變更並回到這個版本？這些變更將會反向合併至工作目錄。" -#. Resource IDs: (76) +#. Resource IDs: (1211) #, c-format msgid "" "Do you really want to revert all changes in\n" "%s\n" "which were made in this revision? These changes will be reverted by reverse-merging the revision into your working tree." -msgstr "確定要復原\n%s\n此版本的所有變更? 這些變更將會反向合併至工作目錄." +msgstr "確定要復原\n%s\n此版本的所有變更？這些變更將會反向合併至工作目錄。" -#. Resource IDs: (93) +#. Resource IDs: (1480) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" -msgstr "你要為所選檔案取消忽略本地變更旗標skip-worktree 或 assume-unchanged？" +msgstr "你要將所選取的檔案取消 skip-worktree 或 assume-unchanged 標記？" -#. Resource IDs: (86) +#. Resource IDs: (1372) msgid "Do you want to fetch remote branches from the newly added remote?" msgstr "你要從新增的遠端獲取遠端分支嗎？" -#. Resource IDs: (315) +#. Resource IDs: (5029) msgid "Do you want to load the changed files?" msgstr "要載入變更過的檔案嗎？" -#. Resource IDs: (319) +#. Resource IDs: (5100) #, c-format msgid "" "Do you want to mark the file\n" @@ -4100,50 +4174,50 @@ msgid "" "as resolved?" msgstr "確定要把衝突的檔案\n%s\n標記為已解決嗎？" -#. Resource IDs: (3887) +#. Resource IDs: (62182) msgid "Do you want to recover these auto-saved documents?" -msgstr "是否確定真的要回復自動儲存的文件?" +msgstr "是否確定真的要還原自動儲存的文件？" -#. Resource IDs: (313) +#. Resource IDs: (5007) msgid "" "Do you want to reload the documents to reflect the settings changes?\n" "Note: you will lose all changes you've made!" -msgstr "確定要重新載入文件以反映設定變更嗎?\n注意: 所有變更將不會儲存!" +msgstr "確定要重新載入文件以反映設定變更嗎？\n注意：所有變更將不會儲存！" -#. Resource IDs: (66) +#. Resource IDs: (1049) msgid "Do you want to see changes?" msgstr "要檢視變更嗎？" -#. Resource IDs: (604) +#. Resource IDs: (9654) msgid "Do you want to stash pop now?" msgstr "你現在想取出藏起嗎？" #. Resource IDs: (65535) msgid "Document :" -msgstr "文件 :" +msgstr "文件：" -#. Resource IDs: (75) +#. Resource IDs: (1194) #, c-format msgid "Don't know what will push because unknown branch \"%s\"" -msgstr "不知有什麼可以推送，因為不知名的分支 \"%s\"" +msgstr "不知有什麼可以推送，因為不知名的分支「%s」" -#. Resource IDs: (75) +#. Resource IDs: (1193) msgid "Don't know what will push because you enter URL" msgstr "不知有什麼可以推送，因為你輸入 URL" -#. Resource IDs: (3887) +#. Resource IDs: (62185) msgid "" "Don't recover the auto-saved documents\n" "Use the last explicitly saved versions of the documents" -msgstr "不回復自動儲存的文件\n使用最後一次手動儲存的版本" +msgstr "不還原自動儲存的文件\n使用最後一次手動儲存的版本" -#. Resource IDs: (315) +#. Resource IDs: (5036) msgid "" "Don't save\n" "Close the views without saving the modifications" msgstr "不儲存\n關閉視窗並且不儲存變更" -#. Resource IDs: (315) +#. Resource IDs: (5027) msgid "" "Don't save\n" "Reload the views without saving the modifications" @@ -4151,13 +4225,13 @@ msgstr "不儲存\n不儲存變更直接重新載入顯示" #. Resource IDs: (65535) msgid "Don't show the selected items: (press shift key to show them)" -msgstr "不顯示以下選取的項目: (加按 Shift 鍵可重新顯示它們)" +msgstr "不顯示以下選取的項目：（加按 Shift 鍵可重新顯示它們）" -#. Resource IDs: (73, 80) +#. Resource IDs: (1272) msgid "Don't show this message again" msgstr "不再顯示此訊息" -#. Resource IDs: (66, 602) +#. Resource IDs: (1040) msgid "Done" msgstr "完成" @@ -4169,7 +4243,7 @@ msgstr "向下" msgid "Download" msgstr "下載" -#. Resource IDs: (1002) +#. Resource IDs: (16028) msgid "Drag to make this menu float" msgstr "拖曳可使此選單浮動化" @@ -4179,7 +4253,7 @@ msgstr "繪圖" #. Resource IDs: (1073) msgid "Draw tag/branch labels on right side" -msgstr "在右面繪畫標籤/分支" +msgstr "將「標籤／分支」畫在訊息的右側" #. Resource IDs: (1079) msgid "Drive Types" @@ -4197,21 +4271,25 @@ msgstr "Dummy Button Form " msgid "Dumy Group For locat TabCtr" msgstr "Dumy Group For locat TabCtr" +#. Resource IDs: (1563) +msgid "E&dit unselected" +msgstr "編輯未選取的(&D)" + #. Resource IDs: (65535) msgid "E&xclude paths:" -msgstr "除外路徑(&X):" +msgstr "除外路徑(&X)：" #. Resource IDs: (105, 57665) msgid "E&xit" msgstr "離開(&X)" -#. Resource IDs: (9) +#. Resource IDs: (132) msgid "E&xport..." msgstr "匯出(&X)..." #. Resource IDs: (1097) msgid "E&xternal" -msgstr "外部(&x)" +msgstr "外部(&X)" #. Resource IDs: (303) msgid "EOL" @@ -4225,11 +4303,11 @@ msgstr "EUC-KR" msgid "Eastern European" msgstr "東歐" -#. Resource IDs: (1254, 1257, 1270) +#. Resource IDs: (156, 20056, 20110, 20306) msgid "Edit" msgstr "編輯" -#. Resource IDs: (84) +#. Resource IDs: (1341) msgid "Edit &global .gitconfig" msgstr "編輯全域 .gitconfig (&G)" @@ -4245,23 +4323,23 @@ msgstr "編輯 .tgitconfig" msgid "Edit Button Image" msgstr "編輯按鈕影像" -#. Resource IDs: (75, 1255) +#. Resource IDs: (1185, 20075) msgid "Edit Notes" msgstr "編輯備註" -#. Resource IDs: (1252) +#. Resource IDs: (20029) msgid "Edit author" msgstr "編輯作者" -#. Resource IDs: (86) +#. Resource IDs: (1369) msgid "Edit description" msgstr "編輯描述" -#. Resource IDs: (110) +#. Resource IDs: (1752) msgid "Edit extension specific diff program" -msgstr "編輯根據副檔名的差異比對程式" +msgstr "編輯該副檔名專用的比較差異程式" -#. Resource IDs: (110) +#. Resource IDs: (1753) msgid "Edit extension specific merge program" msgstr "編輯根據副檔名的合併程式" @@ -4273,13 +4351,13 @@ msgstr "編輯全域 .gitconfig (&O)" msgid "Edit global &XDG git/config" msgstr "編輯全域 &XDG git/config" -#. Resource IDs: (71) +#. Resource IDs: (1129) msgid "Edit local git config" msgstr "編輯本地 .git/config" -#. Resource IDs: (1254) +#. Resource IDs: (20052) msgid "Edit log message" -msgstr "編輯記錄訊息" +msgstr "編輯日誌訊息" #. Resource IDs: (1384) msgid "Edit s&ystemwide gitconfig" @@ -4291,31 +4369,31 @@ msgstr "編輯..." #. Resource IDs: (1827) msgid "Edit/Split commit" -msgstr "編輯/切分 提交" +msgstr "編輯／切分 提交" #. Resource IDs: (1770) msgid "Effective" msgstr "有效的" -#. Resource IDs: (79) +#. Resource IDs: (1251) msgid "Either the name or IP of the proxy server" msgstr "輸入 proxy 伺服器的 IP 或名稱" -#. Resource IDs: (1057) +#. Resource IDs: (16906) msgid "" "Ellipse Tools\n" "Ellipse" msgstr "橢圓工具\n橢圓" -#. Resource IDs: (1255) +#. Resource IDs: (20071) msgid "Email" msgstr "電郵" -#. Resource IDs: (602) +#. Resource IDs: (9623) msgid "Email Address To and CC can't empty at the same time." -msgstr "電郵地址及抄送地址不能同時留空" +msgstr "電郵地址及轉寄地址不能同時空白" -#. Resource IDs: (87) +#. Resource IDs: (1389) msgid "Emails" msgstr "電郵" @@ -4323,7 +4401,7 @@ msgstr "電郵" msgid "Empty" msgstr "空的" -#. Resource IDs: (156) +#. Resource IDs: (32976) msgid "Enable Edit" msgstr "啟用編輯" @@ -4339,18 +4417,22 @@ msgstr "啟用 Gravatar" msgid "Enable drag context menu" msgstr "啟用拖曳快顯功能表" -#. Resource IDs: (87) +#. Resource IDs: (1388) msgid "" "Enable loading/saving log cache files (tortoisegit.data, tortoisegit.index)" -msgstr "啟用載入/儲存記錄快取檔 (tortoisegit.data, tortoisegit.index)" +msgstr "啟用「載入／儲存」日誌快取檔（tortoisegit.data, tortoisegit.index）" #. Resource IDs: (1744) msgid "Enable log cache" -msgstr "啟用記錄快取" +msgstr "啟用日誌快取" -#. Resource IDs: (90) +#. Resource IDs: (1437) msgid "Enable showing Gravatar image in Log Dialog" -msgstr "啟用在記錄視窗顯示 Gravatar 影像" +msgstr "啟用在日誌視窗中顯示 Gravatar 影像" + +#. Resource IDs: (32806) +msgid "Enable syntax highlighting" +msgstr "啟用語法高亮顯示" #. Resource IDs: (65535) msgid "Enabled Overlay Handlers" @@ -4360,35 +4442,35 @@ msgstr "已啟用圖示覆蓋" msgid "Encode" msgstr "編碼" -#. Resource IDs: (300, 301) +#. Resource IDs: (300, 301, 1602) msgid "Encoding" msgstr "編碼" -#. Resource IDs: (3867) +#. Resource IDs: (61866) #, c-format msgid "Encountered a hardware I/O error while accessing %1." msgstr "存取 %1 時發生硬體 I/O 錯誤。" -#. Resource IDs: (3867) +#. Resource IDs: (61868) #, c-format msgid "Encountered a locking violation while accessing %1." msgstr "存取 %1 時發生鎖定錯誤。" -#. Resource IDs: (3867) +#. Resource IDs: (61867) #, c-format msgid "Encountered a sharing violation while accessing %1." msgstr "存取 %1 時發生共享錯誤。" -#. Resource IDs: (3843) +#. Resource IDs: (61477) msgid "Encountered an improper argument." msgstr "發現不正確的參數。" -#. Resource IDs: (3859) +#. Resource IDs: (61733) #, c-format msgid "Encountered an unexpected error while reading %1." msgstr "讀取 %1 時發生預期外的錯誤。" -#. Resource IDs: (3859) +#. Resource IDs: (61734) #, c-format msgid "Encountered an unexpected error while writing %1." msgstr "寫入 %1 時發生預期外的錯誤。" @@ -4401,35 +4483,35 @@ msgstr "加密" msgid "End" msgstr "結束" -#. Resource IDs: (252) +#. Resource IDs: (4016) msgid "End of Line Style" msgstr "行尾格式" -#. Resource IDs: (3825) +#. Resource IDs: (61187) msgid "Enlarge the window to full size" msgstr "將視窗放到最大" #. Resource IDs: (241) msgid "Enter Log Message" -msgstr "輸入紀錄訊息" +msgstr "輸入日誌訊息" -#. Resource IDs: (80) +#. Resource IDs: (1277) msgid "Enter URL" msgstr "輸入 URL" -#. Resource IDs: (3858) +#. Resource IDs: (61722) msgid "Enter a GUID." msgstr "請輸入 GUID。" -#. Resource IDs: (3858) +#. Resource IDs: (61721) msgid "Enter a currency." msgstr "請輸入貨幣。" -#. Resource IDs: (3858) +#. Resource IDs: (61720) msgid "Enter a date and/or time." msgstr "請輸入日期或時間。" -#. Resource IDs: (3858) +#. Resource IDs: (61724) msgid "Enter a date." msgstr "請輸入日期。" @@ -4437,90 +4519,90 @@ msgstr "請輸入日期。" msgid "Enter a name for the changelist:" msgstr "輸入此變更列表的名稱：" -#. Resource IDs: (3858) +#. Resource IDs: (61715) #, c-format msgid "Enter a number between %1 and %2." msgstr "請輸入介於 %1 與 %2 之間的數字。" -#. Resource IDs: (3858) +#. Resource IDs: (61713) msgid "Enter a number." msgstr "請輸入數字。" -#. Resource IDs: (3858) +#. Resource IDs: (61719) msgid "Enter a positive integer." msgstr "請輸入正整數。" -#. Resource IDs: (3858) +#. Resource IDs: (61723) msgid "Enter a time." msgstr "請輸入時間。" -#. Resource IDs: (3858) +#. Resource IDs: (61714) #, c-format msgid "Enter an integer between %1 and %2." msgstr "請輸入介於 %1 與 %2 之間的整數。" -#. Resource IDs: (3858) +#. Resource IDs: (61718) msgid "Enter an integer between 0 and 255." msgstr "請輸入介於 0 到 255 之間的整數。" -#. Resource IDs: (3858) +#. Resource IDs: (61712) msgid "Enter an integer." msgstr "請輸入整數。" #. Resource IDs: (65535) msgid "Enter file content to test for below:" -msgstr "輸入檔案內容以測試:" +msgstr "輸入檔案內容以測試：" #. Resource IDs: (1065) msgid "Enter log &message:" -msgstr "輸入紀錄訊息(&M)：" +msgstr "輸入日誌訊息(&M)：" -#. Resource IDs: (3858) +#. Resource IDs: (61716) #, c-format msgid "Enter no more than %1 characters." msgstr "請勿輸入超過 %1 個字。" #. Resource IDs: (65535) msgid "Enter the regex string below:" -msgstr "輸入 regex 指令:" +msgstr "輸入 regex 指令：" -#. Resource IDs: (3603) +#. Resource IDs: (57633) msgid "" "Erase everything\n" "Erase All" msgstr "清除全部\n清除全部" -#. Resource IDs: (3603) +#. Resource IDs: (57632) msgid "" "Erase the selection\n" "Erase" msgstr "清除選擇區\n清除" -#. Resource IDs: (82, 602) +#. Resource IDs: (1112, 1307, 2706) msgid "Error" msgstr "錯誤" -#. Resource IDs: (145) +#. Resource IDs: (2315) msgid "Error rebuilding Shell Icon Cache!" msgstr "建立圖示快取失敗！" -#. Resource IDs: (96) +#. Resource IDs: (1528) #, c-format msgid "Error validating server certificate for \"%s\":" -msgstr "\"%s\" 憑證錯誤訊息:" +msgstr "「%s」憑證錯誤訊息：" -#. Resource IDs: (70) +#. Resource IDs: (1110) #, c-format msgid "" "Error while reading/writing the registry key %s\n" "%s" -msgstr "讀寫登錄機碼時發生錯誤: %s\n%s" +msgstr "讀寫登錄機碼「%s」時發生錯誤： \n%s" -#. Resource IDs: (75) +#. Resource IDs: (1188) msgid "Everything updated." msgstr "全部已更新" -#. Resource IDs: (1002) +#. Resource IDs: (16023) msgid "" "Executable (*.exe)|*.exe|Command (*.com)|*.com|Information " "(*.pdf)|*.pdf|Batch (*.bat)|*.bat|All Files (*.*)|*.*||" @@ -4530,65 +4612,65 @@ msgstr "可執行檔 (*.exe)|*.exe|可執行檔 (*.com)|*.com|文件 (*.pdf)|*.p msgid "Executable (+x)" msgstr "可執行 (+x)" -#. Resource IDs: (1002) +#. Resource IDs: (16018) msgid "Existing" msgstr "已存在" -#. Resource IDs: (156) +#. Resource IDs: (2, 57665) msgid "Exit" msgstr "離開" -#. Resource IDs: (1002) +#. Resource IDs: (16025) #, c-format msgid "Expand (%s)" msgstr "展開 (%s)" -#. Resource IDs: (1001) +#. Resource IDs: (16012) msgid "Expand docked window" msgstr "展開停駐的視窗" -#. Resource IDs: (209) +#. Resource IDs: (3331) msgid "Explore to" msgstr "瀏覽至" -#. Resource IDs: (78, 229, 238) +#. Resource IDs: (238, 1233, 3659) msgid "Export" msgstr "匯出" #. Resource IDs: (1383) msgid "Export Zip File" -msgstr "匯出 zip 檔案:" +msgstr "匯出 zip 檔案" -#. Resource IDs: (94) +#. Resource IDs: (1501) msgid "Export directory:" msgstr "匯出目錄：" -#. Resource IDs: (1258) +#. Resource IDs: (20117) msgid "Export selection to..." msgstr "匯出選取範圍至..." -#. Resource IDs: (1254) +#. Resource IDs: (20062) msgid "Export this version..." msgstr "匯出這個版本..." -#. Resource IDs: (79) +#. Resource IDs: (1260) msgid "Export unversioned files too" msgstr "匯出無版本控制的檔案" -#. Resource IDs: (284) +#. Resource IDs: (4530) #, c-format msgid "Exporting %s" msgstr "正在匯出 %s" -#. Resource IDs: (79) +#. Resource IDs: (1261) msgid "Exporting..." -msgstr "正在匯出..." +msgstr "正在匯出．．．" -#. Resource IDs: (10) +#. Resource IDs: (145) msgid "Exports a revision to a zip file" msgstr "匯出修訂為zip檔案" -#. Resource IDs: (74, 207) +#. Resource IDs: (1178, 1380, 3308) msgid "Extension" msgstr "副檔名" @@ -4602,203 +4684,203 @@ msgstr "副檔名：" #. Resource IDs: (65535) msgid "Extern DLL Path:" -msgstr "外部的DLL路徑:" +msgstr "外部 DLL 路徑：" -#. Resource IDs: (74) +#. Resource IDs: (1171) msgid "External" msgstr "外部" #. Resource IDs: (65535) msgid "External Program:" -msgstr "外部程式:" +msgstr "外部程式：" -#. Resource IDs: (1070) +#. Resource IDs: (17113) msgid "Fade" msgstr "淡出" -#. Resource IDs: (65) +#. Resource IDs: (1039) msgid "Fail" msgstr "失敗" -#. Resource IDs: (74) +#. Resource IDs: (1175) msgid "Failed revert" msgstr "復原失敗" -#. Resource IDs: (1) +#. Resource IDs: (6) #, c-format msgid "Failed to checkout file \"%s\"" -msgstr "取出檔案 \"%s\" 失敗" +msgstr "取出檔案「%s」失敗" -#. Resource IDs: (69) +#. Resource IDs: (1095) #, c-format msgid "Failed to checkout file \"%s\" of revision %s to \"%s\"." -msgstr "取出檔案 \"%s\" 失敗，版本為 %s 至 %s" +msgstr "取出檔案「%s」失敗，版本為「%s」 至「%s」" -#. Resource IDs: (3865) +#. Resource IDs: (61825) msgid "" "Failed to connect.\n" "Link may be broken." -msgstr "無法連線.\n連接可能已經中斷." +msgstr "無法連線。\n連接可能已經中斷。" -#. Resource IDs: (3865) +#. Resource IDs: (61835) msgid "Failed to convert ActiveX object." msgstr "無法轉換 ActiveX 物件." -#. Resource IDs: (3857) +#. Resource IDs: (61700) msgid "Failed to create empty document." msgstr "無法建立空文件." -#. Resource IDs: (3865) +#. Resource IDs: (61839) msgid "" "Failed to create object. Make sure the application is entered in the system" " registry." msgstr "無法建立物件. 請確定系統登錄檔中有此應用程式." -#. Resource IDs: (72) +#. Resource IDs: (1151) msgid "Failed to create pull-request." msgstr "建立拉取要求失敗" -#. Resource IDs: (69) +#. Resource IDs: (1094) msgid "Failed to get base file." msgstr "取得基底檔案失敗" -#. Resource IDs: (69) +#. Resource IDs: (1093) msgid "Failed to get merge file." msgstr "取得合併檔案失敗" -#. Resource IDs: (3857) +#. Resource IDs: (61703) msgid "Failed to launch help." msgstr "無法啟動說明." -#. Resource IDs: (3865) +#. Resource IDs: (61830) msgid "Failed to launch server application." msgstr "無法啟動伺服器." -#. Resource IDs: (3857) +#. Resource IDs: (61697) msgid "Failed to open document." msgstr "開啟文件失敗." -#. Resource IDs: (3865) +#. Resource IDs: (61827) msgid "Failed to perform server operation." msgstr "無法完成伺服器作業." -#. Resource IDs: (3857) +#. Resource IDs: (61698) msgid "Failed to save document." msgstr "儲存文件失敗." -#. Resource IDs: (264) +#. Resource IDs: (4212) #, c-format msgid "Failed to set/remove changelist '%s'" -msgstr "無法設定/移除變更列表: '%s'" +msgstr "無法「設定／移除」變更列表：「%s」" -#. Resource IDs: (83) +#. Resource IDs: (1327) #, c-format msgid "" "Failed to start the issue tracker COM provider '%s'.\n" "%s" -msgstr "無法啟動Bug 追踪系統的 COM 提供者 '%s'.\n%s" +msgstr "無法啟動 Bug 追踪系統的 COM 提供者「%s」。\n%s" -#. Resource IDs: (72) +#. Resource IDs: (1148) msgid "Failed waiting for pageant to finish loading key." -msgstr "等待 pageant 完成載入鑰匙失敗" +msgstr "等待 pageant 完成載入鑰匙失敗。" -#. Resource IDs: (220) +#. Resource IDs: (3504) msgid "Failed!" -msgstr "失敗!" +msgstr "失敗！" -#. Resource IDs: (75) +#. Resource IDs: (1187, 9671) msgid "Fast Forward" -msgstr "直接遷移" +msgstr "快進" #. Resource IDs: (1484) msgid "Fast Forward o&nly" -msgstr "只限直接遷移(&N)" +msgstr "只限快進(&N)" -#. Resource IDs: (67) +#. Resource IDs: (1066) #, c-format msgid "Fast forward to %s" -msgstr "直接遷移至 %s" +msgstr "快進至 %s" -#. Resource IDs: (76) +#. Resource IDs: (1209) msgid "Fetc&h" msgstr "獲取(&H)" -#. Resource IDs: (22, 66) +#. Resource IDs: (350, 1053) msgid "Fetch" msgstr "獲取" -#. Resource IDs: (14) +#. Resource IDs: (1210) +msgid "Fetch && Re&base" +msgstr "獲取及變基(&B)" + +#. Resource IDs: (210) msgid "Fetch from SVN repository" -msgstr "從 SVN 獲取" +msgstr "從 SVN 版本庫獲取" -#. Resource IDs: (78) +#. Resource IDs: (1247) #, c-format msgid "Fetch from \"%s\"" -msgstr "從 \"%s\" 獲取" - -#. Resource IDs: (76) -msgid "Fetch&&Re&base" -msgstr "獲取及變基(&B)" +msgstr "從「%s」獲取" -#. Resource IDs: (20) +#. Resource IDs: (311) msgid "Fetch..." msgstr "獲取..." -#. Resource IDs: (1251) +#. Resource IDs: (20005) msgid "Fetching Status..." -msgstr "獲取狀態中..." +msgstr "獲取狀態中．．．" -#. Resource IDs: (81) +#. Resource IDs: (1295) msgid "Fetching changed files..." -msgstr "獲取變更的檔案中..." +msgstr "獲取變更的檔案中．．．" -#. Resource IDs: (313) +#. Resource IDs: (5003) msgid "Fetching file..." -msgstr "正在取得檔案..." +msgstr "正在取得檔案．．．" -#. Resource IDs: (313) +#. Resource IDs: (5004) #, c-format msgid "Fetching revision %s of file:" -msgstr "正在取得第 %s 版的:" +msgstr "正在取得版本 %s 檔案：" -#. Resource IDs: (63, 74, 77, 319, 1001) +#. Resource IDs: (1000, 1180, 1217, 5100, 16015) msgid "File" msgstr "檔案" -#. Resource IDs: (252) +#. Resource IDs: (4017) msgid "File Encoding" msgstr "檔案編碼" -#. Resource IDs: (605) +#. Resource IDs: (9664) #, c-format msgid "File changes each %s" msgstr "每%s修改次數" #. Resource IDs: (1138) msgid "File changes each week:" -msgstr "每週檔案變更:" +msgstr "每週檔案變更：" -#. Resource IDs: (376) +#. Resource IDs: (6002) msgid "File diffs" msgstr "檔案差異" -#. Resource IDs: (319) +#. Resource IDs: (5101) msgid "File has no conflicts" msgstr "檔案無衝突" -#. Resource IDs: (314) +#. Resource IDs: (5019) msgid "File is empty." msgstr "檔案是空的。" -#. Resource IDs: (213) +#. Resource IDs: (3404) msgid "File list is empty" msgstr "檔案列表是空的" -#. Resource IDs: (135, 376) +#. Resource IDs: (135, 6001) msgid "File patches" msgstr "檔案補綴" -#. Resource IDs: (7) +#. Resource IDs: (111) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4808,9 +4890,9 @@ msgid "" "Vertical Resolution:\t%.1f dpi\n" "Depth:\t\t\t%d bit\n" "Zoom:\t\t\t%d%%" -msgstr "檔案大小:\t\t%s (%s)\n寬度:\t\t\t%ld pixel\n高度:\t\t\t%ld pixel\n水平解析度:\t%.1f dpi\n垂直解析度:\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%" +msgstr "檔案大小：\t\t%s (%s)\n寬度：\t\t\t%ld pixel\n高度：\t\t\t%ld pixel\n水平解析度：\t\t%.1f dpi\n垂直解析度：\t\t%.1f dpi\n色深：\t\t\t%d bit\n比例：\t\t\t%d%%" -#. Resource IDs: (8) +#. Resource IDs: (112) #, c-format msgid "" "File size:\t\t%s (%s)\n" @@ -4828,9 +4910,9 @@ msgid "" "Vertical Resolution:\t%.1f dpi\n" "Depth:\t\t\t%d bit\n" "Zoom:\t\t\t%d%%" -msgstr "檔案大小:\t\t%s (%s)\n寬度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平解析度:\t%.1f dpi\n垂直解析度:\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%\n\n檔案大小:\t\t%s (%s)\n寬度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平解析度:\t%.1f dpi\n垂直解析度:\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%" +msgstr "檔案大小：\t\t%s (%s)\n寬度：\t\t\t%ld 像素\n高度：\t\t\t%ld 像素\n水平解析度：\t\t%.1f dpi\n垂直解析度：\t\t%.1f dpi\n色深：\t\t\t%d bit\n比例：\t\t\t%d%%\n\n檔案大小：\t\t%s (%s)\n寬度：\t\t\t%ld 像素\n高度：\t\t\t%ld 像素\n水平解析度：\t\t%.1f dpi\n垂直解析度：\t\t%.1f dpi\n色深：\t\t\t%d bit\n比例：\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (107) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4840,9 +4922,9 @@ msgid "" "Vertical Resolution:\t\t%.1f dpi\n" "Depth:\t\t\t%d bit\n" "Zoom:\t\t\t%d%%" -msgstr "檔案大小:\t\t\t%s (%s)\n寬度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平解析度:\t%.1f dpi\n垂直解析度:\t\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%" +msgstr "檔案大小：\t\t%s (%s)\n寬度：\t\t\t%ld 像素\n高度：\t\t\t%ld 像素\n水平解析度：\t\t%.1f dpi\n垂直解析度：\t\t%.1f dpi\n色深：\t\t\t%d bit\n比例：\t\t\t%d%%" -#. Resource IDs: (7) +#. Resource IDs: (108) #, c-format msgid "" "File size:\t\t\t%s (%s)\n" @@ -4860,9 +4942,9 @@ msgid "" "Vertical Resolution:\t\t%.1f dpi\n" "Depth:\t\t\t%d bit\n" "Zoom:\t\t\t%d%%" -msgstr "檔案大小:\t\t\t%s (%s)\n寬度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平解析度:\t%.1f dpi\n垂直解析度:\t\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%\n\n檔案大小:\t\t\t%s (%s)\n寬度:\t\t\t%ld 像素\n高度:\t\t\t%ld 像素\n水平解析度:\t%.1f dpi\n垂直解析度:\t\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%" +msgstr "檔案大小：\t\t%s (%s)\n寬度：\t\t\t%ld 像素\n高度：\t\t\t%ld 像素\n水平解析度:\t\t%.1f dpi\n垂直解析度:\t\t%.1f dpi\n色深:\t\t\t%d bit\n比例:\t\t\t%d%%\n\n檔案大小：\t\t%s (%s)\n寬度：\t\t\t%ld 像素\n高度：\t\t\t%ld 像素\n水平解析度：\t\t%.1f dpi\n垂直解析度：\t\t%.1f dpi\n色深：\t\t\t%d bit\n比例：\t\t\t%d%%" -#. Resource IDs: (208) +#. Resource IDs: (12, 3317) msgid "Filename" msgstr "檔案名稱" @@ -4870,17 +4952,17 @@ msgstr "檔案名稱" msgid "Files" msgstr "檔案" -#. Resource IDs: (1057) +#. Resource IDs: (16901) msgid "" "Fill Tool\n" "Fill" msgstr "填滿工具\n填滿" -#. Resource IDs: (116) +#. Resource IDs: (1850) msgid "Filter by" msgstr "過濾由" -#. Resource IDs: (321) +#. Resource IDs: (5120) msgid "Filter paths" msgstr "過濾路徑" @@ -4890,13 +4972,13 @@ msgstr "過濾器：" #. Resource IDs: (20090) msgid "Filter: " -msgstr "過濾器:" +msgstr "過濾器：" -#. Resource IDs: (139, 1269, 20100) +#. Resource IDs: (139, 20100, 57636) msgid "Find" msgstr "搜尋" -#. Resource IDs: (3603) +#. Resource IDs: (57636) msgid "" "Find the specified text\n" "Find" @@ -4904,63 +4986,63 @@ msgstr "搜尋指定文字\n搜尋" #. Resource IDs: (65535) msgid "Find:" -msgstr "搜尋:" +msgstr "搜尋：" -#. Resource IDs: (95) +#. Resource IDs: (1504) #, c-format msgid "Find: Can't find the text \"%s\"" -msgstr "搜尋: 找不到文字 \"%s\"" +msgstr "搜尋：找不到文字「%s」" -#. Resource IDs: (95) +#. Resource IDs: (1506) msgid "" "Find: First occurrence from the bottom found. Beginning of document reached." -msgstr "搜尋: 找到自文件結尾算起的第一筆. 已抵達文件開始." +msgstr "搜尋：找到自文件結尾算起的第一筆。已抵達文件開始。" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "Find: First occurrence from the top found. End of document reached." -msgstr "搜尋: 找到自文件開始的第一筆. 已抵達文件結尾" +msgstr "搜尋：找到自文件開始的第一筆。已抵達文件結尾。" #. Resource IDs: (65535) msgid "Fingerprints" msgstr "指紋" -#. Resource IDs: (67) +#. Resource IDs: (1071) msgid "Finish" msgstr "完成" -#. Resource IDs: (67) +#. Resource IDs: (1063) msgid "Finished rebasing." msgstr "完成變基" -#. Resource IDs: (77, 219) +#. Resource IDs: (1224, 3503) msgid "Finished!" -msgstr "完成!" +msgstr "完成！" -#. Resource IDs: (1126) +#. Resource IDs: (1451) msgid "First Parent" msgstr "第一個父節點" -#. Resource IDs: (119) +#. Resource IDs: (1897) msgid "First Parent Only" msgstr "只限第一個父節點" #. Resource IDs: (1617) msgid "First known &bad:" -msgstr "首個已知壞的版本(&B):" +msgstr "首個已知壞的版本(&B)：" #. Resource IDs: (32818) -msgid "Fit image &heights" -msgstr "符合影像高度(&H)" +msgid "Fit image &heights\tH" +msgstr "符合影像高度(&H)\tH" #. Resource IDs: (32817) -msgid "Fit image &widths" -msgstr "符合影像寬度(&W)" +msgid "Fit image &widths\tW" +msgstr "符合影像寬度(&W)\tW" #. Resource IDs: (1315) msgid "Floppy drives (A: B:)" -msgstr "軟磁碟機(A:B:)" +msgstr "軟磁碟機（A: B:）" -#. Resource IDs: (1002) +#. Resource IDs: (16016) msgid "Folder" msgstr "資料夾" @@ -4972,46 +5054,42 @@ msgstr "跟隨重新命名" msgid "Font" msgstr "字型" -#. Resource IDs: (3585) +#. Resource IDs: (57345) msgid "For Help, press F1. Scroll horizontally with Ctrl-Scrollwheel" msgstr "請按 F1 以取得說明. 使用 Ctrl-捲動可進行橫向捲動." -#. Resource IDs: (119) +#. Resource IDs: (1892) msgid "For complete history deselect 'Stop on copy/rename'" -msgstr "要列出完整歷程紀錄請勿選擇 '複製/重新命名時停止'" - -#. Resource IDs: (1521) -msgid "Force" -msgstr "強制" +msgstr "要列出完整歷程記錄請勿選擇「止於 複製／重新命名」" -#. Resource IDs: (82) +#. Resource IDs: (1301) msgid "" "Force creation of branch/tag - even if one with same name already exists." -msgstr "強制建立分支/標籤，即使已存在" +msgstr "強制建立「分支／標籤」，即使已存在。" -#. Resource IDs: (96) +#. Resource IDs: (1522) msgid "" "Force push only if the remote reference points to the same commit as the remote tracking branch.\n" "This can cause the remote repository to lose commits; use it with care.\n" "This option corresponds to the --force-with-lease git option." -msgstr "只在 遠端追蹤分支(origin\\XXX) 與 遠端分支(遠端版本庫裡的XXX分支) 都指向同一個提交時，才強制推送。\n這會導致遠端版本庫丟失提交，小心使用。\n這個選項對應到 git 選項 --force-with-lease。" +msgstr "只在 遠端追蹤分支(origin/XXX) 與 遠端分支(遠端版本庫裡的 XXX 分支) 都指向同一個提交時，才強制推送。\n這會導致遠端版本庫丟失提交，小心使用。\n這個選項對應到 git 選項 --force-with-lease。" -#. Resource IDs: (1796) +#. Resource IDs: (1523) msgid "" "Force push to the selected remote reference and override it without any safety checks.\n" "This can cause the remote repository to lose unseen commits; use it with care.\n" "This option corresponds to the --force git option." -msgstr "強制推送選取的遠端參考點並且沒有任何安全檢查地覆蓋它。\n這會導致遠端版本庫丟失沒被注意到的提交，小心使用。\n這個選項對應到 git 選項 --force。" +msgstr "強制推送選取的遠端參照並且沒有任何安全檢查地覆蓋它。\n這會導致遠端版本庫丟失沒被注意到的提交，小心使用。\n這個選項對應到 git 選項 --force。" -#. Resource IDs: (603) +#. Resource IDs: (9646) msgid "" "Force the rebase even if the current branch is a descendant of the commit you are rebasing onto. \r\n" "Normally the command will exit with the message \"Current branch is up to date\" in such a situation." -msgstr "儘管當前分支是你想變基到的後裔節點，也要強制變基。\n正常情况命令列印「現在分支已經最新(Current branch is up to date)」，然後退出。" +msgstr "儘管你想要變基的基準點是目前分支的後裔節點，也要強制變基。\n正常情况下該命令會列印「目前分支已是最新(Current branch is up to date)」，然後退出。" #. Resource IDs: (1796) msgid "Force: May discard" -msgstr "強制: 可能丟失" +msgstr "強制：可能丟失" #. Resource IDs: (65535) msgid "Foreground" @@ -5021,20 +5099,20 @@ msgstr "前景色" msgid "Format Patch" msgstr "建立補綴" -#. Resource IDs: (1255) +#. Resource IDs: (20068) msgid "Format Patch..." msgstr "建立電郵補綴..." -#. Resource IDs: (1064, 1257) +#. Resource IDs: (17021) msgid "Forward" msgstr "向前" -#. Resource IDs: (95) +#. Resource IDs: (1514) #, c-format msgid "Forward %d" msgstr "向前 %d" -#. Resource IDs: (68) +#. Resource IDs: (1074) msgid "" "Found an empty commit message. You have to enter one or rebase cannot " "proceed." @@ -5042,7 +5120,7 @@ msgstr "找到空白的提交訊息，請輸入提交訊息，否則不能繼續 #. Resource IDs: (65535) msgid "Found auto words:" -msgstr "找到 auto word:" +msgstr "找到 auto word：" #. Resource IDs: (1385, 1522, 65535) msgid "From" @@ -5050,7 +5128,7 @@ msgstr "由" #. Resource IDs: (1604) msgid "From &SVN Repository" -msgstr "從&SVN倉儲" +msgstr "從 &SVN 版本庫" #. Resource IDs: (32793) msgid "From &existing files" @@ -5062,13 +5140,13 @@ msgstr "從已修改的檔案(&M)" #. Resource IDs: (1603) msgid "From SVN Repository" -msgstr "從SVN倉儲" +msgstr "從 SVN 版本庫" -#. Resource IDs: (2054) +#. Resource IDs: (32863) msgid "From existing files" msgstr "從現有檔案" -#. Resource IDs: (2054) +#. Resource IDs: (32861) msgid "From modified files" msgstr "從已修改的檔案" @@ -5076,7 +5154,7 @@ msgstr "從已修改的檔案" msgid "From:" msgstr "由：" -#. Resource IDs: (1065) +#. Resource IDs: (17026) msgid "Full Screen" msgstr "全螢幕" @@ -5084,15 +5162,15 @@ msgstr "全螢幕" msgid "Full text search" msgstr "全文檢索" -#. Resource IDs: (19) +#. Resource IDs: (300) msgid "Fully recursive" msgstr "全部遞迴" #. Resource IDs: (65535) msgid "Further options for the commit dialog are on Dialogs 3 page." -msgstr "提交視窗的更多選項在視窗 3。" +msgstr "更多提交視窗的選項在視窗 3。" -#. Resource IDs: (92) +#. Resource IDs: (1461) msgid "G&ravatar" msgstr "G&ravatar" @@ -5100,24 +5178,24 @@ msgstr "G&ravatar" msgid "GB2312 (Simplified)" msgstr "GB2312 (簡體)" -#. Resource IDs: (273) +#. Resource IDs: (4360) msgid "GDI+ couldn't be initialized!" -msgstr "無法初始化 GDI+ !" +msgstr "無法初始化 GDI+！" -#. Resource IDs: (273) +#. Resource IDs: (4361) msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." -msgstr "GDI+ 無法建立點陣圖物件. 你可能沒有足夠的記憶體." +msgstr "GDI+ 無法建立點陣圖物件。你可能沒有足夠的記憶體。" -#. Resource IDs: (82) +#. Resource IDs: (1302) msgid "GPG signs the tag, see manual for details" msgstr "GPG 簽名標籤，請查閱手冊了解詳細資訊。" -#. Resource IDs: (284) +#. Resource IDs: (4532) msgid "Gathering information. Please wait..." -msgstr "正在取得資訊，請稍候..." +msgstr "正在取得資訊，請稍候．．．" -#. Resource IDs: (2054) +#. Resource IDs: (32852) msgid "Gathering statistics" msgstr "正在採集統計資料" @@ -5161,31 +5239,31 @@ msgstr "一般::對話視窗3" msgid "General::Set Extend Menu Item" msgstr "一般::擴展選單項目" -#. Resource IDs: (1254) +#. Resource IDs: (20050) msgid "Get merge logs" -msgstr "取得合併紀錄" +msgstr "取得合併日誌" -#. Resource IDs: (119) +#. Resource IDs: (1900) #, c-format msgid "Getting file %s" msgstr "正在取得檔案 %s" -#. Resource IDs: (120) +#. Resource IDs: (1906) #, c-format msgid "Getting file %s, revision %s" msgstr "正在取得檔案 %s，版本 %s" -#. Resource IDs: (120) +#. Resource IDs: (1905) msgid "Getting information..." -msgstr "正在取得資訊..." +msgstr "正在取得資訊．．．" -#. Resource IDs: (220) +#. Resource IDs: (3511) msgid "Getting required information..." -msgstr "正在取得必要資訊..." +msgstr "正在取得必要資訊．．．" -#. Resource IDs: (119) +#. Resource IDs: (1903) msgid "Getting unified diff" -msgstr "正在取得單一差異檔" +msgstr "正在取得統合式差異檔" #. Resource IDs: (4569) msgid "Git" @@ -5195,23 +5273,23 @@ msgstr "Git" msgid "Git Command Progress" msgstr "Git命令進度" -#. Resource IDs: (12) +#. Resource IDs: (178) msgid "Git Copy and add files to this WC" msgstr "Git 複製和加入檔案到工作複本" -#. Resource IDs: (16) +#. Resource IDs: (250) msgid "Git Copy and rename versioned item here" msgstr "Git 複製版本控制的項目到這裡並重新命名" -#. Resource IDs: (13) +#. Resource IDs: (198) msgid "Git Copy versioned item(s) here" msgstr "Git 複製版本控制的項目到這裡" -#. Resource IDs: (14) +#. Resource IDs: (219) msgid "Git Export all items here" msgstr "Git 匯出所有項目到這裡" -#. Resource IDs: (14) +#. Resource IDs: (218) msgid "Git Export versioned items here" msgstr "Git 匯出版本控制的項目到這裡" @@ -5219,35 +5297,35 @@ msgstr "Git 匯出版本控制的項目到這裡" msgid "Git Init" msgstr "Git 初始化" -#. Resource IDs: (79) +#. Resource IDs: (1248) msgid "Git Install Path" msgstr "Git 安裝路徑" -#. Resource IDs: (1270) +#. Resource IDs: (20307) msgid "Git Log" -msgstr "Git 記錄" +msgstr "Git 日誌" -#. Resource IDs: (17) +#. Resource IDs: (256) msgid "Git Move and rename versioned item here" msgstr "Git 移動版本控制的項目到這裡並重新命名" -#. Resource IDs: (12) +#. Resource IDs: (179) msgid "Git Move versioned item(s) here" msgstr "Git 移動版本控制的項目到這裡" -#. Resource IDs: (84) +#. Resource IDs: (1329) msgid "Git Remote Settings" msgstr "Git 遠端設定" -#. Resource IDs: (1260) +#. Resource IDs: (20157) msgid "Git Revision List" msgstr "Git 修訂列表" -#. Resource IDs: (22) +#. Resource IDs: (338) msgid "Git SVN DCommit" msgstr "Git SVN DCommit" -#. Resource IDs: (22) +#. Resource IDs: (336) msgid "Git SVN Rebase" msgstr "Git SVN Rebase" @@ -5259,42 +5337,42 @@ msgstr "Git同步" msgid "Git clone - TortoiseGit" msgstr "Git克隆 - TortoiseGit" -#. Resource IDs: (71) +#. Resource IDs: (1130) msgid "Git directory not set (see \"General\" settings page)." -msgstr "未設定 Git 目錄 (見 「一般」 設定頁)" +msgstr "未設定 Git 目錄（見 「一般」 設定頁）" #. Resource IDs: (65535) msgid "Git for Windows" msgstr "Git for Windows" -#. Resource IDs: (84) +#. Resource IDs: (1335) msgid "Git for Windows (https://msysgit.github.io/) not found." -msgstr "找不到 Git for Windows (https://msysgit.github.io/)" +msgstr "找不到 Git for Windows（https://msysgit.github.io/）。" -#. Resource IDs: (79) +#. Resource IDs: (1258) msgid "Git reported an error while creating a repository!\n" -msgstr "當建立倉儲時,Git報告錯誤\n" +msgstr "當建立版本庫時，Git 回報錯誤！\n" -#. Resource IDs: (2050) +#. Resource IDs: (32787) msgid "Git revision list contains the complete file history" msgstr "Git 版本列表包含完整的檔案歷史" -#. Resource IDs: (2049) +#. Resource IDs: (32782) msgid "Git revision list follows file renames" msgstr "Git 版本列表跟隨重新命名" -#. Resource IDs: (93) +#. Resource IDs: (1473) msgid "" "Git uses the concept of a hierarchical configuration.\n" "I.e. there are multiple levels; settings in higher levels override values in lower levels.\n" "The \"Effective\" tab shows you the effective values for the current scope (read-only).\n" "Select any level to see the values stored there.\n" "In order to change settings select a level, enter the values and select where to store to." -msgstr "Git 採用階層式組態的概念。\n即 有多層；在較高層的設定覆蓋較低層的。\n「有效的」 分頁顯示當前範圍的有效設定值(唯讀)。\n選擇任一層以檢視其設定值。\n要變更設定值，選擇該層，輸入新的值並選擇儲存到哪一層。" +msgstr "Git 採用階層式組態的概念。\n意即有多層；高層設定會覆蓋低層設定。\n「有效的」分頁顯示目前範圍的有效設定值（唯讀）。\n選擇任一層以檢視其設定值。\n要變更設定值，選擇該層，輸入新的值並選擇儲存到哪一層。" #. Resource IDs: (65535) msgid "Git.exe Path:" -msgstr "Git.exe 路徑:" +msgstr "Git.exe 路徑：" #. Resource IDs: (4591) msgid "Git::Credential" @@ -5304,7 +5382,7 @@ msgstr "Git::憑據" msgid "Git::Remote" msgstr "Git::遠端" -#. Resource IDs: (89) +#. Resource IDs: (1416, 1445, 1773) msgid "Global" msgstr "全域" @@ -5316,53 +5394,53 @@ msgstr "前往行數" msgid "Go to line" msgstr "前往行數" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "" "Go to the next conflict\n" "Next conflict" msgstr "跳至下一個衝突處\n下一衝突" -#. Resource IDs: (2049) +#. Resource IDs: (32779) msgid "" "Go to the next difference\n" "Next difference" msgstr "跳至下一個差異處\n下一差異" -#. Resource IDs: (2055) +#. Resource IDs: (32875) msgid "" "Go to the next inline difference\n" "Next inline difference" msgstr "跳至下一個行內差異處\n下一行內差異" -#. Resource IDs: (2051) +#. Resource IDs: (32802) msgid "" "Go to the previous conflict\n" "Previous conflict" msgstr "跳至前一個衝突處\n前一衝突" -#. Resource IDs: (2049) +#. Resource IDs: (32780) msgid "" "Go to the previous difference\n" "Previous difference" msgstr "跳至前一個差異處\n前一差異" -#. Resource IDs: (2055) +#. Resource IDs: (32876) msgid "" "Go to the previous inline difference\n" "Previous inline difference" msgstr "跳至上一個行內差異處\n上一行內差異" -#. Resource IDs: (156) +#. Resource IDs: (32893) msgid "Goto Line" msgstr "前往行數" -#. Resource IDs: (1251) +#. Resource IDs: (20000) msgid "Graph" msgstr "版本圖" #. Resource IDs: (1134) msgid "Graph type:" -msgstr "圖型類別:" +msgstr "圖型：" #. Resource IDs: (16972) msgid "Gray" @@ -5372,17 +5450,17 @@ msgstr "灰色" msgid "Greek" msgstr "希臘語" -#. Resource IDs: (1255) +#. Resource IDs: (20076) msgid "Group changelists" msgstr "變更列表分組" -#. Resource IDs: (1229) +#. Resource IDs: (1453) msgid "H&ide Unrelated Changed Paths" msgstr "隱藏無關的變動路徑(&H)" #. Resource IDs: (65535) msgid "H&ue:" -msgstr "色相(&U):" +msgstr "色相(&U)：" #. Resource IDs: (1353, 1354, 1511, 1684) msgid "HEAD" @@ -5390,21 +5468,21 @@ msgstr "HEAD" #. Resource IDs: (65535) msgid "HEAD:" -msgstr "HEAD:" +msgstr "HEAD：" -#. Resource IDs: (89) +#. Resource IDs: (1423) msgid "Hard" msgstr "Hard" #. Resource IDs: (1552) msgid "Hard: Reset working tree and index (discard all local changes)" -msgstr "Hard: 重設工作目錄和索引(放棄本地改動)" +msgstr "Hard：重設「工作目錄」和「索引」（放棄本地變更）" #. Resource IDs: (65535) msgid "Hebrew" msgstr "希伯來文" -#. Resource IDs: (9, 73) +#. Resource IDs: (9, 1152, 57670) msgid "Help" msgstr "說明" @@ -5428,11 +5506,11 @@ msgstr "Hex" msgid "Hide Menus for unversioned paths" msgstr "隱藏未版本控制路徑的選單" -#. Resource IDs: (71) +#. Resource IDs: (1135) msgid "Hide Patch<<" msgstr "隱藏補綴<<" -#. Resource IDs: (1001) +#. Resource IDs: (16011) msgid "Hide docked window" msgstr "隱藏停駐的視窗" @@ -5440,25 +5518,25 @@ msgstr "隱藏停駐的視窗" msgid "Hide the script while running" msgstr "隱藏執行中的指令檔" -#. Resource IDs: (95) +#. Resource IDs: (1517) msgid "Hide unchanged" msgstr "隱藏沒有變更的" -#. Resource IDs: (95, 1781) +#. Resource IDs: (1518, 1781) msgid "Hide unchanged refs in Ref Compare List" -msgstr "隱藏沒有變更的參考點在參考點比對列表" +msgstr "在參照比對列表中隱藏沒有變更的參照" -#. Resource IDs: (156) +#. Resource IDs: (32817) msgid "Hide/Show the patch file list" -msgstr "隱藏/顯示補綴檔列表" +msgstr "「隱藏／顯示」補綴檔列表" -#. Resource IDs: (2052) +#. Resource IDs: (32817) msgid "" "Hide/Show the patch file list\n" "Hides or shows the patch file list" -msgstr "隱藏/顯示補綴檔列表\n隱藏或顯示補綴檔案列表" +msgstr "「隱藏／顯示」補綴檔列表\n隱藏或顯示補綴檔案列表" -#. Resource IDs: (92) +#. Resource IDs: (1460) msgid "Hint" msgstr "提示" @@ -5466,41 +5544,41 @@ msgstr "提示" msgid "" "Hint: select the context menu, change the page to 'Commands' and drag the " "toolbar buttons into the menu window." -msgstr "小提示: 選擇快顯式選單, 切換至'命令'頁面, 再將工具列按鈕拖至選單視窗中." +msgstr "小提示：選擇快顯式選單，切換至「命令」頁面，再將工具列按鈕拖至選單視窗中。" -#. Resource IDs: (1064) +#. Resource IDs: (17022) msgid "Home" msgstr "Home" #. Resource IDs: (103) msgid "Hook Scripts" -msgstr "掛勾指令檔" +msgstr "掛鉤指令檔" #. Resource IDs: (4571) msgid "Hook Scripts::Issue Tracker Config" -msgstr "掛勾指令檔::Bug 追踪組態" +msgstr "掛鉤指令檔::Bug 追踪組態" #. Resource IDs: (283) msgid "Hook Scripts::Issue Tracker Integration" -msgstr "掛勾指令檔::Bug 追踪整合" +msgstr "掛鉤指令檔::Bug 追踪整合" -#. Resource IDs: (198) +#. Resource IDs: (3152) msgid "Hook Type" -msgstr "掛勾類型" +msgstr "掛鉤類型" #. Resource IDs: (1334) msgid "Hook Type:" -msgstr "掛勾類型:" +msgstr "掛鉤類型：" #. Resource IDs: (65535) msgid "I&nclude paths:" -msgstr "包含路徑(&N):" +msgstr "包含路徑(&N)：" #. Resource IDs: (1580) msgid "IBugTraqProvider" msgstr "IBugTraqProvider" -#. Resource IDs: (1251) +#. Resource IDs: (20007) msgid "ID" msgstr "ID" @@ -5508,55 +5586,56 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" -#. Accelerator Entry for Menu ID:32771; '&Exit' +#. Accelerator Entry for Menu ID:32771; '&Exit\tCtrl+W' msgid "ID:32771:V C +W" msgstr "ID:32771:V C +W" -#. Accelerator Entry for Menu ID:32772; '&Overlay images' +#. Accelerator Entry for Menu ID:32772; '&Overlay images\tO' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" -#. Accelerator Entry for Menu ID:32773; '&Open' +#. Accelerator Entry for Menu ID:32773; '&Open...\tCtrl+O' msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" -#. Accelerator Entry for Menu ID:32773; 'Save &as' +#. Accelerator Entry for Menu ID:32773; 'Save &as...\tCtrl+Shift+S' msgid "ID:32773:V CS+S" msgstr "ID:32773:V CS+S" -#. Accelerator Entry for Menu ID:32774; '&Open' +#. Accelerator Entry for Menu ID:32774; '&Open...\tCtrl+O' msgid "ID:32774:V C +O" msgstr "ID:32774:V C +O" -#. Accelerator Entry for Menu ID:32774; '&Whitespaces' +#. Accelerator Entry for Menu ID:32774; 'Show Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" -#. Accelerator Entry for Menu ID:32775; 'Single/&double-pane view' +#. Accelerator Entry for Menu ID:32775; 'Switch between single and double pane +#. view' msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" -#. Accelerator Entry for Menu ID:32776; '&Save' +#. Accelerator Entry for Menu ID:32776; '&Save\tCtrl+S' msgid "ID:32776:V C +S" msgstr "ID:32776:V C +S" -#. Accelerator Entry for Menu ID:32778; '&Fit images in window' +#. Accelerator Entry for Menu ID:32778; '&Fit images in window\tF' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" -#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size' +#. Accelerator Entry for Menu ID:32779; 'Ori&ginal size\tS' msgid "ID:32779:V +S" msgstr "ID:32779:V +S" -#. Accelerator Entry for Menu ID:32782; '&Print' +#. Accelerator Entry for Menu ID:32782; '&Print...\tCtrl+P' msgid "ID:32782:V C +P" msgstr "ID:32782:V C +P" -#. Accelerator Entry for Menu ID:32787; '' +#. Accelerator Entry for Menu ID:32787; '&Find\tCtrl+F' msgid "ID:32787:V C +F" msgstr "ID:32787:V C +F" -#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' +#. Accelerator Entry for Menu ID:32793; 'Arrange &vertical\tV' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5564,15 +5643,15 @@ msgstr "ID:32793:V C +V" msgid "ID:32794:V C +R" msgstr "ID:32794:V C +R" -#. Accelerator Entry for Menu ID:32811; '' +#. Accelerator Entry for Menu ID:32811; 'Switch left and right view' msgid "ID:32811:V C +U" msgstr "ID:32811:V C +U" -#. Accelerator Entry for Menu ID:32817; 'Fit image &widths' +#. Accelerator Entry for Menu ID:32817; 'Fit image &widths\tW' msgid "ID:32817:V +W" msgstr "ID:32817:V +W" -#. Accelerator Entry for Menu ID:32818; 'Fit image &heights' +#. Accelerator Entry for Menu ID:32818; 'Fit image &heights\tH' msgid "ID:32818:V +H" msgstr "ID:32818:V +H" @@ -5596,7 +5675,7 @@ msgstr "ID:32837:VA +M" msgid "ID:32857:VA +F" msgstr "ID:32857:VA +F" -#. Accelerator Entry for Menu ID:32870; '' +#. Accelerator Entry for Menu ID:32870; 'Collapse' msgid "ID:32870:V C +L" msgstr "ID:32870:V C +L" @@ -5604,7 +5683,7 @@ msgstr "ID:32870:V C +L" msgid "ID:32873:V C +E" msgstr "ID:32873:V C +E" -#. Accelerator Entry for Menu ID:32881; '' +#. Accelerator Entry for Menu ID:32881; 'Wrap long lines' msgid "ID:32881:V C +P" msgstr "ID:32881:V C +P" @@ -5612,7 +5691,7 @@ msgstr "ID:32881:V C +P" msgid "ID:32883:V C +A" msgstr "ID:32883:V C +A" -#. Accelerator Entry for Menu ID:32893; '' +#. Accelerator Entry for Menu ID:32893; 'Goto Line' msgid "ID:32893:V C +G" msgstr "ID:32893:V C +G" @@ -5620,16 +5699,16 @@ msgstr "ID:32893:V C +G" msgid "ID:32976:V C +E" msgstr "ID:32976:V C +E" -#. Accelerator Entry for Menu ID:57601; '&Open' +#. Accelerator Entry for Menu ID:57601; 'Open' #. Accelerator Entry for Menu ID:57601; '&Open...\tCtrl+O' msgid "ID:57601:V C +O" msgstr "ID:57601:V C +O" -#. Accelerator Entry for Menu ID:57603; '&Save' +#. Accelerator Entry for Menu ID:57603; 'Save' msgid "ID:57603:V C +S" msgstr "ID:57603:V C +S" -#. Accelerator Entry for Menu ID:57604; 'Save &As...' +#. Accelerator Entry for Menu ID:57604; 'Save &as...' msgid "ID:57604:V CS+S" msgstr "ID:57604:V CS+S" @@ -5640,17 +5719,17 @@ msgid "ID:57634:V C +C" msgstr "ID:57634:V C +C" #. Accelerator Entry for Menu ID:57635; '' -#. Accelerator Entry for Menu ID:57635; 'Cu&t\tCtrl+X' +#. Accelerator Entry for Menu ID:57635; '' msgid "ID:57635:V C +X" msgstr "ID:57635:V C +X" -#. Accelerator Entry for Menu ID:57636; '&Find' +#. Accelerator Entry for Menu ID:57636; 'Find' #. Accelerator Entry for Menu ID:57636; '&Find\tCtrl+F' msgid "ID:57636:V C +F" msgstr "ID:57636:V C +F" -#. Accelerator Entry for Menu ID:57637; '' -#. Accelerator Entry for Menu ID:57637; '' +#. Accelerator Entry for Menu ID:57637; '&Paste' +#. Accelerator Entry for Menu ID:57637; '&Paste' msgid "ID:57637:V C +V" msgstr "ID:57637:V C +V" @@ -5662,7 +5741,7 @@ msgstr "ID:57643:V C +Z" msgid "ID:57665:V C +Q" msgstr "ID:57665:V C +Q" -#. Accelerator Entry for Menu ID:57665; '' +#. Accelerator Entry for Menu ID:57665; 'E&xit' msgid "ID:57665:V C +W" msgstr "ID:57665:V C +W" @@ -5726,7 +5805,7 @@ msgstr "ISO 8859-8" msgid "ISO 8859-9" msgstr "ISO 8859-9" -#. Resource IDs: (106) +#. Resource IDs: (106, 65535) msgid "Icon Overlays" msgstr "圖示覆蓋" @@ -5738,7 +5817,7 @@ msgstr "圖示覆蓋::圖示集" msgid "Icon Overlays::Overlay Handlers" msgstr "圖示覆蓋::覆蓋處理程式" -#. Resource IDs: (92) +#. Resource IDs: (1465) msgid "" "Icons (*.ico, *.jpg, *.png, *.bmp, " "*.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" @@ -5746,76 +5825,76 @@ msgstr "圖示 (*.ico, *.jpg, *.png, *.bmp, *.gif)|*.ico;*.jpg;*.jpeg;*.png;*.bm #. Resource IDs: (65535) msgid "Icons/Design/Code:\t\tLuebbe Onken" -msgstr "圖示/設計/程式:\t\tLuebbe Onken" +msgstr "圖示／設計／程式：\t\tLuebbe Onken" -#. Resource IDs: (97) +#. Resource IDs: (1537) msgid "Identical" msgstr "一致的" -#. Resource IDs: (194) +#. Resource IDs: (3101) msgid "" "If activated, prevents the overlays and the context menu from showing in " "'save as...' or 'open' dialogs" -msgstr "如果選了這項，在“另存為...”或“開啟”對話視窗中不顯示覆蓋圖示和上下文功能表。" +msgstr "如果啟用，在「另存新檔」或「開啟舊檔」對話視窗中不顯示覆蓋圖示和快顯功能表。" -#. Resource IDs: (85) +#. Resource IDs: (1348) msgid "" "If checked --track is passed to git, if unchecked --no-track is passed to " "git, else neither --track nor --no-track is passed to git (see help)." -msgstr "若選取則把 --track 傳給 git；若不選取則把 --no-track 傳給 git；否則兩者都不傳給 git" +msgstr "如果啟用則把 --track 傳給 git；如果不啟用則把 --no-track 傳給 git；否則兩者都不傳給 git" -#. Resource IDs: (197) +#. Resource IDs: (3142) msgid "" "If checked, double-clicking on a revision in the log list compares it with " "the previous revision" -msgstr "如果選中該項，可以在記錄列表中的一個版本上雙擊，與其比較" +msgstr "如果啟用，可以在日誌列表中的一個版本上雙擊與其前一版比較" -#. Resource IDs: (196) +#. Resource IDs: (3134) msgid "" "If checked, the commit dialog will be started again automatically after an error,\r\n" "while preserving your last selection and log message." -msgstr "勾選此選項時, 在送交中發生錯誤後, 會自動重新顯示送交視窗,\r\n並保留先前的選項與送交訊息." +msgstr "如果啟用，在提交中發生錯誤後，會自動重新顯示提交視窗，\n並保留先前的選項與日誌訊息。" -#. Resource IDs: (194) +#. Resource IDs: (3100) msgid "" "If enabled, TortoiseGit checks once a week if a newer version is available" -msgstr "啟用時, TortoiseGit 每週會檢查一次最新版本" +msgstr "啟用時，TortoiseGit 每週會檢查一次最新版本。" -#. Resource IDs: (197) +#. Resource IDs: (3138) msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" -msgstr "啟用時, 工作目錄中設定為除外的資料夾\n仍然會顯示 '正常' 狀態的覆蓋圖示." +msgstr "啟用時，工作目錄中設定為除外的資料夾\n仍然會顯示「正常」狀態的覆蓋圖示。" -#. Resource IDs: (196) +#. Resource IDs: (3121) msgid "" "If set, files inside unversioned folders can be shown in the status control.\r\n" "The status control is used for example in the commit dialog." -msgstr "設定此選項時, 位於無版本控制目錄下的檔案也會在狀態中顯示.\r\n在提交視窗中就會用到這個功能." +msgstr "設定此選項時，位於無版本控制目錄下的檔案也會在狀態中顯示。\r\n例如在提交視窗中就會用到這個功能。" -#. Resource IDs: (196) +#. Resource IDs: (3133) msgid "" "If set, then unversioned files will mark the status of the parent directory as modified\r\n" "i.e. they get the modified overlay icon." -msgstr "設定此選項時, 含有無版本控制的檔案會使上層的資料夾顯示為已修改\r\n也就是會顯示已修改的圖示." +msgstr "設定此選項時，含有無版本控制的檔案會使上層的資料夾被標記為已修改\n也就是會顯示已修改的圖示。" #. Resource IDs: (1654) msgid "" "If you plan to work inside this folder, leave this unchecked. Typically a " "bare repo can only have changes 'pushed' to it. (By convention, a bare repo " "folder should have a name that ends with '.git')" -msgstr "如果你計劃在這個目錄工作，不選要選此項。典型的純倉儲僅用於推送。(一般純倉儲使用'.git'結尾)。" +msgstr "如果你打算在這個目錄內作業，請不要勾選此項。典型的純版本庫只用來被推送變更。（按照慣例，純版本庫的資料夾名稱應該以「.git」結尾）。" -#. Resource IDs: (73) +#. Resource IDs: (4577) msgid "Ignore" msgstr "忽略" -#. Resource IDs: (14) +#. Resource IDs: (220) #, c-format msgid "Ignore %d items by &extension" -msgstr "依副檔名忽略 %d 項(&E)" +msgstr "依副檔名忽略 %d 個項目(&E)" -#. Resource IDs: (156) +#. Resource IDs: (32896) msgid "Ignore Comments" msgstr "忽略註解" @@ -5825,17 +5904,17 @@ msgstr "忽略檔案" #. Resource IDs: (1686) msgid "Ignore Type" -msgstr "忽略類別" +msgstr "忽略類型" -#. Resource IDs: (94) +#. Resource IDs: (1491) msgid "Ignore all space" msgstr "忽略所有空格" -#. Resource IDs: (156) +#. Resource IDs: (32873) msgid "Ignore all whitespace changes" msgstr "無視所有空白字元變更" -#. Resource IDs: (94) +#. Resource IDs: (1492) msgid "Ignore blank lines" msgstr "忽略空白行" @@ -5843,7 +5922,7 @@ msgstr "忽略空白行" msgid "Ignore case cha&nges" msgstr "無視大小寫變更(&N)" -#. Resource IDs: (315) +#. Resource IDs: (5032) msgid "" "Ignore changes\n" "Ignore the outside changes." @@ -5861,11 +5940,11 @@ msgstr "遞迴地忽略項目" msgid "Ignore line &endings (recommended)" msgstr "(建議)忽略換行CRLF符號(&E)" -#. Resource IDs: (94) +#. Resource IDs: (1489) msgid "Ignore space at EOL" msgstr "忽略行末空白字元" -#. Resource IDs: (94) +#. Resource IDs: (1490) msgid "Ignore space change" msgstr "忽略空格變更" @@ -5873,29 +5952,29 @@ msgstr "忽略空格變更" msgid "Ignore whitespace" msgstr "忽略空白字元" -#. Resource IDs: (156) +#. Resource IDs: (32872) msgid "Ignore whitespace changes" msgstr "忽略空白字元變更" -#. Resource IDs: (2050) +#. Resource IDs: (32786) msgid "Ignore whitespace when comparing the parents version and the child's " msgstr "比較父版本時忽略空白" -#. Resource IDs: (1432) +#. Resource IDs: (1432, 20109) msgid "Ignored" msgstr "忽略" -#. Resource IDs: (78) +#. Resource IDs: (1239) msgid "Ignored Files" msgstr "忽略的檔案" -#. Resource IDs: (2055) +#. Resource IDs: (32873) msgid "" "Ignores all whitespace changes when diffing\n" "Ignore all whitespace changes" msgstr "忽略所有空白字元的變更\n忽略所有空白字元的變更" -#. Resource IDs: (2055) +#. Resource IDs: (32872) msgid "" "Ignores changes in whitespaces when diffing\n" "Ignore whitespace changes" @@ -5913,48 +5992,48 @@ msgstr "影像與文字(&A)" msgid "Images" msgstr "影像" -#. Resource IDs: (19) +#. Resource IDs: (301) msgid "Immediate children, including folders" msgstr "第一層檔案與目錄" -#. Resource IDs: (77) +#. Resource IDs: (1226) msgid "Import" msgstr "匯入" -#. Resource IDs: (229) +#. Resource IDs: (3651) #, c-format msgid "Import %s to %s%s" msgstr "匯入 %s 至 %s%s" -#. Resource IDs: (22, 329) +#. Resource IDs: (329, 343) msgid "Import SVN Ignore" msgstr "匯入SVN 忽略" -#. Resource IDs: (22) +#. Resource IDs: (342) msgid "Import SVN Ignore ..." msgstr "匯入 SVN 忽略.." #. Resource IDs: (1640) msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" -msgstr "匯入 SVN 忽略檔到 .git/info/exclude (覆寫這檔案)" +msgstr "匯入 SVN 忽略檔到 .git/info/exclude （檔案將被覆寫）" -#. Resource IDs: (120) +#. Resource IDs: (1907) #, c-format msgid "Importing file %s" msgstr "正在匯入檔案 %s" -#. Resource IDs: (75) +#. Resource IDs: (1196) msgid "In ChangeList" msgstr "在變更列表" -#. Resource IDs: (75) +#. Resource IDs: (1195) msgid "In Commits" msgstr "輸入的提交" #. Resource IDs: (1649) msgid "In order to abort a merge progess a reset (to HEAD) is needed." -msgstr "為了放棄合併過程，需要重置(至 HEAD)。" +msgstr "為了中止合併程序，需要重設（至 HEAD）。" #. Resource IDs: (1499) msgid "Include &Tags" @@ -5970,26 +6049,26 @@ msgstr "在分支下拉選單中顯示 FETCH_HEAD" #. Resource IDs: (65535) msgid "Include only the following revision range:" -msgstr "只包括以下版本範圍" +msgstr "只包括以下版本範圍：" -#. Resource IDs: (3857) +#. Resource IDs: (61696) msgid "Incorrect filename." -msgstr "檔案名稱錯誤." +msgstr "不正確的檔名。" -#. Resource IDs: (76) +#. Resource IDs: (1205) msgid "Initial import" msgstr "初次匯入" -#. Resource IDs: (87) +#. Resource IDs: (1386) #, c-format msgid "Initialized empty Git repository in %s." -msgstr "已在 %s 初始化 Git 檔案庫" +msgstr "已在 %s 初始化 Git 版本庫。" -#. Resource IDs: (156) +#. Resource IDs: (32889) msgid "Inline diff" msgstr "行內差異" -#. Resource IDs: (156) +#. Resource IDs: (32825) msgid "Inline diff word-wise" msgstr "行內逐字比較差異" @@ -6001,38 +6080,38 @@ msgstr "行內差異" msgid "Input" msgstr "輸入" -#. Resource IDs: (3603) +#. Resource IDs: (57637) msgid "" "Insert Clipboard contents\n" "Paste" msgstr "插入剪貼簿內容\n貼上" -#. Resource IDs: (3857) +#. Resource IDs: (61706) msgid "Insufficient memory to perform operation." msgstr "記憶體不足, 無法完成作業." -#. Resource IDs: (3857) +#. Resource IDs: (61704) msgid "Internal application error." msgstr "內部程式錯誤." -#. Resource IDs: (3850) +#. Resource IDs: (61592) msgid "Invalid Currency." msgstr "不正確的貨幣." -#. Resource IDs: (82) +#. Resource IDs: (1304) msgid "Invalid revision number!" -msgstr "錯誤的版本編號!" +msgstr "無效的版本編號！" #. Resource IDs: (65535) msgid "Issuer:" -msgstr "發送者" +msgstr "發送者：" -#. Resource IDs: (145) +#. Resource IDs: (2310) msgid "" "It is not possible to rename a file by changing the case of its name alone.\n" "For example, you can't make MyFile.txt become MYFILE.txt.\n" "Please consult the documentation for a way to work around this limitation." -msgstr "僅修改檔名大小寫並不能修改檔名.\n例如, 不能把 MyFile.txt 改名為 MYFILE.txt.\n請查詢文件中關於此項限制的暫時解法." +msgstr "重新命名時無法只修改檔名大小寫。\n例如：不能把 MyFile.txt 重新命名為 MYFILE.txt。\n請查詢文件中關於此項限制的暫時解法。" #. Resource IDs: (1074) msgid "J&ump to first conflict when loading" @@ -6050,7 +6129,7 @@ msgstr "KOI8-R" msgid "KOI8-U" msgstr "KOI8-U" -#. Resource IDs: (92) +#. Resource IDs: (1468) msgid "Keep" msgstr "保留" @@ -6058,11 +6137,11 @@ msgstr "保留" msgid "Keep changelists" msgstr "保留變更列表" -#. Resource IDs: (65) +#. Resource IDs: (1032) msgid "Keep file locally?" msgstr "保留檔案在本地？" -#. Resource IDs: (316) +#. Resource IDs: (5049) msgid "" "Keep resolving\n" "Jump to first unresolved conflict" @@ -6074,9 +6153,9 @@ msgstr "鍵盤" #. Resource IDs: (65535) msgid "Keyboard shortcuts:" -msgstr "鍵盤捷徑:" +msgstr "鍵盤捷徑：" -#. Resource IDs: (1002) +#. Resource IDs: (16030) msgid "Keys" msgstr "按鍵" @@ -6118,59 +6197,83 @@ msgstr "列8" #. Resource IDs: (65535) msgid "Language:" -msgstr "語系:" +msgstr "語系：" + +#. Resource IDs: (1574) +#, c-format +msgid "Last %s commit(s)" +msgstr "最新 %s 個提交" + +#. Resource IDs: (1571) +#, c-format +msgid "Last %s month(s)" +msgstr "最近 %s 個月" + +#. Resource IDs: (1570) +#, c-format +msgid "Last %s week(s)" +msgstr "最近 %s 個星期" + +#. Resource IDs: (1572) +#, c-format +msgid "Last %s year(s)" +msgstr "最近 %s 年" -#. Resource IDs: (85) +#. Resource IDs: (1350) msgid "Last Author" msgstr "上一個作者" -#. Resource IDs: (68) +#. Resource IDs: (1076) msgid "Last Commit" msgstr "上次提交" -#. Resource IDs: (86) +#. Resource IDs: (1364) msgid "Last Modified" msgstr "最後修改" -#. Resource IDs: (65535) +#. Resource IDs: (11030) msgid "Last Modified:" -msgstr "上次修改:" +msgstr "上次修改：" #. Resource IDs: (1616) msgid "Last known &good:" -msgstr "最後已知好的版本(&G):" +msgstr "最後已知良好版本(&G)：" -#. Resource IDs: (12) +#. Resource IDs: (1578) +msgid "Last selected date" +msgstr "最後選擇的日期" + +#. Resource IDs: (187) msgid "Launches the external diff/merge program to solve the conflicts" -msgstr "啟動外部差異比對/合併程式處理衝突" +msgstr "啟動外部「比較差異／合併」程式處理衝突" #. Resource IDs: (1137) msgid "Least active author:" -msgstr "最不活躍作者:" +msgstr "最不活躍作者：" -#. Resource IDs: (319) +#. Resource IDs: (5103) msgid "" "Leave as conflicted\n" "The conflict status of the file is kept" msgstr "保留衝突狀態\n保留檔案的衝突狀態" -#. Resource IDs: (252) +#. Resource IDs: (4020) msgid "Leave only marked blocks" msgstr "只保留已標記區塊" -#. Resource IDs: (188) +#. Resource IDs: (3003) msgid "Left View: " -msgstr "左側檢視:" +msgstr "左側檢視：" #. Resource IDs: (65535) msgid "Left image" msgstr "左側影像" -#. Resource IDs: (246) +#. Resource IDs: (3932) msgid "Line Graph" msgstr "直線圖" -#. Resource IDs: (1057) +#. Resource IDs: (16904) msgid "" "Line Tool\n" "Line" @@ -6184,48 +6287,48 @@ msgstr "單行差異列" msgid "Line differences" msgstr "單行差異" -#. Resource IDs: (176) +#. Resource IDs: (2810) #, c-format msgid "Line moved from line %ld" msgstr "從行 %ld 移動了的行" -#. Resource IDs: (176) +#. Resource IDs: (2811) #, c-format msgid "Line moved to line %ld" msgstr "移動至行 %ld" #. Resource IDs: (65535) msgid "Line width" -msgstr "線寬度" +msgstr "線寬" #. Resource IDs: (65535) msgid "Line:" -msgstr "行:" +msgstr "行：" -#. Resource IDs: (269) +#. Resource IDs: (4300) #, c-format msgid "Line: %*ld" -msgstr "行: %*ld" +msgstr "行：%*ld" -#. Resource IDs: (64, 601) +#. Resource IDs: (1011, 9603) msgid "Lines added" -msgstr "增加的行" +msgstr "加入的行" -#. Resource IDs: (64, 601) +#. Resource IDs: (1012, 9604) msgid "Lines removed" msgstr "移除的行" -#. Resource IDs: (3605) +#. Resource IDs: (57667) msgid "" "List Help topics\n" "Help Topics" msgstr "列出說明主題\n說明主題" -#. Resource IDs: (85) +#. Resource IDs: (1359) msgid "" "List a renamed file as \"long/path/{to => for}/file.txt\" instead of " "\"long/path/for/file.txt (from long/path/to/file.txt)\"." -msgstr "顯示一重新命名檔案為 \"long/path/{to => for}/file.txt\" 而非 \"long/path/for/file.txt (from long/path/to/file.txt)\"." +msgstr "顯示一重新命名檔案為「long/path/{to => for}/file.txt」而非 「long/path/for/file.txt (from long/path/to/file.txt)」。" #. Resource IDs: (16631, 16992) msgid "List1" @@ -6239,23 +6342,23 @@ msgstr "載入影像" msgid "Load Putty &Key" msgstr "載入putty鑰(&key)" -#. Resource IDs: (315) +#. Resource IDs: (5030) msgid "" "Load changes\n" "Changes made in TortoiseGitMerge are lost and replaced with the new content." msgstr "載入變更\n在 TortoiseGitMerge 中的變更會全部消失。" -#. Resource IDs: (315) +#. Resource IDs: (5031) msgid "" "Load changes\n" "The views are updated with the new content." msgstr "載入變更\n已更新為新的內容。" -#. Resource IDs: (369,1379) +#. Resource IDs: (369, 1379) msgid "Loading..." -msgstr "載入中‧‧‧" +msgstr "載入中．．．" -#. Resource IDs: (89) +#. Resource IDs: (1415, 1443, 1771) msgid "Local" msgstr "本地" @@ -6263,13 +6366,13 @@ msgstr "本地" msgid "Local Branch" msgstr "本地分支" -#. Resource IDs: (93) +#. Resource IDs: (1479) msgid "" "Local changes ignored (assumed valid/unchanged or skip worktree flagged " "files)" -msgstr "忽略本地變更 (含 assumed valid/unchanged 或 skip worktree 旗標的檔案)" +msgstr "忽略本地變更（含 assumed valid/unchanged 或 skip worktree 旗標的檔案）" -#. Resource IDs: (63) +#. Resource IDs: (1001) msgid "Local status" msgstr "本地狀態" @@ -6277,73 +6380,73 @@ msgstr "本地狀態" msgid "Local:" msgstr "本地：" -#. Resource IDs: (94) +#. Resource IDs: (1500) msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." -msgstr "儲存至檔案庫內容的位置。" +msgstr "所選取版本的匯出目的地（完整路徑加檔名）。" #. Resource IDs: (32854) msgid "Locator Bar" msgstr "定位列" -#. Resource IDs: (65) +#. Resource IDs: (1036, 65535) msgid "Log" -msgstr "紀錄" +msgstr "日誌" #. Resource IDs: (65535) msgid "Log Branch Line" -msgstr "歷史紀錄中的分支線" +msgstr "日誌中的分支線" #. Resource IDs: (65535) msgid "Log Graphic" -msgstr "歷史版本圖" +msgstr "日誌版本圖" #. Resource IDs: (211) msgid "Log History" -msgstr "訊息紀錄" +msgstr "日誌歷史" #. Resource IDs: (130) msgid "Log Messages" -msgstr "紀錄訊息" +msgstr "日誌訊息" #. Resource IDs: (345) msgid "Log commit ordering" -msgstr "提交排列" +msgstr "日誌提交排列順序" #. Resource IDs: (65535) msgid "Log messages" -msgstr "紀錄訊息" +msgstr "日誌訊息" #. Resource IDs: (1274) msgid "Log messages (Input dialog)" -msgstr "紀錄訊息(輸入視窗)" +msgstr "日誌訊息（輸入視窗）" #. Resource IDs: (1280) msgid "Log messages (Show log dialog)" -msgstr "紀錄訊息 (顯示紀錄視窗)" +msgstr "日誌訊息（顯示日誌視窗）" #. Resource IDs: (1760) msgid "Login:" -msgstr "登入名稱:" +msgstr "登入名稱：" -#. Resource IDs: (238) +#. Resource IDs: (3801) #, c-format msgid "Lowest shown revision: %ld - Highest shown revision: %ld" -msgstr "最低版本: %ld - 最高版本: %ld" +msgstr "最低版本：%ld - 最高版本：%ld" -#. Resource IDs: (238) +#. Resource IDs: (3800) #, c-format msgid "" "Lowest shown revision: %ld - Highest shown revision: %ld - HEAD revision: " "%ld" -msgstr "最低版本: %ld - 最高版本: %ld - 最新版本: %ld" +msgstr "最低版本：%ld - 最高版本：%ld - 最新版本：%ld" #. Resource IDs: (16973) msgid "Lum" msgstr "Lum" -#. Resource IDs: (90) +#. Resource IDs: (1427) msgid "MAPI" msgstr "MAPI" @@ -6355,67 +6458,63 @@ msgstr "Macintosh" msgid "Mail" msgstr "郵件" -#. Resource IDs: (3866) +#. Resource IDs: (61841) msgid "Mail system DLL is invalid." msgstr "郵件系統 DLL 錯誤." -#. Resource IDs: (156) -msgid "Main" -msgstr "主要的" - #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" -msgstr "設為純倉儲(没有工作目錄)" +msgstr "設為純版本庫（没有工作目錄）" #. Resource IDs: (1382) msgid "Mana&ge" -msgstr "管理(&g)" +msgstr "管理(&G)" #. Resource IDs: (1483) msgid "Manage" msgstr "管理" -#. Resource IDs: (79, 1382) +#. Resource IDs: (1255, 1382) msgid "Manage Remotes" msgstr "管理遠端" -#. Resource IDs: (282) +#. Resource IDs: (4503, 32808) msgid "Mark as resolved" msgstr "標記為已解決" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "" "Mark as resolved\n" "The file status is changed to modified" msgstr "標記為已解決\n清除衝突狀態並標示為已更改" -#. Resource IDs: (97) +#. Resource IDs: (1549) msgid "Mark for comparison" msgstr "標記為比較基準" -#. Resource IDs: (252) +#. Resource IDs: (4018) msgid "Mark this block" msgstr "標記這個區塊" -#. Resource IDs: (7) +#. Resource IDs: (103) msgid "Marked Blocks" msgstr "已標記區塊" -#. Resource IDs: (2051) +#. Resource IDs: (32808) msgid "" "Marks a file as resolved in Git\n" "Mark as resolved" msgstr "將檔案標記為已解決衝突狀態\n標記為已解決" -#. Resource IDs: (13) +#. Resource IDs: (201) msgid "Marks revision as bad" msgstr "標示為壞的版本" -#. Resource IDs: (12) +#. Resource IDs: (189) msgid "Marks revision as good" msgstr "標示為好的版本" -#. Resource IDs: (1064, 20084) +#. Resource IDs: (1021, 1064, 20084) msgid "Match &case" msgstr "符合大小寫(&C)" @@ -6425,11 +6524,11 @@ msgstr "最大" #. Resource IDs: (1317) msgid "Max. items to keep in the log message history" -msgstr "訊息紀錄最大保留筆數" +msgstr "歷史日誌訊息的最大保留筆數" #. Resource IDs: (65535) msgid "Max. lines in action log" -msgstr "行為紀錄最大行數" +msgstr "行為日誌的最大行數" #. Resource IDs: (16655) msgid "Me&nus show recently used commands first" @@ -6439,7 +6538,7 @@ msgstr "選單優先顯示最近使用的指令(&N)" msgid "Menu" msgstr "選單" -#. Resource IDs: (1001) +#. Resource IDs: (16006) msgid "Menu Bar" msgstr "選單列" @@ -6447,7 +6546,7 @@ msgstr "選單列" msgid "Menu s&hadows" msgstr "選單陰影(&H)" -#. Resource IDs: (78, 313) +#. Resource IDs: (313, 1234, 1526) msgid "Merge" msgstr "合併" @@ -6455,34 +6554,34 @@ msgstr "合併" msgid "Merge &Message" msgstr "合併訊息(&M)" -#. Resource IDs: (606) +#. Resource IDs: (9680) msgid "Merge Point" msgstr "合併點" -#. Resource IDs: (221) +#. Resource IDs: (3533) msgid "Merge Reintegrate" msgstr "合併-重新整合" -#. Resource IDs: (90) +#. Resource IDs: (1439) msgid "" "Merge between original branch, working tree contents, and the branch to " "switch to" msgstr "合併原先分支、工作目錄內容及切換至的分支" -#. Resource IDs: (1252) +#. Resource IDs: (20023, 20028) #, c-format msgid "Merge to \"%s\"..." -msgstr "合併至 \"%s\"..." +msgstr "合併至「%s」..." -#. Resource IDs: (263, 1257) +#. Resource IDs: (4201, 4203, 20106) msgid "Merged" msgstr "已合併" -#. Resource IDs: (76) +#. Resource IDs: (1204) msgid "Merged Files" msgstr "已合併的檔案" -#. Resource IDs: (10) +#. Resource IDs: (149) msgid "Merges another branch" msgstr "合併另一分支" @@ -6490,22 +6589,22 @@ msgstr "合併另一分支" msgid "Merging" msgstr "正在合併" -#. Resource IDs: (229) +#. Resource IDs: (3654) #, c-format msgid "Merging from %s, revision %s to %s, revision %s into %s, %s%s" -msgstr "正在自 %s 合併檔案, 版本 %s 至 %s, 版本 %s 併入 %s, %s%s" +msgstr "正在自 %s 合併檔案，版本 %s 至 %s，版本 %s 併入 %s，%s%s" -#. Resource IDs: (83) +#. Resource IDs: (1316) msgid "" "Merging requires different revisions or different URLs in 'From:' and 'To:'" -msgstr "合併時, '從:' 和 '到:' 的 URL 或是版本不可以相同" +msgstr "合併時，「從：」和「到：」的 URL 或是版本不可以相同" -#. Resource IDs: (229) +#. Resource IDs: (3653) #, c-format msgid "Merging revisions %s of %s into %s, %s%s" -msgstr "合併版本 %s 至 %s, 併入 %s, %s%s" +msgstr "合併版本 %s 至 %s，併入 %s，%s%s" -#. Resource IDs: (604, 1251, 1359) +#. Resource IDs: (1359, 9658, 20002) msgid "Message" msgstr "訊息" @@ -6517,7 +6616,7 @@ msgstr "只輸入訊息(&Y)" msgid "Message part &expression:" msgstr "訊息正規表示式(&E)：" -#. Resource IDs: (116) +#. Resource IDs: (1742, 1853) msgid "Messages" msgstr "訊息" @@ -6525,11 +6624,11 @@ msgstr "訊息" msgid "Min" msgstr "最小" -#. Resource IDs: (263) +#. Resource IDs: (1676, 4202) msgid "Mine" msgstr "我的" -#. Resource IDs: (1068) +#. Resource IDs: (17086) msgid "Minimize the Ribbon" msgstr "最小化功能區" @@ -6541,49 +6640,53 @@ msgstr "提交訊息的最小字符數：" msgid "Misc" msgstr "其他" -#. Resource IDs: (3887) +#. Resource IDs: (20120) +msgid "Missing" +msgstr "遺失" + +#. Resource IDs: (1422, 62179) msgid "Mixed" msgstr "混合" #. Resource IDs: (1551) msgid "Mixed: Leave working tree untouched, reset index" -msgstr "Mixed: 保持工作目錄不變，重設索引" +msgstr "Mixed：保持「工作目錄」不變，重設「索引」。" -#. Resource IDs: (208) +#. Resource IDs: (3316) msgid "Modification date" msgstr "修改日期" -#. Resource IDs: (74, 264, 1257, 65535) +#. Resource IDs: (1172, 1706, 4222, 17131, 20103, 65535) msgid "Modified" msgstr "已修改" -#. Resource IDs: (76) +#. Resource IDs: (1206) msgid "Modified Files" msgstr "已修改的檔案" -#. Resource IDs: (1070) +#. Resource IDs: (17107) msgid "More" msgstr "更多" -#. Resource IDs: (1002) +#. Resource IDs: (16026) msgid "More Buttons" msgstr "更多按鈕" -#. Resource IDs: (1069) +#. Resource IDs: (17097) msgid "More Commands..." msgstr "更多命令..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More colors..." msgstr "其它顏色..." -#. Resource IDs: (438) +#. Resource IDs: (7000) msgid "More..." msgstr "更多..." #. Resource IDs: (1136) msgid "Most active author:" -msgstr "最活躍作者:" +msgstr "最活躍作者：" #. Resource IDs: (16135) msgid "Mouse" @@ -6597,65 +6700,65 @@ msgstr "往下移動(&D)" msgid "Move &Up" msgstr "往上移動(&U)" -#. Resource IDs: (1002) +#. Resource IDs: (16022) msgid "Move Item Down" msgstr "向下移動項目" -#. Resource IDs: (1002) +#. Resource IDs: (16021) msgid "Move Item Up" msgstr "向上移動項目" -#. Resource IDs: (147) +#. Resource IDs: (2336) msgid "Move and rename" msgstr "移動並重新命名" -#. Resource IDs: (209) +#. Resource IDs: (3340) msgid "Move to changelist" msgstr "移至變更列表" -#. Resource IDs: (229) +#. Resource IDs: (3661) msgid "Move/Rename" -msgstr "移動/重新命名" +msgstr "移動／重新命名" -#. Resource IDs: (98) +#. Resource IDs: (1553) #, c-format msgid "Move: New name for %s" -msgstr "移動: %s 的新名稱" +msgstr "移動：%s 的新名稱" -#. Resource IDs: (197) +#. Resource IDs: (3144) msgid "Moves the modified files to the recycle bin first before reverting" msgstr "將修改過的檔案移至資源回收筒再進行復原" -#. Resource IDs: (80) +#. Resource IDs: (1275) #, c-format msgid "Moving %s" msgstr "正在移動 %s" -#. Resource IDs: (80) +#. Resource IDs: (1269) msgid "Moving..." -msgstr "正在移動..." +msgstr "正在移動．．．" #. Resource IDs: (65535) msgid "My file:" -msgstr "我的檔案:" +msgstr "我的檔案：" -#. Resource IDs: (3697) +#. Resource IDs: (59138) msgid "NUM" msgstr "NUM" -#. Resource IDs: (1071) +#. Resource IDs: (17128) msgid "Name" -msgstr "名字" +msgstr "Name" #. Resource IDs: (65535) msgid "Name:" -msgstr "名字:" +msgstr "名稱：" #. Resource IDs: (156) msgid "Navigate" msgstr "導覽" -#. Resource IDs: (2056) +#. Resource IDs: (32893) msgid "" "Navigate to a specific line in the view\n" "Goto Line" @@ -6665,11 +6768,11 @@ msgstr "在檢視中前往指定行\n前往行" msgid "Navigation Pane Options" msgstr "導覽面板選項" -#. Resource IDs: (1065) +#. Resource IDs: (17031) msgid "Navigation Pane Options..." msgstr "導覽面板選項..." -#. Resource IDs: (213) +#. Resource IDs: (3402) msgid "Nested" msgstr "多層次" @@ -6681,52 +6784,52 @@ msgstr "網路" msgid "Network::Email" msgstr "網路::郵件" -#. Resource IDs: (1002, 30721, 65535) +#. Resource IDs: (1512, 16017, 16027, 30721, 65535) msgid "New" msgstr "新增" #. Resource IDs: (1076) msgid "New &name:" -msgstr "新名稱(&N):" +msgstr "新名稱(&N)：" #. Resource IDs: (309) -msgid "New Branch\\Tag" -msgstr "新增分支/標籤" +msgid "New Branch/Tag" +msgstr "新增「分支／標籤」" -#. Resource IDs: (1001) +#. Resource IDs: (16014) msgid "New Menu" msgstr "新增選單" -#. Resource IDs: (95) +#. Resource IDs: (1509) msgid "New hash" msgstr "新版本號" -#. Resource IDs: (95) +#. Resource IDs: (1510) msgid "New message" msgstr "新訊息" -#. Resource IDs: (97) +#. Resource IDs: (1551) #, c-format msgid "New name for %s" msgstr "%s 的新名稱" -#. Resource IDs: (92) +#. Resource IDs: (1469) msgid "New name must not be empty or the same as the original name!" msgstr "名稱不能留空或與原先的相同！" -#. Resource IDs: (98) +#. Resource IDs: (1554) msgid "New name:" -msgstr "新名稱:" +msgstr "新名稱：" -#. Resource IDs: (605) +#. Resource IDs: (9669) msgid "New submodule" msgstr "新的子模組" -#. Resource IDs: (605) +#. Resource IDs: (9673) msgid "Newer commit time" msgstr "較新提交時間" -#. Resource IDs: (101) +#. Resource IDs: (1603) msgid "Newlines" msgstr "新列" @@ -6734,33 +6837,29 @@ msgstr "新列" msgid "Next" msgstr "下一個" -#. Resource IDs: (3633) +#. Resource IDs: (58114) msgid "" "Next Page\n" "Next Page" msgstr "下一頁\n下一頁" -#. Resource IDs: (156) +#. Resource IDs: (32804) msgid "Next conflict" msgstr "下一個衝突" -#. Resource IDs: (156) +#. Resource IDs: (32779) msgid "Next difference" msgstr "下一筆差異" -#. Resource IDs: (156) +#. Resource IDs: (32875) msgid "Next inline difference" msgstr "下一筆行內差異" -#. Resource IDs: (73) -msgid "No" -msgstr "否" - #. Resource IDs: (1481) msgid "No &Fast Forward" -msgstr "非 Fast Forward(&F)" +msgstr "不用快進(&F)" -#. Resource IDs: (92) +#. Resource IDs: (1464) msgid "No &merges" msgstr "不包括合併(&M)" @@ -6772,102 +6871,107 @@ msgstr "不要取出" msgid "No Co&mmit" msgstr "不提交(&M)" -#. Resource IDs: (67) +#. Resource IDs: (1060) msgid "No HEAD found" msgstr "找不到 HEAD" -#. Resource IDs: (81) +#. Resource IDs: (1283) msgid "" "No command specified!\n" "\n" "TortoiseGitProc.exe is used by the Shell extension and should not be called directly!" -msgstr "未指定命令！\n\nTortoiseGitProc.exe 用於 shell extension, 請勿直接執行！" +msgstr "未指定命令！\n\nTortoiseGitProc.exe 用於 shell extension，請勿直接執行！" -#. Resource IDs: (81) +#. Resource IDs: (1284) msgid "No command value specified!" -msgstr "尚未指定命令值!" +msgstr "尚未指定命令值！" -#. Resource IDs: (87) +#. Resource IDs: (1381, 1449) msgid "No differences found!" msgstr "找不到差異！" -#. Resource IDs: (82) +#. Resource IDs: (1305) msgid "" "No differences found! Submodule may not be updated. Update submodule now?" msgstr "找不到差異！子模組可能未更新。要現在更新子模組嗎？" -#. Resource IDs: (3843) +#. Resource IDs: (61472) msgid "No error message is available." msgstr "沒有錯誤訊息." -#. Resource IDs: (3867, 3868) +#. Resource IDs: (61856, 61872) msgid "No error occurred." msgstr "沒有發生錯誤." -#. Resource IDs: (82) +#. Resource IDs: (1565) +msgid "No extra changes after merge" +msgstr "合併時沒有額外帶入的變更" + +#. Resource IDs: (1310) msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" -msgstr "沒有變動的檔案或目錄, 不需要 TortoiseGit 復原!" +msgstr "沒有變動的檔案或目錄，不需要 TortoiseGit 復原！" -#. Resource IDs: (239) +#. Resource IDs: (3810) msgid "" "No files to show with the current setting.\n" -"Check one or more settings below to see unversioned, ignored and/or unmodified files.\n" -"To see remote changes, click on 'Check Repository'" -msgstr "目前設定下沒有可顯示的檔案.\n勾選以下的設定以顯示無版本控制的, 忽略的, 或是無變更的檔案.\n選擇 '檢查倉儲' 可顯示遠端變更." +"Check one or more settings below to see unversioned, ignored and/or unmodified files." +msgstr "目前設定下沒有可顯示的檔案。\n勾選以下的設定以顯示無版本控制的、忽略的、或是無變更的檔案。" -#. Resource IDs: (77) +#. Resource IDs: (1220) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here..." -msgstr "從上次提交以來沒有任何檔案\n變動或加入. TortoiseGit 沒有\n什麼事可做." +"the last commit." +msgstr "從上次提交以來沒有任何檔案\n變動或加入。" -#. Resource IDs: (170) +#. Resource IDs: (2704) msgid "" "No files were changed or added since\n" -"the last commit. There's nothing\n" -"for TortoiseGit to do here...\n" +"the last commit.\n" "Do you want to see the unversioned files?" -msgstr "從上次提交以來沒有任何檔案\n變動或加入. TortoiseGit 沒有\n什麼事可做...\n要檢視未加入版本控制的檔案嗎?" +msgstr "從上次提交以來沒有任何檔案\n變動或加入。\n要檢視未加入版本控制的檔案嗎？" -#. Resource IDs: (173) +#. Resource IDs: (2754) msgid "No graph available" msgstr "沒有圖可顯示" -#. Resource IDs: (273) +#. Resource IDs: (4362) #, c-format msgid "No image encoder found for %s." -msgstr "找不到 %s 的圖型編碼程式." +msgstr "找不到 %s 的圖型編碼程式。" -#. Resource IDs: (86) +#. Resource IDs: (1577) +msgid "No limitation" +msgstr "無限制" + +#. Resource IDs: (1375) msgid "No more revisions found." msgstr "找不到更多版本。" -#. Resource IDs: (70) +#. Resource IDs: (1106) msgid "No previous version." msgstr "沒有前一版本" -#. Resource IDs: (603) +#. Resource IDs: (9638) msgid "No reference found" -msgstr "沒有找到參考點" +msgstr "沒找到參照" -#. Resource IDs: (1254) +#. Resource IDs: (20054) msgid "No spell corrections" msgstr "沒有拼字修正" -#. Resource IDs: (196) +#. Resource IDs: (3125) msgid "" "No status cache. Only versioned folders get an overlay, files don't get an " "overlay" -msgstr "無狀態快取, 僅目錄有圖示, 檔案沒有." +msgstr "無狀態快取，僅目錄有圖示，檔案無圖示。" -#. Resource IDs: (1253) +#. Resource IDs: (20043) msgid "No thesaurus suggestions" msgstr "沒有同義字建議" -#. Resource IDs: (65) +#. Resource IDs: (1029) msgid "No working directory found." msgstr "找不到工作目錄" @@ -6875,11 +6979,11 @@ msgstr "找不到工作目錄" msgid "Node size" msgstr "節點大小" -#. Resource IDs: (1272) +#. Resource IDs: (1272, 9686, 17110) msgid "None" msgstr "無" -#. Resource IDs: (264, 65535) +#. Resource IDs: (4220, 65535) msgid "Normal" msgstr "正常" @@ -6891,76 +6995,76 @@ msgstr "正常&SVN Commit" msgid "North European" msgstr "北歐" -#. Resource IDs: (78) +#. Resource IDs: (1238) msgid "Not Versioned Files" msgstr "未版本控制的檔案" -#. Resource IDs: (83) +#. Resource IDs: (1322) msgid "Not all files could be downloaded and verified." msgstr "並非所有檔案可以下載及檢驗。" -#. Resource IDs: (3857) +#. Resource IDs: (61708) msgid "Not all of the system registry entries (or INI file) were removed." -msgstr "並未移除全部的登錄紀錄 (或 INI 檔案)." +msgstr "未移除所有的系統登錄項目 (或 INI 檔)。" -#. Resource IDs: (83) +#. Resource IDs: (1313) msgid "Not enough memory to complete operation." -msgstr "記憶體不足, 無法完成作業." +msgstr "記憶體不足，無法完成作業。" -#. Resource IDs: (606) +#. Resource IDs: (9688) msgid "" "Not enough memory!\n" "Try reducing the size of the revision graph by either\n" "collapsing nodes or reducing the zoom factor." msgstr "記憶體不足！\n嘗試折疊節點或減少縮放比例以減少版本分支圖的大小。" -#. Resource IDs: (72) +#. Resource IDs: (1149) msgid "Not patches generated." -msgstr "沒有產生補綴檔" +msgstr "沒有產生任何補綴檔。" #. Resource IDs: (65535) msgid "Note node" msgstr "備註節點" -#. Resource IDs: (3887) +#. Resource IDs: (62183) msgid "" "Note that if you choose to recover the auto-saved documents, you must " "explicitly save them to overwrite the original documents. If you choose to " "not recover the auto-saved versions, they will be deleted." -msgstr "請注意：如果您選擇回復自動儲存的文件，您必須要手動再儲存一次才能保留下來。如果您不回復自動儲存的文件，它們會被刪除。" +msgstr "請注意：如果您選擇還原自動儲存的文件，您必須要手動再儲存一次才能保留下來。如果您不還原自動儲存的文件，它們會被刪除。" #. Resource IDs: (65535) msgid "Note: These settings also apply to the Patch Viewer dialog." -msgstr "注意: 這些設定值也會套用在補綴瀏覽視窗" +msgstr "注意：這些設定值也會套用在補綴瀏覽視窗。" #. Resource IDs: (1481) msgid "Note: the folder contains unversioned items" -msgstr "注意: 資料夾含有無版本控制的檔案" +msgstr "注意：資料夾含有無版本控制的檔案。" #. Resource IDs: (65535) msgid "Note: this affects all Tortoise clients, not just TortoiseGit!" -msgstr "注意：這將影響到所有的Tortoise客户端，不僅僅是TortoiseGit!" +msgstr "注意：這將影響到所有的 Tortoise 客户端，不僅僅是 TortoiseGit！" -#. Resource IDs: (82) +#. Resource IDs: (1296) msgid "Notes" msgstr "備註" -#. Resource IDs: (604) +#. Resource IDs: (9650) #, c-format msgid "" "Nothing need rebase\r\n" "%s equal %s" msgstr "不需要變基\r\n%s 等於 %s" -#. Resource IDs: (67) +#. Resource IDs: (1058) msgid "Nothing to Rebase" msgstr "沒有東西要變基" -#. Resource IDs: (603) +#. Resource IDs: (9642) msgid "Nothing to commit" msgstr "没有可提交的内容" -#. Resource IDs: (88) +#. Resource IDs: (1406) msgid "Notice" msgstr "注意" @@ -6968,26 +7072,26 @@ msgstr "注意" msgid "Number Commits" msgstr "提交數量" -#. Resource IDs: (604) +#. Resource IDs: (9662) #, c-format msgid "Number of %s" msgstr "%s數" #. Resource IDs: (1161) msgid "Number of authors:" -msgstr "作者數:" +msgstr "作者數：" #. Resource IDs: (65535) msgid "Number of characters required for moved or copied line detection:" -msgstr "偵測 移動行 或 複製行 所需的字元數" +msgstr "偵測「移動行」或「複製行」所需的字元數：" -#. Resource IDs: (96) +#. Resource IDs: (1534) msgid "Number of characters to show in the abbreviated hash part" msgstr "縮寫中雜湊值顯示的位數" #. Resource IDs: (1160) msgid "Number of weeks:" -msgstr "週數:" +msgstr "週數：" #. Resource IDs: (5045) msgid "OEM 720" @@ -7053,41 +7157,41 @@ msgstr "OEM 869" msgid "OEM-US" msgstr "OEM-US" -#. Resource IDs: (1, 73, 4569) +#. Resource IDs: (1, 1160, 4569) msgid "OK" msgstr "確定" -#. Resource IDs: (7) +#. Resource IDs: (100) msgid "" "OLE initialization failed. Make sure that the OLE libraries are the correct" " version." msgstr "OLE 初始化失敗，請確定版本正確" -#. Resource IDs: (156, 626) +#. Resource IDs: (213, 10006) msgid "Office 2003" msgstr "Office 2003" -#. Resource IDs: (156) +#. Resource IDs: (10008, 65535) msgid "Office 2007" msgstr "Office 2007" -#. Resource IDs: (626) +#. Resource IDs: (10008, 65535) msgid "Office 2007 colors" msgstr "Office 2007 色彩" -#. Resource IDs: (156, 626) +#. Resource IDs: (211, 10004) msgid "Office XP" msgstr "Office XP" -#. Resource IDs: (95) +#. Resource IDs: (1507) msgid "Old hash" msgstr "舊版本號" -#. Resource IDs: (95) +#. Resource IDs: (1508) msgid "Old message" msgstr "舊訊息" -#. Resource IDs: (605) +#. Resource IDs: (9674) msgid "Older commit time" msgstr "較舊提交時間" @@ -7095,49 +7199,49 @@ msgstr "較舊提交時間" msgid "Older lines" msgstr "之前的行" -#. Resource IDs: (87) +#. Resource IDs: (1377) msgid "On demand" msgstr "有需要時" -#. Resource IDs: (3887) +#. Resource IDs: (62180) msgid "One or more auto-saved documents were found." msgstr "找到自動儲存的文件" -#. Resource IDs: (219) +#. Resource IDs: (3501) msgid "One or more files are in a conflicted state." -msgstr "尚有一個以上的檔案處於衝突狀態." +msgstr "尚有一個以上的檔案處於衝突狀態。" #. Resource IDs: (1542) msgid "Only Current Branch" -msgstr "只顯示當前分支" +msgstr "只顯示目前分支" #. Resource IDs: (1543) msgid "Only Local Branches" msgstr "只顯示本地分支" -#. Resource IDs: (1256) +#. Resource IDs: (20085) msgid "Only Merged Files" msgstr "只包含已合併的檔案" -#. Resource IDs: (19) +#. Resource IDs: (302) msgid "Only file children" msgstr "僅包含檔案" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "" "Only numbers (optionally separated by commas)\n" "are allowed!" -msgstr "只可以輸入數字(可以用逗\n點分隔)!" +msgstr "只允許輸入數字！\n（可以用逗號分隔）" -#. Resource IDs: (19) +#. Resource IDs: (303) msgid "Only this item" msgstr "僅此項目" -#. Resource IDs: (3841) +#. Resource IDs: (57601, 61440) msgid "Open" msgstr "開啟" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open an existing document\n" "Open" @@ -7147,51 +7251,52 @@ msgstr "開啟現有文件\n開啟" msgid "Open certificate" msgstr "開啟憑證" -#. Resource IDs: (3601) +#. Resource IDs: (57601) msgid "" "Open files for diff or to apply a patch\n" "Open files" -msgstr "比對檔案或套用補綴\n開啟檔案" +msgstr "開啟檔案以比較檔案或套用補綴\n開啟檔案" -#. Resource IDs: (1132) +#. Resource IDs: (1132, 6006) msgid "Open from clipboard" msgstr "自剪貼簿開啟" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "Open image file..." msgstr "開啟影像檔..." -#. Resource IDs: (282) +#. Resource IDs: (4502) msgid "Open parent folder" msgstr "開啟上層目錄" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "Open patch file" msgstr "開啟補綴檔" -#. Resource IDs: (3602) +#. Resource IDs: (57616, 57617, 57618, 57619, 57620, 57621, 57622, 57623, +#. 57624, 57625, 57626, 57627, 57628, 57629, 57630, 57631) msgid "Open this document" msgstr "開啟此文件" -#. Resource IDs: (1251) +#. Resource IDs: (20015) msgid "Open with..." msgstr "開啟程式..." -#. Resource IDs: (3605) +#. Resource IDs: (57666) msgid "" "Opens Help\n" "Help Topics" msgstr "開啟說明\n說明主題" -#. Resource IDs: (21) +#. Resource IDs: (334) msgid "Opens the Reference Browser dialog." -msgstr "開啟檔案庫瀏覽器" +msgstr "開啟參照瀏覽器對話框。" -#. Resource IDs: (15) +#. Resource IDs: (228) msgid "Opens the repository browser" -msgstr "開啟檔案庫瀏覽器" +msgstr "開啟版本庫瀏覽器" -#. Resource IDs: (357, 1517) +#. Resource IDs: (1517, 5707) msgid "Option" msgstr "選項" @@ -7200,30 +7305,30 @@ msgid "Options" msgstr "選項" #. Resource IDs: (32779) -msgid "Ori&ginal size" -msgstr "原始大小(&G)" +msgid "Ori&ginal size\tS" +msgstr "原始大小(&G)\tS" #. Resource IDs: (1531) msgid "Origin Name" -msgstr "原始遠端名稱" +msgstr "遠端名稱" -#. Resource IDs: (1065) +#. Resource IDs: (17024) msgid "Other Task Panes" msgstr "其它工作面板" -#. Resource IDs: (245) +#. Resource IDs: (3907) msgid "Others" msgstr "其它" -#. Resource IDs: (75) +#. Resource IDs: (1198) msgid "Out ChangeList" msgstr "輸出的變更列表" -#. Resource IDs: (75) +#. Resource IDs: (1197) msgid "Out Commits" msgstr "輸出的提交" -#. Resource IDs: (3843) +#. Resource IDs: (61475) msgid "Out of memory." msgstr "記憶體不足." @@ -7231,7 +7336,7 @@ msgstr "記憶體不足." msgid "Output Directory" msgstr "輸出目錄" -#. Resource IDs: (3845) +#. Resource IDs: (61510) msgid "Output.prn" msgstr "Output.prn" @@ -7239,20 +7344,24 @@ msgstr "Output.prn" msgid "Override branch if exists" msgstr "覆寫已存在的分支" -#. Resource IDs: (92) +#. Resource IDs: (1467) msgid "Overwrite" msgstr "覆寫" +#. Resource IDs: (1521) +msgid "Overwrite working tree changes (force)" +msgstr "強制覆寫工作目錄的變更" + #. Resource IDs: (32781) msgid "P&age setup..." msgstr "版面設定(&A)..." -#. Resource IDs: (3845) +#. Resource IDs: (61507) #, c-format msgid "Page %u" msgstr "頁 %u" -#. Resource IDs: (3845) +#. Resource IDs: (61508) #, c-format msgid "" "Page %u\n" @@ -7261,150 +7370,150 @@ msgstr "頁 %u\n頁面 %u-%u\n" #. Resource IDs: (65535) msgid "Page :" -msgstr "頁:" +msgstr "頁：" -#. Resource IDs: (1258) +#. Resource IDs: (20122) msgid "Pane 1" msgstr "窗格1" -#. Resource IDs: (1258) +#. Resource IDs: (20123) msgid "Pane 2" msgstr "窗格2" -#. Resource IDs: (63) +#. Resource IDs: (1006) msgid "Parameters" msgstr "參數" #. Resource IDs: (1477) msgid "Parameters:" -msgstr "參數:" +msgstr "參數：" -#. Resource IDs: (1256) +#. Resource IDs: (20086, 32799) #, c-format msgid "Parent %d" msgstr "父節點 %d" -#. Resource IDs: (70) +#. Resource IDs: (1105) #, c-format msgid "Parent %d does not exist" msgstr "父節點 %d 不存在" -#. Resource IDs: (606) +#. Resource IDs: (9681) msgid "Parent 1" msgstr "父版本1" -#. Resource IDs: (606) +#. Resource IDs: (9682) msgid "Parent 2" msgstr "父版本2" -#. Resource IDs: (1) +#. Resource IDs: (11) msgid "Parent(s)" msgstr "父版本" #. Resource IDs: (65535) msgid "Part of code come from TortoiseSVN Blame" -msgstr "部分原始碼來由 TortoiseSVN Blame" +msgstr "部分原始碼來自 TortoiseSVN Blame" #. Resource IDs: (4585) msgid "Password" msgstr "密碼" -#. Resource IDs: (69, 65535) +#. Resource IDs: (1101, 1761) msgid "Password:" -msgstr "密碼:" +msgstr "密碼：" -#. Resource IDs: (156) +#. Resource IDs: (57637) msgid "Paste" msgstr "貼上" -#. Resource IDs: (603) -msgid "Paste Recent Message..." -msgstr "貼上上次提交的訊息..." +#. Resource IDs: (2750) +msgid "Paste &filename list" +msgstr "貼上檔名列表(&F)" -#. Resource IDs: (1057) +#. Resource IDs: (2751) +msgid "Paste &last commit message" +msgstr "貼上上次提交的訊息(&L)" + +#. Resource IDs: (9644) +msgid "Paste &recent message..." +msgstr "貼上最近用過的提交訊息(&R)..." + +#. Resource IDs: (16908) msgid "" "Paste Tool\n" "Paste" msgstr "粘貼工具\n貼上" -#. Resource IDs: (172) -msgid "Paste filename list" -msgstr "貼上檔名列表" - -#. Resource IDs: (172) -msgid "Paste last commit message" -msgstr "貼上上次提交的訊息" - -#. Resource IDs: (15) +#. Resource IDs: (226) msgid "" "Pastes the svn path from the clipboard, resulting in a move (cut) or copy " "operation" -msgstr "自剪貼簿貼上 svn 路徑, 並進行移動(剪下)或複製動作" +msgstr "自剪貼簿貼上 svn 路徑，並進行移動（剪下）或複製動作" -#. Resource IDs: (65) +#. Resource IDs: (1035) msgid "Patch" -msgstr "修補" +msgstr "補綴" #. Resource IDs: (1076) msgid "Patch &all items" -msgstr "修補全部項目(&A)" +msgstr "補綴全部項目(&A)" #. Resource IDs: (1075) msgid "Patch &selected item" -msgstr "修補選定項目(&S)" +msgstr "補綴選定項目(&S)" #. Resource IDs: (1579) msgid "Patch As Attachment" -msgstr "補綴作為附件" +msgstr "附上補綴作為附件" -#. Resource IDs: (376) +#. Resource IDs: (6000) msgid "Patch all files" -msgstr "修補所有檔案" +msgstr "補綴所有檔案" -#. Resource IDs: (376) +#. Resource IDs: (6003) msgid "Patch selected files" -msgstr "修補選定的檔案" +msgstr "補綴選定的檔案" -#. Resource IDs: (157) +#. Resource IDs: (105, 2501, 2503) msgid "Patchfiles (*.diff, *.patch)|*.diff;*.patch|All Files (*.*)|*.*||" msgstr "補綴檔 (*.diff, *.patch)|*.diff;*.patch|所有檔案 (*.*)|*.*||" -#. Resource IDs: (169) +#. Resource IDs: (2702) msgid "Patching" -msgstr "修補中" +msgstr "補綴中" -#. Resource IDs: (169) +#. Resource IDs: (2703) #, c-format msgid "Patching file '%s'" -msgstr "正在修補檔案 '%s'" +msgstr "正在補綴檔案「%s」" -#. Resource IDs: (63, 77, 198, 207) +#. Resource IDs: (1004, 1223, 2704, 3153, 3300) msgid "Path" msgstr "路徑" -#. Resource IDs: (314) +#. Resource IDs: (5016) msgid "Path found that matches the patch better." msgstr "已找到更符合補綴的路徑。" #. Resource IDs: (1580, 65535) msgid "Path:" -msgstr "路徑:" +msgstr "路徑：" -#. Resource IDs: (116) +#. Resource IDs: (1851) msgid "Paths" msgstr "路徑" -#. Resource IDs: (1057) +#. Resource IDs: (16902) msgid "" "Pencil Tool\n" "Pencil" msgstr "鉛筆工具\n鉛筆" -#. Resource IDs: (605) +#. Resource IDs: (9665) msgid "Percent of authorship" msgstr "著作比例" -#. Resource IDs: (605) +#. Resource IDs: (9666) msgid "Percents" msgstr "比例" @@ -7412,24 +7521,24 @@ msgstr "比例" msgid "Personalized Menus and Toolbars" msgstr "個人化選單與工具列" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20057, 20112) msgid "Pick" msgstr "選取" -#. Resource IDs: (90) -msgid "Pick commit hash" -msgstr "選取版本號" +#. Resource IDs: (1430) +msgid "Pick commit &hash" +msgstr "選取版本號(&H)" -#. Resource IDs: (90) -msgid "Pick commit message" -msgstr "選取提交訊息" +#. Resource IDs: (1431) +msgid "Pick commit &message" +msgstr "選取提交訊息(&M)" -#. Resource IDs: (69) +#. Resource IDs: (1103) #, c-format msgid "Pick up %s" msgstr "提取 %s" -#. Resource IDs: (3849) +#. Resource IDs: (61582) msgid "" "Picture (Metafile)\n" "a picture" @@ -7437,60 +7546,60 @@ msgstr "圖片 (Metafile)\n圖片" #. Resource IDs: (65535) msgid "Picture:" -msgstr "圖片:" +msgstr "圖片：" -#. Resource IDs: (157) +#. Resource IDs: (2504) msgid "" "Pictures (*.svg, *.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|Graphs (*.gv)|*.gv|All " "Files (*.*)|*.*||" msgstr "圖片 (*.svg, *.wmf, *.jpg, *.png, *.bmp, *.gif)|*.svg;*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|圖表(*.gv)|*.gv|所有檔案 (*.*)|*.*||" -#. Resource IDs: (157) +#. Resource IDs: (2505) msgid "" "Pictures (*.wmf, *.jpg, *.png, *.bmp, " "*.gif)|*.wmf;*.jpg;*.jpeg;*.png;*.bmp;*.gif|All Files (*.*)|*.*||" msgstr "圖片 (*.wmf,*.jpg, *.png, *.bmp, *.gif)|*.wmf,*.jpg;*.jpeg;*.png;*.bmp;*.gif|所有檔案 (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3930) msgid "Pie Graph" msgstr "圓餅圖" -#. Resource IDs: (83) +#. Resource IDs: (1319) msgid "Please enter a hook script to execute." -msgstr "請輸入要指定的掛勾指令檔" +msgstr "請輸入要指定的掛鉤指令檔" -#. Resource IDs: (83) +#. Resource IDs: (1318) msgid "Please enter a path where to apply the hook script to." -msgstr "請輸入要套用這個掛勾指令檔的路徑" +msgstr "請輸入要套用這個掛鉤指令檔的路徑" -#. Resource IDs: (83) +#. Resource IDs: (1317) msgid "Please select a hook type" -msgstr "請選擇掛勾類型" +msgstr "請選擇掛鉤類型" -#. Resource IDs: (94) +#. Resource IDs: (1494) msgid "Please select branch" msgstr "請選擇分支" -#. Resource IDs: (94) +#. Resource IDs: (1493) msgid "Please select upstream" msgstr "請選擇上游" -#. Resource IDs: (94) +#. Resource IDs: (1498) msgid "Please take a look at the skipped commits" -msgstr "請查看被忽略的提交" +msgstr "請查看被略過的提交" -#. Resource IDs: (13) +#. Resource IDs: (199) msgid "Please wait while cancelling..." -msgstr "正在取消, 請稍候..." +msgstr "正在取消，請稍候．．．" -#. Resource IDs: (319) +#. Resource IDs: (5102) msgid "Please wait while differences are obtained..." -msgstr "正在比對差異, 請稍候..." +msgstr "正在比較差異，請稍候．．．" -#. Resource IDs: (119, 146, 213) +#. Resource IDs: (1902, 2333, 3403) msgid "Please wait..." -msgstr "請稍候..." +msgstr "請稍候．．．" #. Resource IDs: (65535) msgid "Popup" @@ -7498,121 +7607,121 @@ msgstr "彈出" #. Resource IDs: (65535) msgid "Port :" -msgstr "埠:" +msgstr "埠：" #. Resource IDs: (1758) msgid "Port:" -msgstr "埠:" +msgstr "埠：" -#. Resource IDs: (569) +#. Resource IDs: (9102) msgid "Post-Commit Hook" -msgstr "提交後掛勾" +msgstr "提交後掛鉤" -#. Resource IDs: (604) +#. Resource IDs: (9653) msgid "Post-Push Hook" -msgstr "推送後掛勾" +msgstr "推送後掛鉤" #. Resource IDs: (58115) msgid "Pre&v Page" msgstr "前一頁(&V)" -#. Resource IDs: (569) +#. Resource IDs: (9101) msgid "Pre-Commit Hook" -msgstr "提交前掛勾" +msgstr "提交前掛鉤" -#. Resource IDs: (604) +#. Resource IDs: (9652) msgid "Pre-Push Hook" -msgstr "推送前掛勾" +msgstr "推送前掛鉤" -#. Resource IDs: (68) +#. Resource IDs: (1082) msgid "Preparing commit..." -msgstr "提交準備中..." +msgstr "提交準備中．．．" -#. Resource IDs: (251) +#. Resource IDs: (4013) msgid "Prepend right block" msgstr "使用右方區塊在前面加上" -#. Resource IDs: (251) +#. Resource IDs: (4010) msgid "Prepend this block to left" msgstr "使用這個區塊在左方前面加上" #. Resource IDs: (65535) msgid "Press &New Shortcut Key:" -msgstr "按下新的快捷鍵(&N):" +msgstr "按下新的快捷鍵(&N)：" #. Resource IDs: (65535) msgid "Press &new shortcut key:" -msgstr "按下新的快捷鍵(&N):" +msgstr "按下新的快捷鍵(&N)：" -#. Resource IDs: (1069) +#. Resource IDs: (17094) msgid "Preview" msgstr "預覽" -#. Resource IDs: (376) +#. Resource IDs: (6004) msgid "Preview patched file" msgstr "預覽補綴後的檔案" #. Resource IDs: (65535) msgid "Preview: " -msgstr "預覽:" +msgstr "預覽：" #. Resource IDs: (20309) msgid "Previous" msgstr "上一個" -#. Resource IDs: (3633) +#. Resource IDs: (58115) msgid "" "Previous Page\n" "Previous Page" msgstr "上一頁\n上一頁" -#. Resource IDs: (72) +#. Resource IDs: (1140) msgid "Previous Version" msgstr "前一版本" -#. Resource IDs: (156) +#. Resource IDs: (32802) msgid "Previous conflict" msgstr "前一個衝突" -#. Resource IDs: (156) +#. Resource IDs: (32780) msgid "Previous difference" msgstr "前一筆差異" -#. Resource IDs: (156) +#. Resource IDs: (32876) msgid "Previous inline difference" msgstr "前一筆行內差異" -#. Resource IDs: (1069, 16990) +#. Resource IDs: (16990, 17092) msgid "Print" msgstr "列印" -#. Resource IDs: (3633) +#. Resource IDs: (58116) msgid "" "Print Document\n" "&Print" msgstr "列印文件\n列印(&P)" -#. Resource IDs: (3601) +#. Resource IDs: (57608) msgid "" "Print the active document using current options\n" "Quick Print" -msgstr "以現在的選項列印現行文件\n快速列印" +msgstr "以目在的選項列印現行文件\n快速列印" -#. Resource IDs: (3601) +#. Resource IDs: (57607) msgid "" "Print the active document\n" "Print" msgstr "列印現行文件\n列印" -#. Resource IDs: (3845) +#. Resource IDs: (61512) msgid "Print to File" msgstr "列印至檔案" #. Resource IDs: (65535) msgid "Printer :" -msgstr "印表機:" +msgstr "印表機：" -#. Resource IDs: (3845) +#. Resource IDs: (61511) msgid "Printer Files (*.prn)|*.prn|All Files (*.*)|*.*||" msgstr "印表檔案 (*.prn)|*.prn|全部檔案 (*.*)|*.*||" @@ -7620,11 +7729,11 @@ msgstr "印表檔案 (*.prn)|*.prn|全部檔案 (*.*)|*.*||" msgid "Printing" msgstr "列印中" -#. Resource IDs: (74) +#. Resource IDs: (1179) msgid "Program" msgstr "程式" -#. Resource IDs: (157) +#. Resource IDs: (2501) msgid "Programs (*.exe)|*.exe|All Files (*.*)|*.*||" msgstr "程式 (*.exe)|*.exe|所有檔案 (*.*)|*.*||" @@ -7632,11 +7741,11 @@ msgstr "程式 (*.exe)|*.exe|所有檔案 (*.*)|*.*||" msgid "Progress" msgstr "進度" -#. Resource IDs: (91, 1772) +#. Resource IDs: (1444, 1772) msgid "Project" msgstr "專案" -#. Resource IDs: (11) +#. Resource IDs: (164) msgid "Property" msgstr "性質" @@ -7644,25 +7753,25 @@ msgstr "性質" msgid "Property Page" msgstr "性質頁面" -#. Resource IDs: (63) +#. Resource IDs: (1005) msgid "Provider" msgstr "提供者" #. Resource IDs: (1586) msgid "Provider para&meters:" -msgstr "提供者參數(&m):" +msgstr "提供者參數(&M)：" #. Resource IDs: (1581) msgid "Provider uuid win&32:" -msgstr "提供者 uuid win&32:" +msgstr "提供者 uuid win&32：" #. Resource IDs: (1583) msgid "Provider uuid x6&4:" -msgstr "提供者 uuid x6&4" +msgstr "提供者 uuid x6&4：" #. Resource IDs: (1475) msgid "Provider:" -msgstr "提供者:" +msgstr "提供者：" #. Resource IDs: (1080) msgid "Proxy Settings" @@ -7676,35 +7785,35 @@ msgstr "剪除" msgid "Prune (All remotes)" msgstr "剪除 (所有遠端)" -#. Resource IDs: (22, 66, 1611) +#. Resource IDs: (347, 1052, 1611) msgid "Pull" msgstr "拉取" -#. Resource IDs: (75) +#. Resource IDs: (1189) msgid "Pull requires the selected local branch to be the current branch." -msgstr "拉取要求已選的分支為當前分支" +msgstr "拉取時所選擇的本地分支必需是目前分支。" -#. Resource IDs: (14) +#. Resource IDs: (221) msgid "Pull..." msgstr "拉取..." #. Resource IDs: (302) msgid "Pull/Fetch" -msgstr "拉取/獲取" +msgstr "拉取／獲取" -#. Resource IDs: (66) +#. Resource IDs: (1050) msgid "Pulled Diff" msgstr "已拉取的差異" -#. Resource IDs: (66) +#. Resource IDs: (1051) msgid "Pulled Log" -msgstr "已拉取的記錄" +msgstr "已拉取的日誌" -#. Resource IDs: (75) +#. Resource IDs: (1199) msgid "Pus&h" msgstr "推送(&H)" -#. Resource IDs: (22, 303, 1612) +#. Resource IDs: (303, 348, 1612) msgid "Push" msgstr "推送" @@ -7714,40 +7823,40 @@ msgstr "推送預設值" #. Resource IDs: (65535) msgid "Push URL:" -msgstr "推送 URL:" +msgstr "推送 URL：" #. Resource IDs: (1385) msgid "Push notes" msgstr "推送備註" -#. Resource IDs: (76) +#. Resource IDs: (1207) msgid "Push ta&gs" msgstr "推送標籤(&G)" -#. Resource IDs: (14, 64) +#. Resource IDs: (222, 1017) msgid "Push..." msgstr "推送..." #. Resource IDs: (65535) msgid "Putty Key:" -msgstr "putty鑰:" +msgstr "Putty 金鑰：" -#. Resource IDs: (71) +#. Resource IDs: (1120) msgid "Putty Private Key (*.ppk)|*.ppk|All Files (*.*)|*.*||" msgstr "Putty 私有鑰 (*.ppk)|*.ppk|所有檔案 (*.*)|*.*||" -#. Resource IDs: (246) +#. Resource IDs: (3920) #, c-format msgid "Q%d/%.2d" msgstr "Q%d/%.2d" -#. Resource IDs: (3605) +#. Resource IDs: (57665) msgid "" "Quit the application; prompts to save documents\n" "Exit" msgstr "結束程式; 提示儲存文件\n離開" -#. Resource IDs: (315) +#. Resource IDs: (5024) msgid "" "Quit\n" "Exit TortoiseGitMerge without saving the modifications" @@ -7765,11 +7874,15 @@ msgstr "虛擬磁碟(&A)" msgid "R&eset" msgstr "重置(&E)" -#. Resource IDs: (1252) +#. Resource IDs: (1582) +msgid "R&estore this file from index" +msgstr "從索引中還原此檔案" + +#. Resource IDs: (20021) msgid "R&evert to this revision" msgstr "復原至此版本(&E)" -#. Resource IDs: (1255) +#. Resource IDs: (20079) msgid "REBASE" msgstr "變基" @@ -7777,7 +7890,7 @@ msgstr "變基" msgid "Randomize Sync Dialog startup position" msgstr "隨機化同步視窗啟動位置" -#. Resource IDs: (91) +#. Resource IDs: (1442) msgid "" "Randomize the startup position of Sync Dialog. This prevents from pressing " "the Pull button of same dialog" @@ -7799,7 +7912,7 @@ msgstr "遠端(&M)：" msgid "Re&movable drives" msgstr "卸除式磁碟(&M)" -#. Resource IDs: (11) +#. Resource IDs: (166) msgid "Re&name..." msgstr "重新命名(&N)..." @@ -7815,37 +7928,37 @@ msgstr "全部重置(&S)" msgid "Re&store defaults" msgstr "還原預設值(&S)" -#. Resource IDs: (8) +#. Resource IDs: (125) msgid "Re&vert..." msgstr "復原(&V)..." -#. Resource IDs: (606) +#. Resource IDs: (9687) msgid "Reachable" msgstr "可達到的" -#. Resource IDs: (12) +#. Resource IDs: (191) msgid "Read the 'Daily Use Guide' before you are stuck..." -msgstr "在你卡住之前, 請先閱讀日常使用指南..." +msgstr "在你卡住之前，請先閱讀日常使用指南．．．" #. Resource IDs: (318) msgid "Rebase" msgstr "變基" -#. Resource IDs: (1254) +#. Resource IDs: (20063) #, c-format msgid "Rebase \"%s\" onto this..." -msgstr "變基 \"%s\" 到這..." +msgstr "變基「%s」到這..." -#. Resource IDs: (20) +#. Resource IDs: (312) msgid "Rebase..." msgstr "變基(rebase)..." -#. Resource IDs: (67) +#. Resource IDs: (1065) #, c-format msgid "Rebasing... (%d/%d)" -msgstr "變基中... (%d/%d)" +msgstr "變基中．．． (%d/%d)" -#. Resource IDs: (1002) +#. Resource IDs: (16019) msgid "Recent" msgstr "最近" @@ -7857,21 +7970,21 @@ msgstr "最近檔案" msgid "Recently modified lines" msgstr "最近修改過的行" -#. Resource IDs: (276) +#. Resource IDs: (4403) msgid "Record Only" msgstr "僅紀錄" -#. Resource IDs: (3887) +#. Resource IDs: (62184) msgid "" "Recover the auto-saved documents\n" "Open the auto-saved versions instead of the explicitly saved versions" -msgstr "回復自動儲存的文件\n開啟自動儲存的文件，不使用手動儲存的版本" +msgstr "還原自動儲存的文件\n開啟自動儲存的文件，不使用手動儲存的版本" -#. Resource IDs: (603) +#. Resource IDs: (9647) msgid "Recover to the status before rebase" -msgstr "復原到變基前的狀態" +msgstr "還原到變基前的狀態" -#. Resource IDs: (1057) +#. Resource IDs: (16905) msgid "" "Rectangle Tool\n" "Rectangle" @@ -7885,49 +7998,53 @@ msgstr "遞歸子模組" msgid "Recursive" msgstr "遞迴" -#. Resource IDs: (3603) +#. Resource IDs: (57644) +msgid "Redo" +msgstr "" + +#. Resource IDs: (57644) msgid "" "Redo the previously undone action\n" "Redo" msgstr "重做上次還原的動作\n重做" -#. Resource IDs: (3825) +#. Resource IDs: (61186) msgid "Reduce the window to an icon" msgstr "縮小視窗為圖示" -#. Resource IDs: (604, 1579) +#. Resource IDs: (1500, 9656) msgid "Ref" -msgstr "參考點" +msgstr "參照" #. Resource IDs: (20087) msgid "Ref (Click it then go to)" -msgstr "參考點 (點擊跳到)" +msgstr "參照 (點擊跳到)" -#. Resource IDs: (95) +#. Resource IDs: (1516) msgid "Ref List" -msgstr "參考點列表" +msgstr "參照列表" -#. Resource IDs: (69) +#. Resource IDs: (1097, 1354, 1729) msgid "RefBrowse" -msgstr "參考點瀏覽" +msgstr "參照瀏覽" -#. Resource IDs: (69, 1588) +#. Resource IDs: (1098, 1588) msgid "RefLog" -msgstr "參考點記錄" +msgstr "參照日誌" -#. Resource IDs: (83) +#. Resource IDs: (1312) msgid "Refname" -msgstr "參考點名稱" +msgstr "參照名稱" -#. Resource IDs: (135, 1382) +#. Resource IDs: (1382, 2150) msgid "Refresh" msgstr "重新整理" -#. Resource IDs: (75) +#. Resource IDs: (1190) msgid "Refreshing..." -msgstr "重新整理中..." +msgstr "重新整理中．．．" -#. Resource IDs: (32, 156, 165) +#. Resource IDs: (165, 500, 65535) msgid "Regex Filter" msgstr "正規表示式過濾器" @@ -7939,7 +8056,7 @@ msgstr "正規表示式過濾器" msgid "Regex:" msgstr "正規表示式：" -#. Resource IDs: (117) +#. Resource IDs: (1860) msgid "" "Regular expressions filter:\r\n" ". : any character\r\n" @@ -7956,22 +8073,22 @@ msgid "" "\\W : any non-alphanumeric character\r\n" "\\d : digits 0-9\r\n" "\\s : whitespaces" -msgstr "正規表示式過濾器:\r\n. : 任意字元\r\nc+ : 匹配一個以上的字元 c\r\nc* : 匹配零個以上的字元 c\r\n^ : 一行的開頭\r\n$ : 一行的結尾\r\n(string){n} : 匹配重複n次的字串\r\n(abcd) : 群組\r\n[aei0-9] : 匹配a, e, i, 及 0到9\r\n[^aei0-9] : 匹配除了a, e, i, 和 0到9 之外的字\r\n\r\n\\w : 匹配 a到z, A到Z, 0到9, 以及 _\r\n\\W : 匹配任何非英文, 數字的字元\r\n\\d : 數字 0到9\r\n\\s : 空白字元" +msgstr "正規表示式過濾器：\r\n.：任意字元\r\nc+：匹配一個以上的字元 c\r\nc*：匹配零個以上的字元 c\r\n^：一行的開頭\r\n$：一行的結尾\r\n(string){n}：匹配重複n次的字串\r\n(abcd)：群組\r\n[aei0-9]：匹配a, e, i, 及 0到9\r\n[^aei0-9]：匹配除了a, e, i, 和 0到9 之外的字\r\n\r\n\\w：匹配 a到z, A到Z, 0到9, 以及 _\r\n\\W：匹配任何非英文, 數字的字元\r\n\\d：數字 0到9\r\n\\s：空白字元" -#. Resource IDs: (7) +#. Resource IDs: (101) #, c-format msgid "Rejected patch hunks for '%s'" -msgstr "拒絕補綴方塊 '%s'" +msgstr "拒絕補綴方塊「%s」" #. Resource IDs: (1072) msgid "Relative Times in log" -msgstr "歷史中使用相對时間" +msgstr "日誌中使用相對时間" #. Resource IDs: (32794) msgid "Reload" msgstr "重新載入" -#. Resource IDs: (2050) +#. Resource IDs: (32794) msgid "" "Reloads the opened files and reverts all changes.\n" "Reload" @@ -7979,11 +8096,11 @@ msgstr "重新載入所有已開啟的檔案並且還原所有變更.\n重新載 #. Resource IDs: (1660) msgid "Remember selection (\"svn.rmdir\" option)" -msgstr "記住 (\"svn.rmdir\"選項)" +msgstr "記憶此次的選擇（「svn.rmdir」選項）" #. Resource IDs: (1649) msgid "Reminder: Commit your change after resolve" -msgstr "留意:在解決衝突後提交改動" +msgstr "提醒：在解決衝突後提交變更" #. Resource IDs: (1573) msgid "Remote" @@ -7995,7 +8112,7 @@ msgstr "遠端分支(&B)：" #. Resource IDs: (1618) msgid "Remote &URL:" -msgstr "遠端 &URL:" +msgstr "遠端 &URL：" #. Resource IDs: (1754) msgid "Remote &tracking branch" @@ -8005,36 +8122,36 @@ msgstr "遠端追蹤分支 (&T)" msgid "Remote Branch" msgstr "遠端分支" -#. Resource IDs: (71) +#. Resource IDs: (1122) msgid "Remote URL must not be empty." msgstr "遠端 URL 不能為空" -#. Resource IDs: (76) +#. Resource IDs: (1212) msgid "Remote Update" msgstr "遠端更新" -#. Resource IDs: (71) +#. Resource IDs: (1121) msgid "Remote name must not be empty." -msgstr "遠端名稱不能為空" +msgstr "遠端名稱不能為空。" -#. Resource IDs: (63) +#. Resource IDs: (1002) msgid "Remote status" msgstr "遠端狀態" #. Resource IDs: (65535) msgid "Remote:" -msgstr "遠端:" +msgstr "遠端：" #. Resource IDs: (1332, 1470) msgid "Remove" msgstr "移除" -#. Resource IDs: (126) +#. Resource IDs: (2015) #, c-format msgid "Remove %ld items" msgstr "移除 %ld 項" -#. Resource IDs: (126) +#. Resource IDs: (2014) #, c-format msgid "Remove %s" msgstr "移除 %s" @@ -8043,7 +8160,7 @@ msgstr "移除 %s" msgid "Remove &all untracked files (-fx)" msgstr "移除所有未追蹤的檔案(-x)(&A)" -#. Resource IDs: (75) +#. Resource IDs: (1184) msgid "Remove &branch" msgstr "移除分支(&B)" @@ -8051,21 +8168,21 @@ msgstr "移除分支(&B)" msgid "Remove &non-ignored untracked files (-f)" msgstr "移除非忽略的未追蹤檔案(-f)(&N)" -#. Resource IDs: (2057) +#. Resource IDs: (32896) msgid "" "Remove all comments before doing the diff so changes inside comments don't " "show as different" -msgstr "比對差異前先移除所有註解，註解中的異動將不會顯示出來。" +msgstr "比較差異前先移除所有註解，註解中的異動將不會顯示出來。" -#. Resource IDs: (15) +#. Resource IDs: (237) msgid "Remove from &ignore list" msgstr "自忽略列表移除(&I)" -#. Resource IDs: (1068) +#. Resource IDs: (17084) msgid "Remove from Quick Access Toolbar" msgstr "從快速存取工具列中移除" -#. Resource IDs: (209) +#. Resource IDs: (3338) msgid "Remove from changelist" msgstr "自變更列表移除" @@ -8077,7 +8194,7 @@ msgstr "移除已忽略檔案(-fX)" msgid "Remove untracked directories (-d)" msgstr "移除未追蹤的目錄(-d)" -#. Resource IDs: (9) +#. Resource IDs: (141) msgid "Remove untracked files from the working tree, ..." msgstr "從工作目錄移除不受版本控制的檔案" @@ -8085,19 +8202,19 @@ msgstr "從工作目錄移除不受版本控制的檔案" msgid "Removed" msgstr "移除" -#. Resource IDs: (264) +#. Resource IDs: (4211) msgid "Removed from changelist" msgstr "已自變更列表移除" -#. Resource IDs: (145) +#. Resource IDs: (2311) #, c-format msgid "" "Removed the file pattern(s)\n" "%s\n" "from the ignore list." -msgstr "自忽略列表移除\n%s\n檔名樣式." +msgstr "自忽略列表移除\n%s\n檔名樣式。" -#. Resource IDs: (15) +#. Resource IDs: (238) msgid "Removes the file or filemask from the list of ignored items" msgstr "從忽略列表中移除檔案或檔案遮罩" @@ -8105,11 +8222,11 @@ msgstr "從忽略列表中移除檔案或檔案遮罩" msgid "Rena&me..." msgstr "重新命名(&M)" -#. Resource IDs: (79, 1257) +#. Resource IDs: (1254, 1753, 20107) msgid "Rename" msgstr "重新命名" -#. Resource IDs: (97) +#. Resource IDs: (1550) #, c-format msgid "Rename %s" msgstr "重新命名 %s" @@ -8118,20 +8235,20 @@ msgstr "重新命名 %s" msgid "Rename - TortoiseGit" msgstr "重新命名 - TortoiseGit" -#. Resource IDs: (92) +#. Resource IDs: (1470) #, c-format msgid "Rename \"%s\":" -msgstr "重新命名 \"%s\"" +msgstr "重新命名「%s」：" -#. Resource IDs: (221) +#. Resource IDs: (3530) msgid "Rename/move" -msgstr "重新命名/移動" +msgstr "重新命名／移動" -#. Resource IDs: (11) +#. Resource IDs: (167) msgid "Renames files/folders inside version control" -msgstr "重新命名版本控制樹中的檔案/資料夾" +msgstr "重新命名版本控制中的「檔案／資料夾」" -#. Resource IDs: (3603) +#. Resource IDs: (57640) msgid "" "Repeat the last action\n" "Repeat" @@ -8141,7 +8258,7 @@ msgstr "重覆上次動作\n重覆" msgid "Replace &All" msgstr "全部取代(&A)" -#. Resource IDs: (3603) +#. Resource IDs: (57641) msgid "" "Replace specific text with different text\n" "Replace" @@ -8149,32 +8266,32 @@ msgstr "用指定的文字取代特定文字\n取代" #. Resource IDs: (65535) msgid "Replace with:" -msgstr "取代為:" +msgstr "取代為：" #. Resource IDs: (65535) msgid "Replace:" msgstr "取代：" -#. Resource IDs: (95) +#. Resource IDs: (1507) #, c-format msgid "Replaced %d matches" msgstr "取代了 %d 符合項目" -#. Resource IDs: (74) +#. Resource IDs: (1173) msgid "Replacing" msgstr "正在取代" #. Resource IDs: (1618) msgid "Repository &URL" -msgstr "倉儲 URL" +msgstr "版本庫 &URL" #. Resource IDs: (153) msgid "Repository Browser" -msgstr "檔案庫瀏覽器" +msgstr "版本庫瀏覽器" #. Resource IDs: (65535) msgid "Repository:" -msgstr "倉儲:" +msgstr "版本庫：" #. Resource IDs: (334) msgid "Request pull" @@ -8182,13 +8299,13 @@ msgstr "要求拉取" #. Resource IDs: (65535) msgid "Requests a username and a password" -msgstr "需要帳號和密碼" +msgstr "需要「帳號」和「密碼」" -#. Resource IDs: (8) +#. Resource IDs: (127) msgid "Res&olve..." msgstr "解決(&O)..." -#. Resource IDs: (317) +#. Resource IDs: (317, 1413, 1561, 9689) msgid "Reset" msgstr "重設" @@ -8200,25 +8317,25 @@ msgstr "全部重設(&A)" msgid "Reset Type" msgstr "重設類型" -#. Resource IDs: (1255) +#. Resource IDs: (20064) #, c-format msgid "Reset \"%s\" to this..." -msgstr "重設 \"%s\" 到這個版本..." +msgstr "重設「%s」到這個版本..." -#. Resource IDs: (1553) +#. Resource IDs: (1522) msgid "Reset active branch" msgstr "重設現在分支" -#. Resource IDs: (1255) +#. Resource IDs: (20078) msgid "Reset columns" msgstr "重設行" -#. Resource IDs: (64) +#. Resource IDs: (1016) #, c-format msgid "Reset current branch \"%s\" to" -msgstr "重設當前分支 %s 到" +msgstr "重設當前分支「%s」到" -#. Resource IDs: (77, 207, 229) +#. Resource IDs: (207, 1231, 3662) msgid "Resolve" msgstr "解決" @@ -8226,126 +8343,122 @@ msgstr "解決" msgid "Resolve Submodule Conflict" msgstr "解決子模組衝突" -#. Resource IDs: (282) +#. Resource IDs: (4501) msgid "Resolve conflict using 'mine'" msgstr "使用本地端解決衝突" -#. Resource IDs: (282) +#. Resource IDs: (4500) msgid "Resolve conflict using 'theirs'" msgstr "使用遠端解決衝突" -#. Resource IDs: (74, 209) +#. Resource IDs: (1168, 3332) msgid "Resolved" msgstr "已解決" -#. Resource IDs: (282) +#. Resource IDs: (4510) #, c-format msgid "" "Resolved:\n" "%s" -msgstr "已解決:\n%s" +msgstr "已解決：\n%s" -#. Resource IDs: (9) +#. Resource IDs: (142) msgid "Resolves conflicted files" msgstr "解決有衝突的檔案" -#. Resource IDs: (66) +#. Resource IDs: (1054) msgid "Restart rebase" msgstr "重新開始變基" -#. Resource IDs: (64) +#. Resource IDs: (1014) msgid "Restore" msgstr "還原" -#. Resource IDs: (1254) +#. Resource IDs: (1097, 1254) msgid "Restore Default" msgstr "還原預設值" -#. Resource IDs: (65) +#. Resource IDs: (1027) msgid "Restore after commit" msgstr "提交後還原" -#. Resource IDs: (3826) +#. Resource IDs: (61202) msgid "Restore the window to normal size" msgstr "還原視窗至一般大小" -#. Resource IDs: (73) +#. Resource IDs: (1166) msgid "Restored" -msgstr "己還原" +msgstr "已還原" -#. Resource IDs: (73) -msgid "Retry" -msgstr "重試" - -#. Resource IDs: (602) +#. Resource IDs: (9629) msgid "Retrying in 2 seconds..." msgstr "兩秒後重試…" -#. Resource IDs: (77, 175, 229) +#. Resource IDs: (175, 1230, 3663) msgid "Revert" msgstr "復原" -#. Resource IDs: (69) +#. Resource IDs: (1099) msgid "Revert commit" msgstr "復原版本" -#. Resource IDs: (69) +#. Resource IDs: (1102) #, c-format msgid "Revert commit %s" msgstr "復原版本 %s" -#. Resource IDs: (1258) +#. Resource IDs: (20118) msgid "Revert to parent revision" msgstr "還原到父版本" -#. Resource IDs: (323) +#. Resource IDs: (5154) #, c-format msgid "Revert to revision %s" msgstr "還原到版本 %s" -#. Resource IDs: (73) +#. Resource IDs: (1167) msgid "Reverted" msgstr "已復原" -#. Resource IDs: (9) +#. Resource IDs: (140) msgid "Reverts all changes you made since the last update" msgstr "復原從上次更新之後全部的變動" -#. Resource IDs: (14) +#. Resource IDs: (213) msgid "Reverts an addition to version control" msgstr "取消加入檔案至版本控制" -#. Resource IDs: (603) +#. Resource IDs: (9634) msgid "Review Patch with TortoiseGitMerge" -msgstr "在 TortoiseGitMerge 中審查補綴" +msgstr "使用 TortoiseGitMerge 檢閱補綴" -#. Resource IDs: (14) +#. Resource IDs: (209) msgid "Review/apply a unified diff file with TortoiseGitMerge" -msgstr "使用 TortoiseGitMerge 審查/套用單一補綴..." +msgstr "使用 TortoiseGitMerge「檢閱／套用」統合式差異檔" -#. Resource IDs: (13) +#. Resource IDs: (207) msgid "Review/apply single &patch..." -msgstr "審查/套用單一補綴..." +msgstr "「檢閱／套用」單一補綴..." -#. Resource IDs: (208, 1253, 1522) +#. Resource IDs: (1522, 3313, 20045) msgid "Revision" msgstr "版本" -#. Resource IDs: (119) +#. Resource IDs: (1901) #, c-format msgid "Revision %d" msgstr "版本 %d" -#. Resource IDs: (120) +#. Resource IDs: (1908) #, c-format msgid "Revision %s" msgstr "版本 %s" -#. Resource IDs: (23) +#. Resource IDs: (367) msgid "Revision &graph" msgstr "版本圖 (&G)" -#. Resource IDs: (67) +#. Resource IDs: (1057) msgid "Revision Files" msgstr "版本檔案" @@ -8361,53 +8474,53 @@ msgstr "版本圖過濾器" msgid "Revision graph" msgstr "版本圖" -#. Resource IDs: (86) +#. Resource IDs: (1367) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." msgstr "修訂已還原，所有變更現已被納入工作目錄中。" -#. Resource IDs: (1579, 65535) +#. Resource IDs: (1579, 1712, 1713, 1716) msgid "Revision:" -msgstr "版本: " +msgstr "版本：" -#. Resource IDs: (605) +#. Resource IDs: (9672) msgid "Rewind" msgstr "後退" -#. Resource IDs: (95) +#. Resource IDs: (1515) #, c-format msgid "Rewind %d" msgstr "後退 %d" -#. Resource IDs: (3850) +#. Resource IDs: (61590) msgid "" "Rich Text (RTF)\n" "text with font and paragraph formatting" msgstr "Rich Text (RTF)\n有字型和段落樣式設定的文字" -#. Resource IDs: (188) +#. Resource IDs: (3004) msgid "Right View: " -msgstr "右側檢視:" +msgstr "右側檢視：" #. Resource IDs: (65535) msgid "Right image" msgstr "右側影像" -#. Resource IDs: (1070) +#. Resource IDs: (17108) #, c-format msgid "Row %d of %d" msgstr "列 %d / %d" -#. Resource IDs: (1070) +#. Resource IDs: (17109) #, c-format msgid "Row %d-%d of %d" msgstr "列 %d-%d / %d" -#. Resource IDs: (1070) +#. Resource IDs: (17116) msgid "Row Down" msgstr "往下一行" -#. Resource IDs: (1070) +#. Resource IDs: (17115) msgid "Row Up" msgstr "往上一行" @@ -8415,11 +8528,11 @@ msgstr "往上一行" msgid "S&elect..." msgstr "選擇(&E)..." -#. Resource IDs: (1065) +#. Resource IDs: (17027) msgid "S&how Buttons on One Row" msgstr "以單列方式顯示按鈕(&H)" -#. Resource IDs: (1065) +#. Resource IDs: (17028) msgid "S&how Buttons on Two Rows" msgstr "以兩列方式顯示按鈕(&H)" @@ -8427,15 +8540,23 @@ msgstr "以兩列方式顯示按鈕(&H)" msgid "S&how Quick Access Toolbar below the Ribbon" msgstr "在功能區下方顯示快速存取工具列(&H)" +#. Resource IDs: (1561) +msgid "S&kip unselected" +msgstr "略過未選取的(&K)" + +#. Resource IDs: (1562) +msgid "S&quash unselected" +msgstr "壓合未選取的(&Q)" + #. Resource IDs: (1132) msgid "S&tatistics" msgstr "統計資料(&T)" -#. Resource IDs: (9) +#. Resource IDs: (128) msgid "S&witch/Checkout..." -msgstr "切換(&W)/取出..." +msgstr "切換(&W)／取出..." -#. Resource IDs: (604, 1251) +#. Resource IDs: (1854, 9655, 20008) msgid "SHA-1" msgstr "SHA-1" @@ -8453,9 +8574,9 @@ msgstr "SMTP伺服器要求授權" #. Resource IDs: (1757) msgid "SMTP Server:" -msgstr "SMTP伺服器:" +msgstr "SMTP 伺服器：" -#. Resource IDs: (90) +#. Resource IDs: (1428) msgid "SMTP, directly to destination server" msgstr "SMTP，直接到目的伺服器" @@ -8463,51 +8584,51 @@ msgstr "SMTP，直接到目的伺服器" msgid "SSH" msgstr "SSH" -#. Resource IDs: (97) -msgid "SSL" -msgstr "SSL" +#. Resource IDs: (1541) +msgid "SSL/TLS" +msgstr "SSL/TLS" -#. Resource IDs: (97) +#. Resource IDs: (1540) msgid "STARTTLS" msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" -msgstr "SVN Commit類型" +msgstr "SVN Commit 類型" -#. Resource IDs: (22) +#. Resource IDs: (337) msgid "SVN DCommit..." msgstr "SVN DCommit..." -#. Resource IDs: (13) +#. Resource IDs: (206) msgid "SVN Fetch" msgstr "SVN 獲取" -#. Resource IDs: (21) +#. Resource IDs: (335) msgid "SVN Rebase" msgstr "SVN 變基" -#. Resource IDs: (1256) +#. Resource IDs: (20094) msgid "SVN Rev" msgstr "SVN 版本" #. Resource IDs: (65535) msgid "Sa&feCrLf:" -msgstr "檢查换行符號(&f)" +msgstr "Sa&feCrLf:" #. Resource IDs: (65535) msgid "Safe Crlf:" -msgstr "檢查换行符號" +msgstr "檢查换行符號：" -#. Resource IDs: (95) +#. Resource IDs: (1511) msgid "Same" msgstr "相同" -#. Resource IDs: (605) +#. Resource IDs: (9675) msgid "Same commit time" msgstr "相同提交時間" -#. Resource IDs: (93) +#. Resource IDs: (1484) msgid "" "Sample log message to test the bugtraq: regex strings.\n" "\n" @@ -8525,35 +8646,39 @@ msgstr "用來測試 bugtraq:regex 的記錄訊息範本. \n\n測試在段落中 msgid "Sample text:" msgstr "樣本文字：" -#. Resource IDs: (156) +#. Resource IDs: (57603) msgid "Save" msgstr "儲存" -#. Resource IDs: (101) +#. Resource IDs: (1600, 57604) msgid "Save &as..." msgstr "另存新檔(&A)..." -#. Resource IDs: (3841) +#. Resource IDs: (32773) +msgid "Save &as...\tCtrl+Shift+S" +msgstr "另存新檔(&A)...\tCtrl+Shift+S" + +#. Resource IDs: (61441) msgid "Save As" msgstr "另存新檔" -#. Resource IDs: (316) +#. Resource IDs: (5048) msgid "" "Save Bottom File as\n" "You're asked where to save the bottom file" msgstr "另存下方檔案\n請決定下方檔案要存在那裡" -#. Resource IDs: (316) +#. Resource IDs: (5046) msgid "Save File" msgstr "儲存檔案" -#. Resource IDs: (316) +#. Resource IDs: (5042) msgid "" "Save Left File as\n" "You're asked where to save the left file" msgstr "另存左側檔案\n請問左側檔案要儲存至那裡" -#. Resource IDs: (316) +#. Resource IDs: (5041) #, c-format msgid "" "Save Left File\n" @@ -8561,13 +8686,13 @@ msgid "" "%s" msgstr "儲存左側檔案\n儲存左側檔案變更至\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5044) msgid "" "Save Right File as\n" "You're asked where to save the right file" msgstr "另存右側檔案\n請問右側檔案要儲存至那裡" -#. Resource IDs: (316) +#. Resource IDs: (5043) #, c-format msgid "" "Save Right File\n" @@ -8575,74 +8700,74 @@ msgid "" "%s" msgstr "儲存右側檔案\n儲存右側檔案變更至\n%s" -#. Resource IDs: (316) +#. Resource IDs: (5045) msgid "" "Save all\n" "Both Files are saved" msgstr "全部儲存\n儲存左右兩側檔案" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" msgstr "儲存及排除\n儲存變更及但被標記的方塊會變回原本的內容" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" msgstr "儲存及忽略\n儲存變更及但忽略被標記的方塊" -#. Resource IDs: (7) +#. Resource IDs: (105) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" msgstr "儲存及包含\n儲存變更及包含被標記的方塊" -#. Resource IDs: (156) +#. Resource IDs: (5050, 57604) msgid "Save as" msgstr "另存新檔" -#. Resource IDs: (313) +#. Resource IDs: (5000) msgid "Save as..." msgstr "另存新檔..." -#. Resource IDs: (315) +#. Resource IDs: (5026) msgid "" "Save as\n" "You're asked where to save the file" msgstr "另存新檔\n請問要儲存在那裡" -#. Resource IDs: (3857) +#. Resource IDs: (61699) #, c-format msgid "Save changes to %1?" -msgstr "是否儲存 %1 的變動?" +msgstr "是否儲存 %1 的變動？" -#. Resource IDs: (314) +#. Resource IDs: (5022) msgid "Save modifications." msgstr "儲存變更。" -#. Resource IDs: (7) +#. Resource IDs: (107) msgid "Save patch file" msgstr "儲存補綴檔" -#. Resource IDs: (1253) +#. Resource IDs: (20046) msgid "Save revision &to..." msgstr "儲存版本至(&T)..." -#. Resource IDs: (3601) +#. Resource IDs: (57604) msgid "" "Save the active document with a new name\n" "Save As" -msgstr "以新檔名儲存現行文件\n另存為" +msgstr "將使用中文件以新名稱儲存\n另存新檔" -#. Resource IDs: (3601) +#. Resource IDs: (57603) msgid "" "Save the active document\n" "Save" msgstr "儲存現行文件\n儲存" -#. Resource IDs: (3601) +#. Resource IDs: (57603, 57604) msgid "" "Save the modified file\n" "Save file" @@ -8658,19 +8783,19 @@ msgstr "儲存至：" #. Resource IDs: (1385) msgid "Save unified diff" -msgstr "保存標準差異檔案" +msgstr "保存統合式差異檔案" #. Resource IDs: (1385) msgid "Save unified diff since HEAD" -msgstr "自從HEAD儲存差異檔案" +msgstr "從 HEAD 儲存統合式差異檔案" -#. Resource IDs: (315) +#. Resource IDs: (5034) msgid "" "Save\n" "Save the file with the conflict markers." msgstr "儲存\n儲存含有衝突標記的檔案。" -#. Resource IDs: (314) +#. Resource IDs: (5023) #, c-format msgid "" "Save\n" @@ -8682,12 +8807,12 @@ msgstr "儲存\n儲存變更至\n%s" msgid "Saved Data" msgstr "已存資料" -#. Resource IDs: (71) +#. Resource IDs: (1127) #, c-format msgid "Saving config failed (key: \"%s\", value: \"%s\")." -msgstr "儲存組態失敗(key: \"%s\", value: \"%s\")" +msgstr "儲存組態失敗（key：「%s」，value：「%s」）" -#. Resource IDs: (75) +#. Resource IDs: (1186) msgid "Saving notes failed." msgstr "儲存備註失敗" @@ -8699,11 +8824,11 @@ msgstr "掃瞄" msgid "Scintilla" msgstr "Scintilla" -#. Resource IDs: (1003) +#. Resource IDs: (16034) msgid "Scroll Left" msgstr "向左捲動" -#. Resource IDs: (1003) +#. Resource IDs: (16035) msgid "Scroll Right" msgstr "向右捲動" @@ -8711,9 +8836,9 @@ msgstr "向右捲動" msgid "Se&ttings..." msgstr "設定(&T)..." -#. Resource IDs: (1253) +#. Resource IDs: (20032) msgid "Search &log messages..." -msgstr "搜尋記錄訊息(&L)..." +msgstr "搜尋日誌訊息(&L)..." #. Resource IDs: (1074) msgid "Search &up" @@ -8721,111 +8846,111 @@ msgstr "往上搜尋(&U)" #. Resource IDs: (65535) msgid "Search for:" -msgstr "搜尋:" +msgstr "搜尋：" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "Searching for better path to apply patch..." -msgstr "正在搜尋更好的路徑來套用補綴..." +msgstr "正在搜尋更好的路徑來套用補綴．．．" -#. Resource IDs: (3867) +#. Resource IDs: (61865) #, c-format msgid "Seek failed on %1" msgstr "搜尋錯誤: %1" -#. Resource IDs: (8) +#. Resource IDs: (114) msgid "Select" msgstr "選擇" -#. Resource IDs: (1253) +#. Resource IDs: (20040) msgid "Select &All" msgstr "全選(&A)" #. Resource IDs: (16529) msgid "Select &User-defined Image: " -msgstr "選擇使用者自定影像(&U):" +msgstr "選擇使用者自定影像(&U)：" #. Resource IDs: (16508) msgid "Select &context menu:" -msgstr "選擇快顯功能表(&C):" +msgstr "選擇快顯功能表(&C)：" #. Resource IDs: (65535) msgid "Select &window:" -msgstr "選擇視窗(&W):" +msgstr "選擇視窗(&W)：" -#. Resource IDs: (1057) +#. Resource IDs: (16903) msgid "" "Select Color Tool\n" "Select Color" msgstr "色彩設定工具\n選擇顏色" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Select File..." msgstr "選擇檔案..." -#. Resource IDs: (78) +#. Resource IDs: (1244) msgid "Select SSH client" msgstr "選擇 SSH 用戶端程式" -#. Resource IDs: (3858) +#. Resource IDs: (61717) msgid "Select a button." msgstr "請選擇按鈕." -#. Resource IDs: (3585) +#. Resource IDs: (57346) msgid "Select an object on which to get Help" msgstr "選擇要查詢說明的物件" -#. Resource IDs: (213) +#. Resource IDs: (3406) msgid "Select changelist" msgstr "選擇變更列表" -#. Resource IDs: (78) +#. Resource IDs: (1241) msgid "Select diff application" -msgstr "選擇比對差異工具" +msgstr "選擇比較差異工具" -#. Resource IDs: (93) +#. Resource IDs: (1487) msgid "Select file" msgstr "選擇檔案" -#. Resource IDs: (64) +#. Resource IDs: (1010) msgid "Select folder to associate with this issue tracker" msgstr "請選擇要和此 bug 追踪程式關聯的資料匣" -#. Resource IDs: (79) +#. Resource IDs: (1259) msgid "" "Select folder to export to.\n" "You might need to create a new folder before performing this export." -msgstr "選擇要匯出至的資料夾.\n你可能需要在進行匯出之前先建立新資料夾." +msgstr "選擇要匯出至的資料夾。\n你可能需要在進行匯出之前先建立新資料夾。" -#. Resource IDs: (197) +#. Resource IDs: (3150) msgid "Select folder to run script for" msgstr "請選擇要執行指令檔的目錄" -#. Resource IDs: (119) +#. Resource IDs: (1893) msgid "Select folder to save the selected files to" msgstr "請選擇要儲存檔案的目錄" -#. Resource IDs: (197) +#. Resource IDs: (3151) msgid "Select hook script file" -msgstr "請選擇掛勾指令檔" +msgstr "請選擇掛鉤指令檔" #. Resource IDs: (1405) msgid "Select items automatically" msgstr "自動選擇項目" -#. Resource IDs: (78) +#. Resource IDs: (1243) msgid "Select merge application" msgstr "選擇合併工具" -#. Resource IDs: (119) +#. Resource IDs: (1894) msgid "Select merge target" msgstr "選擇合併目標" -#. Resource IDs: (79) +#. Resource IDs: (1253) msgid "" "Select the behaviour of the progress dialog at the end of the operation." msgstr "選擇作業完成時進度視窗的行為" -#. Resource IDs: (3603) +#. Resource IDs: (57642) msgid "" "Select the entire document\n" "Select All" @@ -8837,25 +8962,29 @@ msgid "" "checker used for commit messages." msgstr "選擇該項目正在使用的語言。此設定會影響到用於提交訊息的拼寫檢查器。" -#. Resource IDs: (78) +#. Resource IDs: (1559) +msgid "Select tracked branch" +msgstr "設定遠端追蹤分支" + +#. Resource IDs: (1242) msgid "Select viewer for diff-files" -msgstr "選擇檢視差異檔工具" +msgstr "選擇檔案差異檢視器" -#. Resource IDs: (316) +#. Resource IDs: (5051) msgid "Select what file you want to save as" msgstr "請選擇你要另存的檔案" -#. Resource IDs: (316) +#. Resource IDs: (5052) msgid "" "Select what file you want to save as\n" "Note: There is unresolved conflict!" -msgstr "請選擇你要另存的檔案\n注意： 尚有未解決的衝突！" +msgstr "請選擇你要另存的檔案\n注意：尚有未解決的衝突！" #. Resource IDs: (1067) msgid "Select/deselect &all" msgstr "全部選擇或取消(&A)" -#. Resource IDs: (96) +#. Resource IDs: (1527) msgid "Selection History" msgstr "瀏覽記錄" @@ -8863,19 +8992,19 @@ msgstr "瀏覽記錄" msgid "Send" msgstr "傳送" -#. Resource IDs: (602) +#. Resource IDs: (9626) msgid "Send Email" msgstr "傳送郵件" #. Resource IDs: (1587) msgid "Send Mail after create" -msgstr "建立郵件後發送" +msgstr "建立後發送郵件" -#. Resource IDs: (3866) +#. Resource IDs: (61842) msgid "Send Mail failed to send message." msgstr "發送郵件功能無法寄出訊息." -#. Resource IDs: (21, 603) +#. Resource IDs: (321, 9636) msgid "Send Mail..." msgstr "傳送郵件..." @@ -8883,29 +9012,29 @@ msgstr "傳送郵件..." msgid "Send Patch" msgstr "傳送補綴" -#. Resource IDs: (602) +#. Resource IDs: (9625) msgid "Send Patch by Email" msgstr "用郵件傳送補綴" -#. Resource IDs: (21) +#. Resource IDs: (322) msgid "Send Patch(es) by eMail" msgstr "用郵件傳送補綴" -#. Resource IDs: (74) +#. Resource IDs: (1174) msgid "Sending content" msgstr "正在傳送內容" -#. Resource IDs: (602) +#. Resource IDs: (9624) msgid "Sending..." -msgstr "傳送中..." +msgstr "傳送中．．．" #. Resource IDs: (1409) msgid "Server &address:" -msgstr "伺服器位址(&A):" +msgstr "伺服器位址(&A)：" #. Resource IDs: (65535) msgid "Set Accelerator &for:" -msgstr "設定快捷鍵(&F):" +msgstr "設定快捷鍵(&F)：" #. Resource IDs: (1558) msgid "Set au&thor" @@ -8915,28 +9044,28 @@ msgstr "設定作者(&T)" msgid "Set author &date" msgstr "設定作者日期(&D)" -#. Resource IDs: (86) +#. Resource IDs: (1363) msgid "Sets the remote as the \"pushremote\" for the selected local branch." -msgstr "設定已選本地分支的推送遠端" +msgstr "把所選本地分支的「pushremote」設成這個遠端" -#. Resource IDs: (86) +#. Resource IDs: (1362) msgid "" "Sets the remote branch as the \"pushbranch\" for the selected local branch." -msgstr "設定已選本地分支的推送遠端分支" +msgstr "把所選本地分支的「pushbranch」設到這個遠端分支" -#. Resource IDs: (13) +#. Resource IDs: (200) msgid "Setting properties..." -msgstr "正在設定性質..." +msgstr "正在設定性質．．．" -#. Resource IDs: (107) +#. Resource IDs: (1017, 1702, 32782) msgid "Settings" msgstr "設定" -#. Resource IDs: (80) +#. Resource IDs: (1264) msgid "Settings - TortoiseGit" msgstr "設定 - TortoiseGit" -#. Resource IDs: (1270) +#. Resource IDs: (1270, 1548) msgid "Shell" msgstr "檔案總管" @@ -8944,9 +9073,9 @@ msgstr "檔案總管" msgid "Shell Extended" msgstr "檔案總管增強" -#. Resource IDs: (145) +#. Resource IDs: (2314) msgid "Shell Icon Cache was rebuilt!" -msgstr "重新建立圖示快取!" +msgstr "重新建立圖示快取！" #. Resource IDs: (5062) msgid "Shift-JIS" @@ -8954,9 +9083,9 @@ msgstr "Shift-JIS" #. Resource IDs: (1105) msgid "Short &date/time format in log messages" -msgstr "記錄訊息使用簡短日期/時間格式(&D)" +msgstr "日誌訊息使用簡短「日期／時間」格式(&D)" -#. Resource IDs: (1255) +#. Resource IDs: (20077) msgid "Shorten property list" msgstr "縮短性質列表" @@ -8966,41 +9095,45 @@ msgstr "顯示" #. Resource IDs: (16996) msgid "Show &Accelerator for:" -msgstr "顯示快捷鍵(&A):" +msgstr "顯示快捷鍵(&A)：" -#. Resource IDs: (20) +#. Resource IDs: (317) msgid "Show &Reflog" -msgstr "顯示參考點記錄(&R)" +msgstr "顯示參照日誌(&R)" #. Resource IDs: (1073) msgid "Show &Unversioned Files" msgstr "顯示未版本控制的檔案(&U)" -#. Resource IDs: (1208) +#. Resource IDs: (1203) msgid "Show &Whole Project" msgstr "顯示整個專案(&W)" -#. Resource IDs: (1254) +#. Resource IDs: (20051) msgid "Show &changes" msgstr "顯示變更(&C)" -#. Resource IDs: (12, 101, 1016) +#. Resource IDs: (180, 1016, 1132, 1601) msgid "Show &log" -msgstr "顯示記錄(&L)" +msgstr "顯示日誌(&L)" #. Resource IDs: (1031) msgid "Show &log..." -msgstr "顯示記錄(&L)..." +msgstr "顯示日誌(&L)..." + +#. Resource IDs: (1830) +msgid "Show &nested refs" +msgstr "顯示巢狀參照" #. Resource IDs: (1088) msgid "Show &overlays and context menu only in explorer" msgstr "僅在檔案總管中顯示圖示覆蓋與快顯式選單(&O)" -#. Resource IDs: (1069) +#. Resource IDs: (17099) msgid "Show Above the Ribbon" msgstr "顯示於功能區上方" -#. Resource IDs: (1069) +#. Resource IDs: (17098) msgid "Show Below the Ribbon" msgstr "顯示於功能區下方" @@ -9008,35 +9141,35 @@ msgstr "顯示於功能區下方" msgid "Show Environment Variables" msgstr "顯示環境變數" -#. Resource IDs: (1065) +#. Resource IDs: (17030) msgid "Show Fewer Buttons" msgstr "顯示較少按鈕" -#. Resource IDs: (2051) +#. Resource IDs: (32815) msgid "Show HEAD revision nodes" msgstr "顯示 HEAD 版本節點" -#. Resource IDs: (2052) +#. Resource IDs: (32825) msgid "" "Show Inline-Diff word by word\n" "Inline diff word-wise" -msgstr "逐字顯示行內差異\n行內逐字比較差異" +msgstr "逐字顯示行內差異\n行內逐字差異" -#. Resource IDs: (2056) +#. Resource IDs: (32889) msgid "" "Show Inline-Diff\n" "Inline diff" msgstr "顯示行內差異\n行內差異" -#. Resource IDs: (1065) +#. Resource IDs: (17029) msgid "Show More Buttons" msgstr "顯示更多按鈕" -#. Resource IDs: (1068) +#. Resource IDs: (17082) msgid "Show Quick Access Toolbar Above the Ribbon" msgstr "在功能區上方顯示快速存取工具列" -#. Resource IDs: (1068) +#. Resource IDs: (17081) msgid "Show Quick Access Toolbar Below the Ribbon" msgstr "在功能區下方顯示快速存取工具列" @@ -9044,41 +9177,41 @@ msgstr "在功能區下方顯示快速存取工具列" msgid "Show Screen&Tips on toolbars" msgstr "在工具列上顯示畫面提示(&T)" -#. Resource IDs: (156) +#. Resource IDs: (32774) msgid "Show Whitespaces" msgstr "顯示空白字元" -#. Resource IDs: (2051) +#. Resource IDs: (32813) msgid "Show an overview of the whole graph" msgstr "顯示鳥瞰圖" #. Resource IDs: (1074) msgid "Show asterisk log prefix" -msgstr "Subject 開頭加註星號" +msgstr "標題開頭加註星號" -#. Resource IDs: (97) +#. Resource IDs: (1536) msgid "Show asterisk log prefix in log dialog" -msgstr "在記錄視窗中的訊息的 Subject 開頭加註星號" +msgstr "在日誌視窗中的訊息的標題開頭加註星號" #. Resource IDs: (32775) msgid "Show author" msgstr "顯示作者" -#. Resource IDs: (1251) +#. Resource IDs: (20010) msgid "Show branches this commit is on" msgstr "顯示這版本所屬的分支" -#. Resource IDs: (1251) +#. Resource IDs: (20011, 20026) msgid "Show changes as &unified diff" -msgstr "以單一差異檔顯示差異(&W)" +msgstr "以統合式差異格式顯示變更(&W)" #. Resource IDs: (32787) msgid "Show com&plete log" -msgstr "顯示完整記錄(&P)" +msgstr "顯示完整日誌(&P)" #. Resource IDs: (32864) msgid "Show complete log" -msgstr "顯示完整記錄" +msgstr "顯示完整日誌" #. Resource IDs: (32784) msgid "Show date" @@ -9086,17 +9219,17 @@ msgstr "顯示日期" #. Resource IDs: (1804) msgid "Show describe in log" -msgstr "在記錄訊息中顯示 describe" +msgstr "在日誌訊息中顯示 describe" -#. Resource IDs: (96) +#. Resource IDs: (1532) msgid "Show describe in log dialog" -msgstr "在記錄視窗中顯示 describe" +msgstr "在日誌視窗中顯示 describe" -#. Resource IDs: (83) +#. Resource IDs: (1315) msgid "Show destination folder" msgstr "顯示目的資料夾" -#. Resource IDs: (1696) +#. Resource IDs: (1378, 1696) msgid "Show diff" msgstr "顯示差異" @@ -9108,11 +9241,15 @@ msgstr "顯示和上次提交的差異" msgid "Show excluded folders as normal" msgstr "排除的資料夾顯示正常圖示" +#. Resource IDs: (1564) +msgid "Show extra changes after merge" +msgstr "顯示合併時額外帶入的變更" + #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" msgstr "在短暫延遲後顯示完整選單(&U)" -#. Resource IDs: (2051, 32802) +#. Resource IDs: (32802) msgid "Show file name" msgstr "顯示檔案名稱" @@ -9128,7 +9265,7 @@ msgstr "顯示忽略的檔案(&I)" msgid "Show ignore local changes flagged files" msgstr "顯示含忽略本地變更旗標的檔案" -#. Resource IDs: (92) +#. Resource IDs: (1463) msgid "Show la&beled commits only" msgstr "僅僅顯示有標記的提交(&B)" @@ -9136,90 +9273,90 @@ msgstr "僅僅顯示有標記的提交(&B)" msgid "Show linenumber&s" msgstr "顯示行號(&S)" -#. Resource IDs: (64) +#. Resource IDs: (1018, 1132, 1695, 1698, 32798) msgid "Show log" -msgstr "顯示記錄" +msgstr "顯示日誌" -#. Resource IDs: (65) +#. Resource IDs: (1025) msgid "Show log &before rename/copy" -msgstr "顯示重新命名/複製前的記錄" +msgstr "顯示「重新命名／複製」前的日誌" -#. Resource IDs: (88) +#. Resource IDs: (1394) #, c-format msgid "Show log of %s" -msgstr "顯示 %s 的記錄" +msgstr "顯示 %s 的日誌" -#. Resource IDs: (81) +#. Resource IDs: (1286) msgid "Show log of submodule" -msgstr "顯示子模組記錄" +msgstr "顯示子模組日誌" -#. Resource IDs: (14) +#. Resource IDs: (211) msgid "Show log of this folder" -msgstr "顯示資料夾記錄" +msgstr "顯示該資料夾日誌" -#. Resource IDs: (1256) +#. Resource IDs: (20082) msgid "Show log..." -msgstr "顯示記錄..." +msgstr "顯示日誌..." -#. Resource IDs: (96) +#. Resource IDs: (1535) msgid "Show long format even if a tag is exactly on that commit" -msgstr "即使標籤已位於該提交上, 仍然顯示長格式" +msgstr "即使標籤已位於該提交上，仍然顯示長格式。" -#. Resource IDs: (1382) +#. Resource IDs: (1383) msgid "Show modified files in working tree" msgstr "僅顯示工作目錄中有變更的部分" -#. Resource IDs: (1270) +#. Resource IDs: (20308) msgid "" "Show next change of selected commit\n" "Show next" msgstr "從已選版本中顯示下一個改動\n顯示下一個" -#. Resource IDs: (2051) +#. Resource IDs: (32814) msgid "Show oldest node at top" msgstr "最舊節點顯示在最上方" -#. Resource IDs: (2054) +#. Resource IDs: (32853) msgid "" "Show or hide the line diff bar\n" "Toggle LineDiffBar" msgstr "顯示或隱藏單行差異列\n開關單行差異" -#. Resource IDs: (2054) +#. Resource IDs: (32854) msgid "" "Show or hide the locator bar\n" "Toggle LocatorBar" msgstr "顯示或隱藏定位工具列\n開關定位列" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle Status Bar" msgstr "顯示或隱藏狀態列\n切換狀態列" -#. Resource IDs: (3713) +#. Resource IDs: (59393) msgid "" "Show or hide the status bar\n" "Toggle StatusBar" msgstr "顯示或隱藏狀態列\n開關狀態列" -#. Resource IDs: (3713) +#. Resource IDs: (59392) msgid "" "Show or hide the toolbar\n" "Toggle ToolBar" msgstr "顯示或隱藏工具列\n開關工具列" -#. Resource IDs: (2051, 32803) +#. Resource IDs: (32803) msgid "Show original line number" msgstr "顯示原始行號" -#. Resource IDs: (1270) +#. Resource IDs: (20309) msgid "" "Show previous change of selected commit\n" "Show previous" msgstr "從已選版本中顯示上一個改動\n顯示上一個" -#. Resource IDs: (1252) +#. Resource IDs: (20030) msgid "Show revision properties" msgstr "顯示版本性質" @@ -9227,7 +9364,7 @@ msgstr "顯示版本性質" msgid "Show shortcut &keys in ScreenTips" msgstr "在畫面提示中顯示快捷鍵(&K)" -#. Resource IDs: (2049) +#. Resource IDs: (32774) msgid "" "Show special characters for whitespaces and newlines\n" "Show Whitespaces" @@ -9237,9 +9374,9 @@ msgstr "以特殊字元顯示空白字元及換行字元\n顯示空白字元" msgid "Show status of subrepositories in parent folders" msgstr "在上層資料夾顯示子版本庫的狀態" -#. Resource IDs: (87) +#. Resource IDs: (1384) msgid "Show symbols on ref labels to substitute part of the ref names" -msgstr "在參考點上以符號代替名稱的某部分" +msgstr "用特定符號簡化參照的前半部名稱" #. Resource IDs: (1209) msgid "Show un&modified files" @@ -9249,47 +9386,45 @@ msgstr "顯示未修改的檔案(&M)" msgid "Show un&versioned files" msgstr "顯示無版本控制的檔案(&V)" -#. Resource IDs: (198) +#. Resource IDs: (3156) msgid "Show/Hide" -msgstr "顯示/隱藏" +msgstr "顯示／隱藏" -#. Resource IDs: (93) +#. Resource IDs: (1485) #, c-format msgid "Showing %1!d! ref(s), %2!d! ref(s) selected" -msgstr "顯示 %1!d! 個參考點，%2!d! 個已選取" +msgstr "顯示 %1!d! 個參照，%2!d! 個已選取" -#. Resource IDs: (76) +#. Resource IDs: (1200) #, c-format msgid "" "Showing %ld revision(s), from revision %s to revision %s - %ld revision(s) " "selected, %ld file(s) selected\r\n" -msgstr "顯示 %ld 個版本, 由版本 %s 至 版本%s - %ld 個版本己選取, %ld 個檔案已選取\n" +msgstr "顯示 %ld 個版本，由版本 %s 至版本 %s － %ld 個版本已選取，%ld 個檔案已選取\n" -#. Resource IDs: (24) +#. Resource IDs: (368) msgid "Shows a graphical representation of copies/tags/branches" -msgstr "顯示圖形化的複製/標籤/分支" +msgstr "顯示圖形化的「複製／標籤／分支」" -#. Resource IDs: (13) -msgid "" -"Shows all files which were changed since the last update, locally and in the" -" repository" -msgstr "顯示從上次更新以後變動過的檔案, 不論在倉儲中或在本地端" +#. Resource IDs: (193) +msgid "Shows all files which were changed since the last commit." +msgstr "顯示從上次提交以後變動過的檔案。" -#. Resource IDs: (10) +#. Resource IDs: (146) msgid "Shows information about TortoiseGit" msgstr "顯示關於 TortoiseGit 的資訊" -#. Resource IDs: (20) +#. Resource IDs: (318) msgid "Shows reference log" -msgstr "顯示參考點記錄" +msgstr "顯示參照日誌" -#. Resource IDs: (198) +#. Resource IDs: (3158) msgid "Shows the action log file in the default text editor" -msgstr "用預設的文字編輯器顯示行為紀錄" +msgstr "用預設的文字編輯器顯示行為日誌" -#. Resource IDs: (12) +#. Resource IDs: (181) msgid "Shows the log for the selected file/folder" -msgstr "顯示選定的檔案/資料夾的記錄" +msgstr "顯示所選「檔案／資料夾」的日誌" #. Resource IDs: (1523) msgid "Si&gn" @@ -9297,9 +9432,9 @@ msgstr "簽名(&G)" #. Resource IDs: (65535) msgid "Significant contributions by: (see Git repository for a complete list)" -msgstr "主要貢獻來自於: (查看 Git 版本庫以取得完整的貢獻者列表)" +msgstr "主要貢獻來自於：（查看 Git 版本庫以取得完整的貢獻者列表）" -#. Resource IDs: (156, 626) +#. Resource IDs: (217, 10011) msgid "Silver Style" msgstr "銀色樣式" @@ -9307,58 +9442,58 @@ msgstr "銀色樣式" msgid "Since" msgstr "自從" -#. Resource IDs: (74) +#. Resource IDs: (1182, 1365, 17129) msgid "Size" msgstr "大小" -#. Resource IDs: (1254, 1258) +#. Resource IDs: (20055, 20113) msgid "Skip" msgstr "略過" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "Skip Patch: %s" -msgstr "略過補綴: %s" +msgstr "略過補綴：%s" -#. Resource IDs: (11029) +#. Resource IDs: (1003, 11029, 20116) msgid "Skip worktree" msgstr "跳過工作樹" #. Resource IDs: (1529) msgid "Skip worktree (\"Locked\" in TortoiseSVN)" -msgstr "跳過工作樹 (TortoiseSVN 中的 \"Locked\")" +msgstr "跳過工作樹（TortoiseSVN 中的「Locked」）" -#. Resource IDs: (74) +#. Resource IDs: (1177) msgid "Skipped" msgstr "已略過" -#. Resource IDs: (263) +#. Resource IDs: (4200) msgid "Skipped missing target" msgstr "已跳過的缺少目標" -#. Resource IDs: (1070) +#. Resource IDs: (17112) msgid "Slide" msgstr "滑動" -#. Resource IDs: (156) +#. Resource IDs: (1098) msgid "Smart tab char" msgstr "智慧 Tab" -#. Resource IDs: (89) +#. Resource IDs: (1414) msgid "Soft" msgstr "Soft" #. Resource IDs: (1550) msgid "Soft: Leave working tree and index untouched" -msgstr "Soft: 不改動工作目錄和索引" +msgstr "Soft：保持「工作目錄」和「索引」不變。" -#. Resource IDs: (314) +#. Resource IDs: (5015) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Do you want to load the changes?" msgstr "TortoiseGitMerge 開啟中的檔案有外部變更。\n是否要重新載入？" -#. Resource IDs: (314) +#. Resource IDs: (5014) msgid "" "Some file(s) have been changed outside TortoiseGitMerge.\n" "Would you like to reload and lose your changes?" @@ -9372,59 +9507,63 @@ msgstr "依提交數排序" msgid "Sort tag list in reversed order" msgstr "反向排序標籤下拉選單的內容" -#. Resource IDs: (196) +#. Resource IDs: (3122) msgid "" "Specifies how many items you want to keep in the most recent log messages " "dialog." -msgstr "指定最近訊息紀錄要保留幾筆資料." +msgstr "指定要保留幾筆最近使用的日誌訊息。" #. Resource IDs: (16976, 16977, 16978, 16979, 16980, 16981) msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1253) +#. Resource IDs: (20041) msgid "Split lines" msgstr "斷行" -#. Resource IDs: (3604) +#. Resource IDs: (57653) msgid "" "Split the active window into panes\n" "Split" msgstr "將目前視窗分割區塊\n分割" -#. Resource IDs: (1254, 1257) +#. Resource IDs: (20111) msgid "Squash" -msgstr "融合" +msgstr "壓合" + +#. Resource IDs: (20058) +msgid "Squash (with commit below)" +msgstr "壓合（與下面的提交）" -#. Resource IDs: (246) +#. Resource IDs: (3933) msgid "Stacked Bar Graph" msgstr "堆疊長條圖" -#. Resource IDs: (246) +#. Resource IDs: (3931) msgid "Stacked Line Graph" msgstr "堆疊直線圖" -#. Resource IDs: (1258, 16962) +#. Resource IDs: (16962, 20124) msgid "Standard" msgstr "標準" -#. Resource IDs: (68) +#. Resource IDs: (1073) msgid "Start (FastFwd)" -msgstr "開始 (FastFwd)" +msgstr "開始 (快進)" -#. Resource IDs: (67) +#. Resource IDs: (1061) msgid "Start Cherry Pick" msgstr "開始摘取" -#. Resource IDs: (569) +#. Resource IDs: (9100) msgid "Start Commit Hook" -msgstr "開始提交掛勾" +msgstr "開始提交掛鉤" -#. Resource IDs: (67, 68) +#. Resource IDs: (1062, 1072) msgid "Start Rebase" msgstr "開始變基" -#. Resource IDs: (12) +#. Resource IDs: (188) msgid "Start bisect mode..." msgstr "開始二分法模式" @@ -9432,7 +9571,7 @@ msgstr "開始二分法模式" msgid "Start registry editor" msgstr "啟動登錄檔編輯器" -#. Resource IDs: (14) +#. Resource IDs: (217) msgid "Starts a git server running git protocol" msgstr "啟動 Git 服務採用 Git 協定" @@ -9444,39 +9583,47 @@ msgstr "藏起(stash)" msgid "Stash &Message" msgstr "藏起訊息(&M)" -#. Resource IDs: (20) +#. Resource IDs: (314) msgid "Stash Apply" msgstr "套用藏起" -#. Resource IDs: (20) +#. Resource IDs: (319) msgid "Stash List" msgstr "藏起列表" -#. Resource IDs: (22) +#. Resource IDs: (341) msgid "Stash Pop" msgstr "彈出藏起" -#. Resource IDs: (20) +#. Resource IDs: (313) msgid "Stash Save" msgstr "保存藏起" -#. Resource IDs: (80) +#. Resource IDs: (1270) msgid "Stash operation running..." -msgstr "藏起操作執行中..." +msgstr "藏起操作執行中．．．" + +#. Resource IDs: (2705) +msgid "State" +msgstr "" #. Resource IDs: (1487, 4572, 4573, 16514) msgid "Static" msgstr "靜態" -#. Resource IDs: (179, 245) +#. Resource IDs: (179, 3906) msgid "Statistics" msgstr "統計資料" -#. Resource IDs: (74, 77, 207) +#. Resource IDs: (1176, 1218, 3301) msgid "Status" msgstr "狀態" -#. Resource IDs: (1068) +#. Resource IDs: (59393) +msgid "Status Bar" +msgstr "" + +#. Resource IDs: (17087) msgid "Status Bar Configuration" msgstr "狀態列設定" @@ -9488,80 +9635,80 @@ msgstr "狀態與行為的顏色" msgid "Status cache" msgstr "狀態快取" -#. Resource IDs: (197) +#. Resource IDs: (3146) msgid "" "Status cache for only one folder, with full status and recursive overlays" msgstr "狀態快取僅用於一個資料夾，遞迴完全狀態" -#. Resource IDs: (196) +#. Resource IDs: (3123) msgid "" "Status cache kept in an external process that detects file changes, can show" " the overlay recursively" -msgstr "以外部程式保存狀態快取, 可包含子目錄" +msgstr "以外部程式保存狀態快取（包括子目錄），偵測檔案變更，並依狀態顯示圖示覆蓋。" -#. Resource IDs: (196) +#. Resource IDs: (3124) msgid "Status cache only for one folder, no recursive overlays" -msgstr "僅保存資料夾的狀態, 不包含子目錄" +msgstr "僅保存資料夾的狀態，不包含子目錄" -#. Resource IDs: (13) +#. Resource IDs: (202) msgid "Stops bisect mode" msgstr "停止二分法" -#. Resource IDs: (15) +#. Resource IDs: (233) msgid "" "Stores the path of the file to be used for a diff on a later right-click. " "Hold down the Ctrl key to remove the last saved path." -msgstr "儲存選定檔的路徑並用於稍後右鍵選單中的「比對差異」，按住Ctrl鍵可以清除先前儲存的路徑。" +msgstr "儲存選定檔的路徑並用於稍後右鍵選單中的「比較至」，按住Ctrl鍵可以清除先前儲存的路徑。" -#. Resource IDs: (1) +#. Resource IDs: (65535) msgid "Strategy" msgstr "策略" #. Resource IDs: (1406) msgid "Strip lines starting with \"#\" in commit message" -msgstr "移除以 \"#\" 開頭的提交訊息" +msgstr "移除以「#」開頭的提交訊息" -#. Resource IDs: (156) +#. Resource IDs: (10000, 65535) msgid "Style" msgstr "樣式" -#. Resource IDs: (1, 65) +#. Resource IDs: (9, 1024) msgid "Subject" msgstr "標題" -#. Resource IDs: (65535) +#. Resource IDs: (1714, 1715, 1717, 65535) msgid "Subject:" -msgstr "標題:" +msgstr "標題：" #. Resource IDs: (1639) msgid "Submodule" msgstr "子模組" -#. Resource IDs: (11) +#. Resource IDs: (170) msgid "Submodule &Update..." msgstr "子模組更新(&U)..." #. Resource IDs: (1589) msgid "Submodule Add" -msgstr "添加子模組" +msgstr "加入子模組" -#. Resource IDs: (20) +#. Resource IDs: (315) msgid "Submodule Add..." -msgstr "子模組新增" +msgstr "加入子模組..." #. Resource IDs: (4576) msgid "Submodule Diff" -msgstr "比較子模組" +msgstr "子模組差異" -#. Resource IDs: (76) +#. Resource IDs: (1215) msgid "Submodule Init" msgstr "子模組初始化" -#. Resource IDs: (20, 77) +#. Resource IDs: (316, 1227) msgid "Submodule Sync" msgstr "子模組同步" -#. Resource IDs: (76) +#. Resource IDs: (1214, 4578) msgid "Submodule Update" msgstr "子模組更新" @@ -9569,143 +9716,143 @@ msgstr "子模組更新" msgid "Submodule Update Options" msgstr "子模組更新選項" -#. Resource IDs: (90) +#. Resource IDs: (1433) #, c-format msgid "" "Submodule \"%1!s!\"\r\n" "Revision %2!s!" -msgstr "子模組 \"%1!s!\"\n版本 %2!s!" +msgstr "子模組「%1!s!」\n版本「%2!s!」" #. Resource IDs: (1585) msgid "Submodule of Project: " -msgstr "專案中的子模組: " +msgstr "專案中的子模組：" #. Resource IDs: (1708) msgid "Submodules" msgstr "子模組" -#. Resource IDs: (65) +#. Resource IDs: (1038) msgid "Success" msgstr "成功" -#. Resource IDs: (78) +#. Resource IDs: (1232) msgid "Switch" msgstr "切換" -#. Resource IDs: (229) +#. Resource IDs: (3652) #, c-format msgid "Switch %s to %s, Revision %s" -msgstr "切換 %s 至 %s, 版本 %s" +msgstr "切換 %s 至 %s，版本 %s" #. Resource IDs: (1522) msgid "Switch To" msgstr "切換至" -#. Resource IDs: (3606) +#. Resource IDs: (57681) msgid "" "Switch back to the previous window pane\n" "Previous Pane" msgstr "切換回前一個視窗區塊\n前一區塊" -#. Resource IDs: (156) +#. Resource IDs: (32775) msgid "Switch between single and double pane view" msgstr "在單區塊與雙區塊檢視模式間切換" -#. Resource IDs: (2049) +#. Resource IDs: (32775) msgid "" "Switch between single and double pane view\n" "Switch between single and double pane view" -msgstr "在單區塊與雙區塊檢視模式間切換\n切換單/雙區塊模式" +msgstr "在單區塊與雙區塊檢視模式間切換\n切換「單／雙」區塊模式" -#. Resource IDs: (156) +#. Resource IDs: (32811) msgid "Switch left and right view" msgstr "左右切換" -#. Resource IDs: (2051) +#. Resource IDs: (32811) msgid "" "Switch the contents of the left and right view\n" "Switch left and right view" msgstr "切換顯示在左半與右半的內容\n切換左右顯示" -#. Resource IDs: (3825) +#. Resource IDs: (61188) msgid "Switch to the next document window" msgstr "切換至下一個文件視窗" -#. Resource IDs: (3606) +#. Resource IDs: (57680) msgid "" "Switch to the next window pane\n" "Next Pane" msgstr "切換至下一個視窗區塊\n下一區塊" -#. Resource IDs: (3825) +#. Resource IDs: (61189) msgid "Switch to the previous document window" msgstr "切換至前一個文件視窗" #. Resource IDs: (304) msgid "Switch/Checkout" -msgstr "切換/取出" +msgstr "切換／取出" -#. Resource IDs: (1256) +#. Resource IDs: (20080) msgid "Switch/Checkout to" -msgstr "切換/取出至" +msgstr "切換／取出至" -#. Resource IDs: (1254) +#. Resource IDs: (20059) msgid "Switch/Checkout to this..." -msgstr "切換/取出到這個版本..." +msgstr "切換／取出到這個版本..." -#. Resource IDs: (9) +#. Resource IDs: (143) msgid "Switch/Checkout working tree to another branch/tag" -msgstr "切換工作目錄至其他分支/標記" +msgstr "「切換／取出」工作目錄至其他「分支／標記」" -#. Resource IDs: (325) +#. Resource IDs: (5190) msgid "Switches the comparison left<->right" msgstr "左右切換比對視窗" #. Resource IDs: (1733) msgid "Symbolize ref names" -msgstr "符號化參考點名稱" +msgstr "符號化參照名稱" #. Resource IDs: (11031) msgid "Symlink" msgstr "符號連結" -#. Resource IDs: (22) +#. Resource IDs: (340) msgid "Sync Remote Repositories, including pull, push, email patch and so on" -msgstr "同步遠端倉儲,包括拉取,推送,電郵補綴等等" +msgstr "同步遠端版本庫，包括拉取、推送、電郵補綴等等" -#. Resource IDs: (22) +#. Resource IDs: (339) msgid "Sync..." msgstr "同步..." -#. Resource IDs: (89) +#. Resource IDs: (1417, 1774) msgid "System" msgstr "系統" -#. Resource IDs: (93) +#. Resource IDs: (1474) msgid "System in offline mode. Check Internet Explorer." msgstr "系統在離線模式，請檢查 Internet Explorer。" -#. Resource IDs: (3857) +#. Resource IDs: (61707) msgid "" "System registry entries have been removed and the INI file (if any) was " "deleted." -msgstr "系統登錄紀錄及 INI 檔案(如果有) 移除完成." +msgstr "已經移除系統登錄項目，而且 INI 檔已經刪除 (如果有)。" #. Resource IDs: (5065) msgid "TIS-620" msgstr "TIS-620" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" -#. Resource IDs: (7) +#. Resource IDs: (109) msgid "TORTOISEGITUDIFF" msgstr "TORTOISEGITUDIFF" #. Resource IDs: (1513) msgid "Ta&gs:" -msgstr "標籤(&G)" +msgstr "標籤(&G)：" #. Resource IDs: (16970) msgid "Tab Placeholder" @@ -9713,26 +9860,26 @@ msgstr "分隔線" #. Resource IDs: (65535) msgid "Tab size:" -msgstr "Tab 寬度:" +msgstr "Tab 寬度：" -#. Resource IDs: (82) +#. Resource IDs: (1299, 1513, 65535) msgid "Tag" msgstr "標籤" #. Resource IDs: (1382) msgid "Tag (FF)" -msgstr "標籤 (直接遷移)" +msgstr "標籤 (快進)" -#. Resource IDs: (82) +#. Resource IDs: (1297) msgid "Tag Info" msgstr "標籤資訊" -#. Resource IDs: (79) +#. Resource IDs: (1263) #, c-format msgid "Tagged the working tree to %s" msgstr "標記工作目錄為 %s" -#. Resource IDs: (1485, 1513, 65535) +#. Resource IDs: (1485) msgid "Tags" msgstr "標籤" @@ -9740,11 +9887,11 @@ msgstr "標籤" msgid "Tags:" msgstr "標籤：" -#. Resource IDs: (64) +#. Resource IDs: (1019) msgid "Tasks" msgstr "工作" -#. Resource IDs: (1064) +#. Resource IDs: (17019) msgid "Tasks Pane" msgstr "工作面板" @@ -9756,11 +9903,11 @@ msgstr "暫時檔案 (包括 Gravatar 圖像)" msgid "Test" msgstr "測試" -#. Resource IDs: (219) +#. Resource IDs: (3502) msgid "Test Only" msgstr "僅測試" -#. Resource IDs: (157) +#. Resource IDs: (2506) msgid "Text Files (*.txt)|*.txt|All Files (*.*)|*.*||" msgstr "文字檔案 (*.txt)|*.txt|所有檔案 (*.*)|*.*||" @@ -9768,103 +9915,123 @@ msgstr "文字檔案 (*.txt)|*.txt|所有檔案 (*.*)|*.*||" msgid "Thai" msgstr "泰文" -#. Resource IDs: (71) +#. Resource IDs: (1124) msgid "" "The Remote Config was changed.\n" "Do you want to save now or discard changes?" -msgstr "遠端組態已改變\n要儲存/放棄？" +msgstr "遠端組態已改變\n要「儲存」或「放棄變更」？" -#. Resource IDs: (70) +#. Resource IDs: (1575) +msgid "" +"The \"number of\" value for those \"Last N\" options.\n" +"Should be > 0" +msgstr "給「最新(近)」選項用的設定值。\n值必需大於 0" + +#. Resource IDs: (1115) #, c-format msgid "" "The branch \"%s\" is a remote branch.\n" "\n" "Do you really want to delete it?" -msgstr "分支 \"%s\" 是一個 遠端分支\n\n確定要刪除？" +msgstr "分支「%s」是一個遠端分支\n\n確定要刪除？" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "The chunk size did not match the number of added/removed lines!" -msgstr "區塊大小與加入/移除的行數不符!" +msgstr "區塊（chunk）大小與「已加入／已移除」的行數不符！" -#. Resource IDs: (67) +#. Resource IDs: (1064) msgid "The commit message must not be empty." msgstr "提交訊息不得留空" -#. Resource IDs: (89) +#. Resource IDs: (1419) #, c-format msgid "" "The credential helper URL \"%s\" already exists.\n" "Do you want to overwrite it?" -msgstr "憑據助手 \"%s\" 已經存在\n要覆寫嗎？" +msgstr "憑證助手「%s」已經存在\n要覆寫嗎？" -#. Resource IDs: (89) +#. Resource IDs: (1420) msgid "" "The credential helper was changed.\n" "Do you want to save now or discard changes?" -msgstr "憑證組態已改變\n要儲存/放棄？" +msgstr "憑證組態已改變\n要「儲存」或「放棄變更」？" -#. Resource IDs: (603) +#. Resource IDs: (9641) msgid "" "The current working tree is not clean.\n" "Do you want to stash the changes?" -msgstr "現在工作目錄有改動，\n你想藏起(stash)改動嗎？" +msgstr "目前工作目錄有改動，\n你想藏起(stash)改動嗎？" + +#. Resource IDs: (1576) +msgid "" +"The default limitation of log messages when you open Log Message dialog.\n" +"Note: For showing all commits in Log Message dialog,\n" +"you can right click on \"FROM\" date control, then click \"No limitation\" item." +msgstr "開啟日誌訊息視窗時，限制提交的顯示量，亦即部分提交將不顯示。\n注意：要重新顯示全部的提交，\n可在「由：」日期選擇控制元件的右鍵選單中選擇「無限制」選項。" -#. Resource IDs: (68) +#. Resource IDs: (1080) #, c-format msgid "" "The diffing engine aborted because of an error:\n" "%s" -msgstr "差異比對引擎停止, 錯誤:\n%s" +msgstr "比較差異引擎中止了，由於錯誤：\n「%s」" -#. Resource IDs: (85) +#. Resource IDs: (1351) msgid "" "The entered source ref is ambiguous.\n" "You have to make it unique (e.g. by adding \"refs/heads/\" as a prefix for branches or \"refs/tags/\" for tags)!" -msgstr "輸入的參考點是無棱兩可的，\n你應輸入獨一無二的參考點(如：在分支名稱前加上 \"refs/heads/\" 或 在標籤名稱前加上 \"refs/tags/\")！" +msgstr "輸入的參照是模稜兩可的，\n你應輸入獨一無二的參照（如：在分支名稱前加上「refs/heads/」或在標籤名稱前加上「refs/tags/」）！" + +#. Resource IDs: (1579) +msgid "" +"The fetched branch fast-forwards upon the current branch.\n" +"\n" +"Merge or open the rebase dialog anyway?" +msgstr "已獲取的分支已快進到目前分支之上\n\n直接「快進合併」？或開啟「變基」視窗？" -#. Resource IDs: (64) +#. Resource IDs: (1020) #, c-format msgid "The file %s does not exist!" -msgstr "檔案 %s 不存在!" +msgstr "檔案 %s 不存在！" -#. Resource IDs: (64) +#. Resource IDs: (1021) #, c-format msgid "The file %s was not found in the patch file!" -msgstr "補綴檔中找不到檔案: %s!" +msgstr "在補綴檔中找不到檔案「%s」！" -#. Resource IDs: (64) +#. Resource IDs: (1013) #, c-format msgid "" "The file \"%s\" does not exist in your working tree.\n" "Do you want to select another file to diff?" -msgstr "這檔案 \"%s\" 不在工作目錄，要選擇另一檔案以進行比對嗎？" +msgstr "工作目錄中沒有這個檔案「%s」，要選擇另一檔案以進行比較嗎？" -#. Resource IDs: (314) +#. Resource IDs: (5012) #, c-format msgid "" "The file \n" "%s\n" "is empty.\n" "Do you want to remove the file?" -msgstr "檔案 \n%s\n是空的.\n確定要刪除嗎?" +msgstr "檔案 \n%s\n是空的。\n確定要刪除嗎？" -#. Resource IDs: (69) +#. Resource IDs: (1103) msgid "The file is too big" -msgstr "檔案過大." +msgstr "檔案太大" -#. Resource IDs: (3857) +#. Resource IDs: (61701) msgid "The file is too large to open." msgstr "檔案過大, 無法開啟." -#. Resource IDs: (80) +#. Resource IDs: (1266) #, c-format msgid "" "The file\n" "%s\n" "already exists! Do you want to overwrite it?" -msgstr "檔案 \n%s\n已存在! 是否要覆寫?" +msgstr "檔案 \n%s\n已存在！是否要覆寫？" -#. Resource IDs: (69) +#. Resource IDs: (1101) #, c-format msgid "" "The file\n" @@ -9872,94 +10039,94 @@ msgid "" "is not a valid text file!" msgstr "檔案\n%s\n不是有效的文字檔！" -#. Resource IDs: (145) +#. Resource IDs: (2318) #, c-format msgid "" "The folder %s\n" "contains unversioned and/or modified file(s). Do you want to remove it anyway?" -msgstr "目錄 %s\n裡有未做版本控制以及可能有修改過的檔案. 確定要刪除嗎?" +msgstr "目錄 %s\n裡有未做版本控制以及可能有修改過的檔案。確定要刪除嗎？" -#. Resource IDs: (88) +#. Resource IDs: (1400) #, c-format msgid "" "The folder \n" "%s\n" "does not exist.\n" "Would you like to create it first?" -msgstr "資料夾 \n%s\n 不存在.\n是否要先建立?" +msgstr "資料夾 \n%s\n 不存在。\n是否要先建立？" -#. Resource IDs: (83) +#. Resource IDs: (1320) #, c-format msgid "" "The hook script returned an error:\n" "%s" -msgstr "掛勾指令檔傳回錯誤:\n%s" +msgstr "掛鉤指令檔傳回錯誤：\n%s" -#. Resource IDs: (7) +#. Resource IDs: (106) msgid "The image can not be shown." msgstr "無法顯示圖片" -#. Resource IDs: (63) +#. Resource IDs: (1007) msgid "" "The issue-tracker provider could not be created. Please check that it is " "installed correctly." -msgstr "無法成功建立bug追踪提供者. 請檢查是否有正確安裝." +msgstr "無法成功建立 bug 追踪提供者。請檢查是否有正確安裝。" -#. Resource IDs: (64) +#. Resource IDs: (1008) msgid "The issue-tracker provider was unable to validate the parameter string" msgstr "bug 追踪程式提供者無法檢驗參數的正確性" -#. Resource IDs: (63) +#. Resource IDs: (1003) #, c-format msgid "The line indicating the new file was expected in line %d !" -msgstr "新檔案的標示行應該位於第 %d 行!" +msgstr "新檔案的標示行應該位於第 %d 行！" -#. Resource IDs: (88) +#. Resource IDs: (1401) #, c-format msgid "The line number must be in between %d and %d" msgstr "行號必須在 %d 至 %d 之間" -#. Resource IDs: (86) +#. Resource IDs: (1361) #, c-format msgid "The local branch \"%s\" does not fast-forward to the remote branch \"%s\"." -msgstr "本地分支 \"%s\" 並不可直接遷移到遠端分支 \"%s\"" +msgstr "本地分支「%s」無法快進到遠端分支「%s」" -#. Resource IDs: (64) +#. Resource IDs: (1023) msgid "" "The local branch name and the remote branch name are empty.\n" "Continue?" msgstr "本地和遠端分支為空，繼續嗎？" -#. Resource IDs: (64) +#. Resource IDs: (1022) msgid "" "The local branch/tag name is empty. This results in a remote removal.\r\n" "Continue?" -msgstr "本地分支/標籤為空，這導致刪除遠端分支/標籤。繼續嗎？" +msgstr "本地的「分支／標籤」為空，這會導致刪除遠端的「分支／標籤」。繼續嗎？" -#. Resource IDs: (198) +#. Resource IDs: (3160) msgid "" "The maximum number of action log lines to keep.\n" "Any lines added over this limit will remove the oldest lines from the file." -msgstr "行為紀錄的最大保留行數.\n超過上限的時候會從最舊的開始移除." +msgstr "行為日誌的最大保留行數。\n超過上限的時候會從最舊的開始移除。" -#. Resource IDs: (220) +#. Resource IDs: (3505) msgid "The operation failed." -msgstr "操作失敗." +msgstr "操作失敗。" -#. Resource IDs: (74) +#. Resource IDs: (1183) msgid "" "The parameters '/path' and '/pathfile' are mutually exclusive.\n" "You must only specify one of them." -msgstr "參數 '/path' 和 '/pathfile' 不能同時使用.\n請指定其中一個." +msgstr "參數「/path」和「/pathfile」不能同時使用。\n請指定其中一個。" -#. Resource IDs: (7) +#. Resource IDs: (2801) #, c-format msgid "" "The patch does not apply cleanly to %s and no version information is given.\n" "Patching is not possible!" -msgstr "補綴檔無法乾淨地套用至 %s，沒有版本資訊\n使補綴不可能" +msgstr "版本資訊是空的，因此補綴檔無法乾淨地套用至 「%s」。\n不可能進行補綴！" -#. Resource IDs: (64) +#. Resource IDs: (1022) #, c-format msgid "" "The patch seems outdated! The file line\n" @@ -9967,9 +10134,9 @@ msgid "" "and the patchline\n" "%s\n" "do not match!" -msgstr "補綴檔似乎過舊! 檔案中此行\n%s\n與補綴檔中此行\n%s\n不符合！" +msgstr "補綴檔似乎過時了！檔案中此行\n「%s」\n與補綴檔中此行\n「%s」\n不符合！" -#. Resource IDs: (88) +#. Resource IDs: (1407) msgid "" "The path/URL you've entered seems to be illegal on Windows!\n" "You can try it anyway, but you might get an error later.\n" @@ -9978,9 +10145,9 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n" "\n" "Do you want to proceed anyway?" -msgstr "您輸入的 路徑/URL 在Windows上有錯誤!\n您可以照用, 但之後可能發生問題.\n\n檔案名稱中不可以包含下列字元 '<<>|\"?*:' 或是下列的裝置名稱:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\n確定要繼續嗎?" +msgstr "您輸入的「路徑／URL」在 Windows 上有錯誤！\n您可以照用，但之後可能發生問題。\n\n檔案名稱中不可以包含下列字元「<<>|\"?*:」或是下列的裝置名稱：\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$\n\n確定要繼續嗎？" -#. Resource IDs: (314) +#. Resource IDs: (5008) #, c-format msgid "" "The path\n" @@ -9989,209 +10156,216 @@ msgid "" "But TortoiseGitMerge found the path\n" "%s\n" "matches it better. Do you want to use the suggested path instead?" -msgstr "路徑\n%s\n與補綴檔中的路徑不相符.\nTortoiseGitMerge找到了\n%s\n可能是正確的路徑. 要改用找到的路徑嗎?" +msgstr "該路徑\n「%s」\n與補綴檔中的路徑不相符。\nTortoiseGitMerge 找到了\n「%s」\n可能是正確的路徑。要改用這個建議的路徑嗎？" -#. Resource IDs: (91) +#. Resource IDs: (1440) msgid "" "The process is still running.\n" "Are you sure to abort?" -msgstr "程序仍在執行中，\n確定要終止？" +msgstr "程序仍在執行中。\n確定要中止？" -#. Resource IDs: (70) +#. Resource IDs: (1113) msgid "" "The regular expression is invalid!\n" "Please enter a valid regular expression." msgstr "該正規表示式是無效的！\n請輸入一個有效的正規表示式。" -#. Resource IDs: (71) +#. Resource IDs: (1123) #, c-format msgid "" "The remote \"%s\" already exists.\n" "Do you want to overwrite it?" -msgstr "遠端 \"%s\" 已經存在\n要覆寫嗎？" +msgstr "遠端「%s」已經存在\n要覆寫嗎？" + +#. Resource IDs: (1573) +msgid "" +"The remote branch has not changed.\n" +"\n" +"Open the rebase dialog anyway?" +msgstr "遠端分支並沒有改變。\n仍然要開啟「變基」視窗？" -#. Resource IDs: (80) +#. Resource IDs: (1267) msgid "The repository was successfully created." -msgstr "倉儲建立成功." +msgstr "版本庫建立成功。" -#. Resource IDs: (78) +#. Resource IDs: (1240) msgid "" "The selected file appears to still have one or more conflict markers in it.\n" "Are you sure you want to mark the file resolved?" -msgstr "選擇的檔案尚有一個以上的衝突標記.\n你確定要將之視為已解決?" +msgstr "選擇的檔案尚有一個以上的衝突標記。\n你確定要將之視為已解決？" -#. Resource IDs: (170) +#. Resource IDs: (2709) #, c-format msgid "" "The submodule \"%s\" is dirty.\n" "Merely committing the superproject cannot track or save such changes to the submodule.\n" "Commit the submodule now or ignore dirty changes?" -msgstr "子模組 \"%s\" 有未提交的變更，\n僅僅提交至父專案並不能夠儲存子模組的變更。\n要現在提交子模組的變更，還是忽略呢？" +msgstr "子模組「%s」有未提交的變更，\n僅僅提交至上層專案並不能夠儲存子模組的變更。\n要現在提交子模組的變更，還是忽略呢？" -#. Resource IDs: (93) +#. Resource IDs: (1483) #, c-format msgid "" "The target folder \n" "%s\n" "is a special folder and is not supposed to be a repository root!\n" "Are you sure you want to initialize a git repository inside that folder?" -msgstr "目的資料夾\n%s\n是特殊資料夾，可能不適合用作檔案庫根目錄！\n確定要初始化 git 檔案庫至那個資料夾嗎？" +msgstr "目的資料夾\n%s\n是特殊資料夾，可能不適合用作版本庫根目錄！\n確定要初始化 git 版本庫至那個資料夾嗎？" -#. Resource IDs: (88) +#. Resource IDs: (1404) #, c-format msgid "" "The target folder \n" "%s\n" "is not empty!\n" "Are you sure you want to initialize a git repository inside that folder?" -msgstr "目的資料夾\n%s\n有其它檔案！\n確定要初始化 git 檔案庫至那個資料夾嗎？" +msgstr "目的資料夾\n%s\n有其它檔案！\n確定要初始化 git 版本庫至那個資料夾嗎？" -#. Resource IDs: (101) +#. Resource IDs: (1600) msgid "" "The text is identical, but the files do not match!\r\n" "The following differences were found:" msgstr "內文是相同的，但檔案並不完全相符！\n找到以下的差異：" -#. Resource IDs: (195) +#. Resource IDs: (3115) msgid "" "The time in seconds after which the parsing of the selected files stops.\r\n" "A lower value will make the auto-completion list available sooner,\r\n" "but maybe not scan all files." -msgstr "處理選定檔案的時間上限(單位是秒).\r\n設定較低的值能讓自動完成列表較快出現,\r\n但不一定來得及處理完全部檔案." +msgstr "處理選定檔案的時間上限（單位是秒）。\n設定較低的值能讓自動完成列表較快出現，\n但不一定來得及處理完全部檔案。" -#. Resource IDs: (82) +#. Resource IDs: (1311) msgid "" "The two selected URL's are not created from the same root.\n" "It's not possible to show the log messages between them!" -msgstr "選擇的兩個 URL 不是由同樣的來源建立的.\n無法顯示兩者之間的紀錄訊息." +msgstr "選擇的兩個 URL 不是由同樣的來源建立的。\n無法顯示兩者之間的日誌訊息。" -#. Resource IDs: (96) +#. Resource IDs: (1524) msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" -msgstr "工作目錄不乾淨且包含未準備好提交的變更內容。檢視並提交變更內容？" +msgstr "工作目錄不乾淨且包含未預存到索引的變更內容。檢閱並提交變更內容？" #. Resource IDs: (65535) msgid "Their file:" -msgstr "遠端檔案:" +msgstr "遠端檔案：" -#. Resource IDs: (263) +#. Resource IDs: (1681, 4200) msgid "Theirs" msgstr "對方的" -#. Resource IDs: (169) +#. Resource IDs: (2700) msgid "" "There are changes or unversioned items inside one or more submodule.\n" "Those files are not listed for commit. You need to commit those files in submodule" -msgstr "子模組包含的目錄中有修改或是未納入版本控制的檔案.\n那些檔案不會列在提交列表中, 您必須自行送交那些檔案." +msgstr "子模組的目錄中包含有修改或是未納入版本控制的檔案。\n那些檔案不會列在提交列表中，你必須在子模組內提交那些檔案。" -#. Resource IDs: (198) +#. Resource IDs: (3162) #, c-format msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." -msgstr "除了 Tortoise 以外，現在還有%d 個圖示覆蓋。" +msgstr "除了 Tortoise 以外，目前還有 %d 個圖示覆蓋。" -#. Resource IDs: (316) +#. Resource IDs: (5047) msgid "" "There are more editable views.\n" "What view do you want to save?" msgstr "尚有可編輯的視窗。\n您要儲存那一側的視窗？" -#. Resource IDs: (64) +#. Resource IDs: (1009) msgid "There are no issue-tracker providers available." -msgstr "目前沒有可用的bug追踪程式提供者." +msgstr "目前沒有可用的 bug 追踪程式提供者。" -#. Resource IDs: (66) +#. Resource IDs: (1041) #, c-format msgid "" "There are still unresolved conflicts in line %d!\n" "You should resolve those conflicts first before saving.\n" "Do you want to save the file with the conflicts still there?\n" "If you click YES, then you have to manually resolve the conflicts in another editor!" -msgstr "%d 行還有尚未處理的衝突!\n請在儲存之前先解決它們.\n你確定要在還有衝突時儲存檔案嗎?\n如果你選擇 \"是\", 之後必須自行在其它編輯器中處理衝突!" +msgstr "%d 行還有尚未處理的衝突！\n請在儲存之前先解決它們。\n你確定要在還有衝突時儲存檔案嗎？\n如果你選擇「是」，之後必須自行在其它編輯器中處理衝突！" -#. Resource IDs: (313) +#. Resource IDs: (5005) msgid "" "There are unsaved modifications!\n" "Do you want to save your changes?" -msgstr "還有尚未儲存的變更!\n是否要儲存你所做的變動?" +msgstr "還有尚未儲存的變更！\n是否要儲存你所做的變動？" -#. Resource IDs: (82) +#. Resource IDs: (1306) msgid "" "There is nothing to add. All the files and folders are either under version " "control, have been ignored or the global ignore configuration setting." -msgstr "没有可增加的項目，所有檔案和資料夾都已經進行了版本控制、被忽略或全域忽略設定中設為忽略。" +msgstr "没有可加入的項目。所有檔案要不是已經進行了版本控制、不然就是被忽略或者被全域忽略設定設為忽略。" -#. Resource IDs: (1253) +#. Resource IDs: (20042) msgid "Thesaurus" -msgstr "倉庫" +msgstr "同義字" -#. Resource IDs: (3887) +#. Resource IDs: (62181) msgid "" "These are more recently saved than the currently open documents and contain " "changes that were made before the application closed." -msgstr "這些是比目前版本還要更新的儲存檔，並含有程式關閉前留下的變更" +msgstr "這些是比目前版本還要更新的儲存檔，並含有程式關閉前留下的變更。" -#. Resource IDs: (78) +#. Resource IDs: (1237) msgid "This field is required and must not be empty." msgstr "此欄必填，不得留空" -#. Resource IDs: (83) +#. Resource IDs: (1314) msgid "" "This is not a valid URL.\n" "Please enter an URL here." -msgstr "URL 錯誤.\n請輸入正確的URL." +msgstr "URL 錯誤。\n請輸入正確的URL。" -#. Resource IDs: (82) +#. Resource IDs: (1308) msgid "" "This is not a valid path!\n" "A valid path must not contain '<<>|\"?*:' or one of the following device names:\n" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -msgstr "路徑錯誤!\n正確的路徑不可以包含'<<>|\"?*:' 或是下列的裝置名:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" +msgstr "路徑錯誤！\n正確的路徑不可以包含「<<>|\"?*:」或是下列的裝置名稱：\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" -#. Resource IDs: (98) +#. Resource IDs: (1557) msgid "" "This operation cannot be started while the log dialog is still loading " "commits." -msgstr "在記錄視窗仍在載入提交時，不能開始這動作。" +msgstr "在日誌視窗仍在載入提交時，不能開始這動作。" -#. Resource IDs: (3857) +#. Resource IDs: (61710) #, c-format msgid "" "This program is linked to the missing export %s in the file %s. This machine" " may have an incompatible version of %s." msgstr "找不到本程式連結的 %s (包含於 %s). 可能安裝了不相容版本的 %s." -#. Resource IDs: (3857) +#. Resource IDs: (61709) #, c-format msgid "This program requires the file %s, which was not found on this system." msgstr "系統中找不到本程式需要的 %s." -#. Resource IDs: (15) +#. Resource IDs: (230) msgid "This property is only allowed on folders, not files." -msgstr "這個性質只能設置在資料夾上, 檔案不能." +msgstr "這個性質只能設置在資料夾上，檔案不能。" -#. Resource IDs: (95) +#. Resource IDs: (1505) msgid "" "This remote name collides with fetch refspec of other remotes\n" "Please use another name" msgstr "遠端名稱與其他遠端的獲取 refspec 衝突，請用另一名稱" -#. Resource IDs: (67) +#. Resource IDs: (1059) msgid "This task requires a clean working tree." -msgstr "這工作需要清潔的工作目錄" +msgstr "這工作需要乾淨的工作目錄。" -#. Resource IDs: (1016) +#. Resource IDs: (16244) msgid "" "This will delete the record of commands you've used in this application and " "restore the default set of visible commands to the menus and toolbars. It " "will not undo any explicit customizations. Are you sure you want to do this?" -msgstr "這個動作會刪除你在本程式中的所有命令紀錄, 並將所有選單和工具列設為預設值. 它不會消除任何外部設定值. 你確定要繼續嗎?" +msgstr "這將會刪除您在這個應用程式中所使用的命令記錄，並且將可見命令的預設組合還原為功能表與工具列。這並不會復原任何明確的自訂值。您確定要這樣做嗎?" -#. Resource IDs: (604) +#. Resource IDs: (9659) msgid "Three way diff" -msgstr "3路比較" +msgstr "三方比較差異" #. Resource IDs: (16928) msgid "Tile &Vertically" @@ -10205,32 +10379,32 @@ msgstr "水平排列(&Z)" msgid "To" msgstr "至" -#. Resource IDs: (1422) +#. Resource IDs: (1429) msgid "" "To avoid fetching wrong tags, if this is not an official remote,\n" "you are advised to disable tag fetching for this remote.\n" "Disable tag fetching?" -msgstr "為了避免獲取錯誤的標籤，若這不是一個官方的遠端，\n建議禁用從這個遠端獲取標籤。\n要禁用獲取標籤？" +msgstr "若這不是一個官方的遠端，為了避免獲取錯誤的標籤，\n建議禁用從這個遠端獲取標籤。\n要禁用獲取標籤？" -#. Resource IDs: (606) +#. Resource IDs: (9683) msgid "" "To clear temporary files, you should ensure that no other TortoiseGit applications are running.\n" "\n" "If you wish to completely clear Gravatar images,\n" "you may also need to clear Internet Explorer Temporary Internet Files." -msgstr "要清除暫時檔案，你應確定沒有其他的 TortoiseGit 應用程式在執行。\n\n若你想徹底清除 Gravatar 圖像，你可能需要清除 INternet Explorer 暫存檔案。" +msgstr "要清除暫時檔案，你應確定沒有其他的 TortoiseGit 應用程式在執行。\n\n若你想徹底清除 Gravatar 圖像，你可能需要清除 Internet Explorer 暫存檔案。" #. Resource IDs: (1201, 65535) msgid "To:" -msgstr "到:" +msgstr "到：" -#. Resource IDs: (3633) +#. Resource IDs: (58113) msgid "" "Toggle One/Two Pages display\n" "Toggle One/Two Pages display" -msgstr "切換單/雙頁顯示\n切換單/雙頁顯示" +msgstr "切換「單／雙」頁顯示\n切換「單／雙」頁顯示" -#. Resource IDs: (93) +#. Resource IDs: (1482) msgid "Toggle filters" msgstr "反選取過濾器" @@ -10242,11 +10416,11 @@ msgstr "工具列" msgid "Toolbar Name" msgstr "工具列名稱" -#. Resource IDs: (1064) +#. Resource IDs: (17017) msgid "Toolbar Options" msgstr "工具列選項" -#. Resource IDs: (1001) +#. Resource IDs: (16008) msgid "Toolbar internal error. Please contact your application vendor." msgstr "工具列內部錯誤. 請聯絡應用程式開發者." @@ -10260,18 +10434,18 @@ msgstr "工具" #. Resource IDs: (65535) msgid "Tools:" -msgstr "工具:" +msgstr "工具：" -#. Resource IDs: (65, 65535) +#. Resource IDs: (1026, 4594, 65535) msgid "TortoiseGit" msgstr "TortoiseGit" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGit %d.%d.%d, Build %d - %s, %s" msgstr "TortoiseGit %d.%d.%d, Build %d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGit %d.%d.%d.%d %s \r\n" @@ -10281,20 +10455,20 @@ msgstr "TortoiseGit %d.%d.%d.%d %s \n%s \n" #. Resource IDs: (1410) #, c-format msgid "" -"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\".\n" +"TortoiseGit detected that the file \"%s\" does not exist, but is staged as \"Added\" or \"Modified\".\n" "The commit dialog cannot handle this.\n" "\n" -"Do you want to remove it from the index?" -msgstr "TortoiseGit 偵測到檔案 \"%s\" 不存在，但被加入索引中。\n提交對話盒不能處理這情況。\n\n你要從索引中移除此檔案嗎？" +"Do you want to restore or remove it from the index?" +msgstr "TortoiseGit 偵測到工作目錄中沒有「%s」檔案，但在索引中已被預存為「已加入」或「已修改」。\n提交對話框不能處理此種情況。\n\n你要從索引中「還原」此檔案到工作目錄？或者從索引中「移除」此檔案？" -#. Resource IDs: (98) +#. Resource IDs: (1560) #, c-format msgid "" "TortoiseGit has detected similar filenames. Do you want the files:%s\n" "to be renamed too?" -msgstr "TortoiseGit 偵測到類似的檔名. 要一起變更 %s 嗎？" +msgstr "TortoiseGit 偵測到類似的檔名。要一起變更 %s 嗎？" -#. Resource IDs: (198) +#. Resource IDs: (3163) #, c-format msgid "TortoiseGit will not show the following overlays: %s" msgstr "TortoiseGit 不會顯示以下的圖示覆蓋：%s" @@ -10303,18 +10477,18 @@ msgstr "TortoiseGit 不會顯示以下的圖示覆蓋：%s" msgid "TortoiseGit&UDiff" msgstr "TortoiseGit&UDiff" -#. Resource IDs: (1, 244, 1000, 3585) +#. Resource IDs: (3, 244, 1000, 57344) msgid "TortoiseGitBlame" msgstr "TortoiseGitBlame" -#. Resource IDs: (1) +#. Resource IDs: (7) #, c-format msgid "" "TortoiseGitBlame was already initialized for the repository \"%s\". Cannot " "switch to another repository (\"%s\") at runtime." -msgstr "已為檔案庫 \\\"%s\\\" 初始化，在執行階段無法切換至另一檔案庫 \\\"%s\\\" 。" +msgstr "已為版本庫「%s」初始化，在執行階段無法切換至另一版本庫「%s」。" -#. Resource IDs: (1) +#. Resource IDs: (2) #, c-format msgid "TortoiseGitBlame, Version %d.%d.%d.%d" msgstr "TortoiseGitBlame, 版本 %d.%d.%d.%d" @@ -10330,15 +10504,15 @@ msgid "" "TortoiseGitBlame.Document" msgstr "TortoiseGitBlame\n\nTortoiseGitBlam\n\n\nTortoiseGitBlame.Document\nTortoiseGitBlame.Document" -#. Resource IDs: (7, 153) +#. Resource IDs: (103, 153) msgid "TortoiseGitIDiff" msgstr "TortoiseGitIDiff" #. Resource IDs: (65535) msgid "TortoiseGitIDiff - An image diff tool, part of TortoiseGit" -msgstr "TortoiseGitIDiff - 影像比對工具, TortoiseGit 的一部分" +msgstr "TortoiseGitIDiff － 影像比對工具，TortoiseGit 的一部分。" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitIDiff: the image diff viewer for TortoiseSVN\n" "\n" @@ -10350,18 +10524,18 @@ msgid "" "/overlay\t\tto enable overlay mode\n" "/fit\t\tto fit the images sizes\n" "/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顯示影像資訊" +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: (7, 130, 3585) +#. Resource IDs: (100, 130, 156, 1271, 32897, 57344) msgid "TortoiseGitMerge" msgstr "TortoiseGitMerge" -#. Resource IDs: (107) +#. Resource IDs: (1701) #, c-format msgid "TortoiseGitMerge %d.%d.%d.%d - %s, %s" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s" -#. Resource IDs: (107) +#. Resource IDs: (1700) #, c-format msgid "" "TortoiseGitMerge %d.%d.%d.%d - %s, %s\r\n" @@ -10370,18 +10544,18 @@ msgid "" "apr-util %d.%d.%d" msgstr "TortoiseGitMerge %d.%d.%d.%d - %s, %s\nlibsvn_diff %d.%d.%d, %s\napr %d.%d.%d\napr-util %d.%d.%d" -#. Resource IDs: (7) +#. Resource IDs: (2800) #, c-format msgid "" "TortoiseGitMerge cannot process this patch file. The filename \"%s\" appears" " more than once." -msgstr "TortoiseGitMerge 無法處理這補綴檔，檔名 %s 出現多於一次" +msgstr "TortoiseGitMerge 無法處理這個補綴檔，檔名「%s」出現多於一次。" -#. Resource IDs: (357) +#. Resource IDs: (103, 357) msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "" "TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" "\n" @@ -10390,27 +10564,27 @@ msgid "" "/title:\"title to show for the viewer\"\n" "/? - this help dialog\n" "/p - read diff input from console pipe" -msgstr "TortoiseGitUDiff: TortoiseGit 的單一差異檔檢視器\n可使用的命令列參數有:\n/patchfile:\"單一差異檔的路徑\"\n/title:\"要顯示在檢視器抬頭的文字\"\n/? - 顯示關於這個對話框的說明文件\n/p - 從控制台管道讀取差異輸入" +msgstr "TortoiseGitUDiff：TortoiseGit 的統合式差異檔檢視器\n\n可使用的命令列參數有：\n/patchfile:\"統合式差異檔的路徑\"\n/title:\"要顯示在檢視器抬頭的文字\"\n/? - 顯示關於這個對話框的說明文件\n/p - 從控制台管道讀取差異輸入" #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" -msgstr "總變更行數包含新增/刪除的檔案" +msgstr "總變更行數，包含「已加入／已刪除」的檔案" #. Resource IDs: (1737) msgid "Total changed lines not including added/deleted files:" -msgstr "總變更行數不包含新增/刪除的檔案" +msgstr "總變更行數，不包含「已加入／已刪除」的檔案" #. Resource IDs: (1162) msgid "Total commits analyzed:" -msgstr "總分析提交紀錄:" +msgstr "已分析的總提交：" #. Resource IDs: (1163) msgid "Total file changes:" -msgstr "總檔案變更:" +msgstr "總檔案變更：" #. Resource IDs: (1520) msgid "Trac&k" -msgstr "追蹤(&k)" +msgstr "追蹤(&K)" #. Resource IDs: (1520) msgid "Track" @@ -10420,62 +10594,58 @@ msgstr "追蹤" msgid "Tracked Remote Branch:" msgstr "追蹤遠端分支：" -#. Resource IDs: (94) +#. Resource IDs: (1497) msgid "Tracked branch" msgstr "追蹤分支" -#. Resource IDs: (357) +#. Resource IDs: (5700) #, c-format msgid "Transferring at %s" -msgstr "傳輸中: %s" +msgstr "傳輸中：%s" #. Resource IDs: (32816) msgid "Transparent &color..." msgstr "透明色(&C)..." -#. Resource IDs: (501) +#. Resource IDs: (8005) msgid "Trim right" msgstr "切齊右側" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Try a 'Cleanup'. If that doesn't work you need to do a fresh checkout." -msgstr "試試 '清理'. 如果它沒有效, 你需要重新取出檔案." - -#. Resource IDs: (73) -msgid "Try again" -msgstr "再試一次" +msgstr "試試「清理」。如果它沒有效，你需要重新取出檔案。" #. Resource IDs: (65535) msgid "Turkish" msgstr "土耳其文" -#. Resource IDs: (10) +#. Resource IDs: (150) msgid "Tweak TortoiseGit" msgstr "調校 TortoiseGit" -#. Resource IDs: (1642) +#. Resource IDs: (1642, 17130) msgid "Type" msgstr "類型" -#. Resource IDs: (1720) +#. Resource IDs: (1720, 1722) msgid "Type:" -msgstr "類別：" +msgstr "類型：" -#. Resource IDs: (164, 207) +#. Resource IDs: (164, 3307) msgid "URL" msgstr "URL" -#. Resource IDs: (71) +#. Resource IDs: (1133) msgid "URL and directory must not be empty." msgstr "URL 或 目錄 不可為空" #. Resource IDs: (1272) msgid "URL history" -msgstr "URL 紀錄" +msgstr "URL 記錄" #. Resource IDs: (65535) msgid "URL:" -msgstr "URL:" +msgstr "URL：" #. Resource IDs: (5071) msgid "UTF-16 BE" @@ -10489,124 +10659,128 @@ msgstr "UTF-16 LE" msgid "UTF-8" msgstr "UTF-8" -#. Resource IDs: (3866) +#. Resource IDs: (61840) msgid "Unable to load mail system support." msgstr "無法載入郵件系統功能." -#. Resource IDs: (3865) +#. Resource IDs: (61826) msgid "Unable to process command, server busy." -msgstr "伺服器忙碌中, 無法處理命令." +msgstr "伺服器忙碌中，無法處理命令。" -#. Resource IDs: (3859) +#. Resource IDs: (61731) #, c-format msgid "Unable to read from %1, it is opened by someone else." msgstr "無法讀取 %1, 因為另外有人開啟." -#. Resource IDs: (3865) +#. Resource IDs: (61836) msgid "Unable to read write-only property." msgstr "無法讀取唯寫性質." -#. Resource IDs: (119) +#. Resource IDs: (1891) msgid "" "Unable to reconstruct working tree path!\n" "This can happen if the file has been renamed.\n" "Please start the log dialog on this specific file alone and then revert the changes\n" "from the top pane in the log dialog." -msgstr "無法重建工作目錄路徑!\n如果檔案名稱有變動, 可能造成這個問題.\n請對特定檔案查詢紀錄, 並從紀錄視窗上方將變更\n復原." +msgstr "無法重建工作目錄路徑！\n如果檔案名稱有變動，可能造成這個問題。\n請對特定檔案查詢日誌，並從日誌視窗上方將變更\n復原。" -#. Resource IDs: (3865) +#. Resource IDs: (61837) msgid "Unable to write read-only property." msgstr "無法寫入唯讀性質." -#. Resource IDs: (3859) +#. Resource IDs: (61732) #, c-format msgid "Unable to write to %1, it is read-only or opened by someone else." msgstr "無法寫入 %1, 它可能被設為唯讀或另有人開啟." -#. Resource IDs: (3887) +#. Resource IDs: (62177) msgid "Uncheck" msgstr "取消勾選" -#. Resource IDs: (156) +#. Resource IDs: (57643) msgid "Undo" msgstr "復原" -#. Resource IDs: (1069) +#. Resource IDs: (17102) #, c-format msgid "Undo %d Actions" msgstr "復原 %d 個動作" -#. Resource IDs: (1069) +#. Resource IDs: (17103) msgid "Undo 1 Action" msgstr "復原 1 個動作" -#. Resource IDs: (14) +#. Resource IDs: (212) msgid "Undo Add..." msgstr "取消加入..." -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last action\n" "Undo" msgstr "還原上次動作\n還原" -#. Resource IDs: (3603) +#. Resource IDs: (57643) msgid "" "Undo the last modifications\n" "Undo" msgstr "還原上次動作\n還原" -#. Resource IDs: (3859) +#. Resource IDs: (61728) msgid "Unexpected file format." msgstr "預期外的檔案格式." -#. Resource IDs: (93) +#. Resource IDs: (1481) msgid "Unflag as skip-worktree and assume-unchanged" msgstr "取消 skip-worktree 及 assume-unchanged 標記" -#. Resource IDs: (1070) +#. Resource IDs: (17111) msgid "Unfold" msgstr "展開" -#. Resource IDs: (3850) +#. Resource IDs: (61591) msgid "" "Unformatted Text\n" "text without any formatting" msgstr "無格式文字\n沒有設定格式的文字" -#. Resource IDs: (2054) +#. Resource IDs: (32849) msgid "Unified &diff of HEAD revisions" -msgstr "HEAD 版本的單一差異 (&D)" +msgstr "HEAD 版本的統合式差異 (&D)" -#. Resource IDs: (1258) +#. Resource IDs: (9668, 20114) msgid "Unknown" msgstr "不明" -#. Resource IDs: (20) +#. Resource IDs: (305) msgid "Unknown depth" msgstr "不明層數" -#. Resource IDs: (252) +#. Resource IDs: (4019) msgid "Unmark this block" msgstr "取消標記這個區塊" -#. Resource IDs: (315) +#. Resource IDs: (5033) msgid "Unresolved conflicts!" msgstr "未消除的衝突！" -#. Resource IDs: (3841) +#. Resource IDs: (1558) +msgid "Unset tracked branch" +msgstr "取消遠端追蹤分支" + +#. Resource IDs: (61443) msgid "Untitled" msgstr "未命名" -#. Resource IDs: (1462) +#. Resource IDs: (1462, 1703) msgid "Unversioned" msgstr "未有版本控制" #. Resource IDs: (1313) msgid "Unversioned files mark parent folder as modified" -msgstr "含有無版本控制的檔案時, 上層資料夾顯示為已修改" +msgstr "含有無版本控制的檔案時，將上層資料夾標記為「已修改」" -#. Resource IDs: (286) +#. Resource IDs: (4563) #, c-format msgid "Unversioning %s" msgstr "正在清除 %s 的版本控制資訊" @@ -10619,58 +10793,54 @@ msgstr "向上" msgid "Update" msgstr "更新" -#. Resource IDs: (607) +#. Resource IDs: (9697) msgid "Update Ref" -msgstr "更新參考點" +msgstr "更新參照" -#. Resource IDs: (65) +#. Resource IDs: (1028) msgid "Update Submodules" msgstr "更新子模組" -#. Resource IDs: (74) +#. Resource IDs: (1169) msgid "Updated" msgstr "更新" -#. Resource IDs: (3849) +#. Resource IDs: (61581) msgid "Updating ActiveX objects" msgstr "正在更新 ActiveX 物件" -#. Resource IDs: (68) +#. Resource IDs: (1083) msgid "Updating index" msgstr "更新索引中" #. Resource IDs: (16530) msgid "Use &Default Image: " -msgstr "使用預設影像(&D):" +msgstr "使用預設影像(&D)：" #. Resource IDs: (1024) msgid "Use &one-pane view as default for 2-file diff" -msgstr "雙檔案比較時, 預設使用單區檢視(&O)" +msgstr "預設使用單區檢視雙檔案差異(&O)" -#. Resource IDs: (251) +#. Resource IDs: (4006) msgid "Use &other text block" msgstr "使用其它區塊(&O)" -#. Resource IDs: (156) +#. Resource IDs: (32820) msgid "Use 'mine' text block" msgstr "套用本地的文字區塊" -#. Resource IDs: (156) +#. Resource IDs: (32822) msgid "Use 'mine' text block then 'theirs'" msgstr "先套用本地再套用遠端的文字區塊" -#. Resource IDs: (156) +#. Resource IDs: (32819) msgid "Use 'theirs' text block" msgstr "套用遠端的文字區塊" -#. Resource IDs: (156) +#. Resource IDs: (32821) msgid "Use 'theirs' text block then 'mine'" msgstr "先套用遠端再套用本地的文字區塊" -#. Resource IDs: (156) -msgid "Use Blocks" -msgstr "使用方塊" - #. Resource IDs: (1761) msgid "Use HTTP path component" msgstr "使用 HTTP 路徑部分" @@ -10689,17 +10859,17 @@ msgstr "使用小包(為慢速網路連接)(&P)" #. Resource IDs: (1064) msgid "Use Unified Diff from &clipboard" -msgstr "使用剪貼簿中的單一差異檔(&C)" +msgstr "使用剪貼簿中的統合式差異檔(&C)" -#. Resource IDs: (85) +#. Resource IDs: (1355) msgid "Use a different name or use the \"Force\" option to overwrite it." -msgstr "用另一名稱或用「強制」選項覆寫" +msgstr "用另一名稱或用「強制」選項覆寫它。" -#. Resource IDs: (85) +#. Resource IDs: (1356) msgid "Use a different name or use the \"Override branch\" option." -msgstr "用另一名稱或用「覆寫分支」選項" +msgstr "用另一名稱或用「覆寫已存在的分支」選項。" -#. Resource IDs: (2054) +#. Resource IDs: (32856) msgid "" "Use all content from the left view\n" "Use left file" @@ -10709,7 +10879,7 @@ msgstr "使用左方視窗的全部內容\n使用左方檔案" msgid "Use block from left before right" msgstr "先使用左方區塊再使用右方" -#. Resource IDs: (2054) +#. Resource IDs: (32857) msgid "" "Use block from left view before block from right view\n" "Use block from left before right" @@ -10719,25 +10889,25 @@ msgstr "先使用左方視窗的文字區塊再使用右方視窗的文字區塊 msgid "Use block from right before left" msgstr "先使用右方區塊再使用左方" -#. Resource IDs: (2054) +#. Resource IDs: (32859) msgid "" "Use block from right view before block from left view\n" "Use block from right before left" msgstr "先使用右方視窗的文字區塊再使用左方視窗的文字區塊\n先使用右方區塊再使用左方" -#. Resource IDs: (251) +#. Resource IDs: (4008) msgid "Use both text blocks (this one first)" msgstr "使用兩個文字區域(先使用本區塊)" -#. Resource IDs: (251) +#. Resource IDs: (4009) msgid "Use both text blocks (this one last)" msgstr "使用兩個文字區塊(最後使用本區塊)" -#. Resource IDs: (97) +#. Resource IDs: (1538) msgid "Use configured server" msgstr "使用已組態伺服器" -#. Resource IDs: (156) +#. Resource IDs: (32855) msgid "Use left block" msgstr "使用左方區塊" @@ -10747,83 +10917,83 @@ msgstr "使用左方檔案" #. Resource IDs: (1762) msgid "Use local branch color for current branch" -msgstr "當前分支用本地分支顏色" +msgstr "採用本地分支的顏色做為目前分支的顏色" #. Resource IDs: (1432) msgid "Use recycle bin when reverting" msgstr "復原時使用資源回收筒" -#. Resource IDs: (116) +#. Resource IDs: (1855) msgid "Use regular expression" msgstr "使用正規表示式" -#. Resource IDs: (251) +#. Resource IDs: (4014) msgid "Use right block" msgstr "使用右方區塊" -#. Resource IDs: (156) +#. Resource IDs: (1091) msgid "Use spaces" msgstr "使用空白字元" #. Resource IDs: (1426) msgid "Use system locale for date/time" -msgstr "使用系統語系表示日期/時間" +msgstr "使用系統語系表示「日期／時間」" -#. Resource IDs: (251) +#. Resource IDs: (4002) msgid "Use text block from '&mine'" msgstr "使用本地(&mime)的文字區塊" -#. Resource IDs: (251) +#. Resource IDs: (4001) msgid "Use text block from '&theirs'" msgstr "使用遠端(&theirs)的文字區塊" -#. Resource IDs: (251) +#. Resource IDs: (4004) msgid "Use text block from 'm&ine' before 'theirs'" msgstr "優先使用本地(m&ine)的而非遠端的文字區塊" -#. Resource IDs: (2052) +#. Resource IDs: (32822) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" msgstr "先套用本地再套用遠端的文字區塊\n先本地後遠端" -#. Resource IDs: (2052) +#. Resource IDs: (32820) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" msgstr "套用本地的文字區塊\n套用本地文字區塊" -#. Resource IDs: (251) +#. Resource IDs: (4003) msgid "Use text block from 't&heirs' before 'mine'" msgstr "優先使用遠端(t&heirs)的而非本地的文字區塊" -#. Resource IDs: (2052) +#. Resource IDs: (32821) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" msgstr "先套用遠端再套用本地的文字區塊\n先遠端後本地" -#. Resource IDs: (2052) +#. Resource IDs: (32819) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" msgstr "使用遠端的文字區塊\n使用遠端文字區塊" -#. Resource IDs: (2054) +#. Resource IDs: (32855) msgid "" "Use text block from the left view\n" "Use left block" msgstr "使用左方視窗的文字區塊\n使用左方區塊" -#. Resource IDs: (251) +#. Resource IDs: (4000) msgid "Use th&is text block" msgstr "使用此文字區塊(&I)" -#. Resource IDs: (98) +#. Resource IDs: (1555) msgid "Use the current time by setting the author date to the commit date." msgstr "修改作者時間為提交時間(目前時間)" -#. Resource IDs: (314) +#. Resource IDs: (5017) #, c-format msgid "" "Use the found path.\n" @@ -10831,37 +11001,37 @@ msgid "" "%s" msgstr "使用找到的路徑。\n套用補綴至\n%s" -#. Resource IDs: (314) +#. Resource IDs: (5018) #, c-format msgid "" "Use the original path.\n" "Apply the patch to\n" "%s" -msgstr "使用原先的路徑\n套用補綴至\n%s" +msgstr "使用原先的路徑。\n套用補綴至\n%s" #. Resource IDs: (1825, 1826) msgid "Use this" msgstr "用這個" -#. Resource IDs: (251) +#. Resource IDs: (4005) msgid "Use this &whole file" msgstr "使用整個檔案(&W)" -#. Resource IDs: (251) +#. Resource IDs: (4011) msgid "Use this block on left" msgstr "使用左方區塊" -#. Resource IDs: (251) +#. Resource IDs: (4007) msgid "Use whole other &file" -msgstr "全部使用另一個檔案(&f)" +msgstr "全部使用另一個檔案(&F)" -#. Resource IDs: (119) +#. Resource IDs: (1899) msgid "Used to amend the tip of the current branch." -msgstr "用於修改當前分支的提示" +msgstr "用於修訂目前分支最後一個提交" #. Resource IDs: (65535) msgid "User Email:" -msgstr "使用者Email:" +msgstr "使用者 Email：" #. Resource IDs: (65535) msgid "User Info" @@ -10869,27 +11039,27 @@ msgstr "使用者資料" #. Resource IDs: (65535) msgid "User Name:" -msgstr "使用者名稱:" +msgstr "使用者名稱：" -#. Resource IDs: (74) +#. Resource IDs: (1181) msgid "User cancelled" -msgstr "使用者己取消" +msgstr "使用者已取消" -#. Resource IDs: (72) +#. Resource IDs: (1139) msgid "" "User name and email must be set before commit.\r\n" " Do you want to set these now?" -msgstr "必須在提交前設定姓名及電郵，要現在設定？" +msgstr "必須在提交前設定「使用者名稱」及「電郵」，要現在設定？" #. Resource IDs: (1650) msgid "User&name:" -msgstr "使用者名稱(&N)" +msgstr "帳號(&N)：" -#. Resource IDs: (69) +#. Resource IDs: (1100, 65535) msgid "Username:" -msgstr "用戶名稱:" +msgstr "帳號：" -#. Resource IDs: (313) +#. Resource IDs: (5001) msgid "" "Valid command line options are:\n" "/base:\n" @@ -10906,9 +11076,9 @@ msgid "" "/saverequiredonconflicts\n" "/oneway \n" "/line:" -msgstr "有效的命令列選項有:\n/base:<基礎檔案的路徑>\n/basename:<顯示在基礎檢視區抬頭的名稱>\n/theirs:<倉儲檔案的路徑>\n/theirsname:<顯示在倉儲檢視區抬頭的名稱>\n/mine:<本地檔案的路徑>\n/minename:<顯示在本地檢視區抬頭的名稱>\n/merged:<合併後檔案的路徑>\n/mergedname:<顯示在合併檢視區抬頭的名稱>\n/diff:<單一差異檔的路徑>\n/patchpath:<資料夾路徑>\n/saverequired\n/saverequiredonconflicts\n/oneway <強制使用單一檢視>\n/line:<跳至行號>" +msgstr "有效的命令列選項有：\n/base:<基礎檔案的路徑>\n/basename:<顯示在基礎檢視區抬頭的名稱>\n/theirs:<對方檔案的路徑>\n/theirsname:<顯示在對方檢視區抬頭的名稱>\n/mine:<我方檔案的路徑>\n/minename:<顯示在我方檢視區抬頭的名稱>\n/merged:<合併後檔案的路徑>\n/mergedname:<顯示在合併檢視區抬頭的名稱>\n/diff:<統合式差異檔的路徑>\n/patchpath:<資料夾路徑>\n/saverequired\n/saverequiredonconflicts\n/oneway <強制使用單一檢視>\n/line:<跳至行號>" -#. Resource IDs: (11, 357) +#. Resource IDs: (165, 5708) msgid "Value" msgstr "值" @@ -10916,24 +11086,24 @@ msgstr "值" msgid "Version" msgstr "版本" -#. Resource IDs: (7) +#. Resource IDs: (102) #, c-format msgid "Version %d.%d.%d.%d" msgstr "版本 %d.%d.%d.%d" -#. Resource IDs: (72, 1644) +#. Resource IDs: (1145, 1644) msgid "Version 1" msgstr "版本1" -#. Resource IDs: (72) +#. Resource IDs: (1146) msgid "Version 1 (Newer commit time)" msgstr "版本1 (較新提交時間)" -#. Resource IDs: (72, 1645) +#. Resource IDs: (1144, 1645) msgid "Version 2 (Base)" msgstr "版本2(基礎)" -#. Resource IDs: (72) +#. Resource IDs: (1147) msgid "Version 2 (Base) (Newer commit time)" msgstr "版本2(基礎) (較新提交時間)" @@ -10941,11 +11111,11 @@ msgstr "版本2(基礎) (較新提交時間)" msgid "Version Information" msgstr "版本資訊" -#. Resource IDs: (1552, 65535) +#. Resource IDs: (1552) msgid "Version:" -msgstr "版本:" +msgstr "版本：" -#. Resource IDs: (264) +#. Resource IDs: (1704, 4209) msgid "Versioned" msgstr "版本控制中" @@ -10957,23 +11127,27 @@ msgstr "越南文" msgid "View" msgstr "檢視" -#. Resource IDs: (90) +#. Resource IDs: (1426) msgid "View .tgitconfig" msgstr "檢視 .tgitconfig" -#. Resource IDs: (328, 603) +#. Resource IDs: (32898) +msgid "View Bars" +msgstr "" + +#. Resource IDs: (328, 9633) msgid "View Patch" msgstr "檢視補綴" -#. Resource IDs: (71, 1637) +#. Resource IDs: (1134, 1637) msgid "View Patch>>" msgstr "檢視補綴>>" -#. Resource IDs: (1252) +#. Resource IDs: (20020) msgid "View revision for path in &webviewer" msgstr "以網頁瀏覽器檢視路徑的版本(&W)" -#. Resource IDs: (1252) +#. Resource IDs: (20019) msgid "View revision in alternative editor" msgstr "以其他編輯器檢視版本(&W)" @@ -10985,11 +11159,11 @@ msgstr "檢視系統 gitconfig (&W)" msgid "Visit our website" msgstr "瀏覽我們的網站" -#. Resource IDs: (156, 626) +#. Resource IDs: (214, 10007) msgid "Visual Studio 2005" msgstr "Visual Studio 2005" -#. Resource IDs: (156, 626) +#. Resource IDs: (209, 10002) msgid "Visual Studio 2008" msgstr "Visual Studio 2008" @@ -10998,9 +11172,9 @@ msgid "" "WARNING:\r\n" "Only change these settings if you are absolutely sure what you are doing!\r\n" "To set the values to their default, delete the value text." -msgstr "警告：\r\n只有你明確知道這些設定的意義時，才可以修改它們\r\n要恢復預設設定，删除這些值即可。" +msgstr "警告：\n當你明確地知道這些設定的意義時，才可以修改它們！\n要恢復預設設定，删除這些值即可。" -#. Resource IDs: (198) +#. Resource IDs: (3155) msgid "Wait" msgstr "等待" @@ -11008,7 +11182,7 @@ msgstr "等待" msgid "Wait for the script to finish" msgstr "等待指令檔完成" -#. Resource IDs: (75) +#. Resource IDs: (1192) msgid "Waiting for input" msgstr "等候輸入" @@ -11016,23 +11190,23 @@ msgstr "等候輸入" msgid "Walk Be&haviour" msgstr "遍歷行為(&H)" -#. Resource IDs: (88) +#. Resource IDs: (1405) msgid "Warning" msgstr "警告" -#. Resource IDs: (219) +#. Resource IDs: (3500) msgid "Warning!" -msgstr "警告!" +msgstr "警告！" -#. Resource IDs: (70) +#. Resource IDs: (1113) #, c-format msgid "" "Warning: \"%s\" will be permanently deleted. It can NOT be recovered!\r\n" "\r\n" "Do you really want to continue?" -msgstr "警告: \"%s\" 會被永久刪除而 不能 恢復過來！\n\n確定?" +msgstr "警告：「%s」會被永久刪除而 無法 還原！\n\n確定？" -#. Resource IDs: (71) +#. Resource IDs: (1132) msgid "Web" msgstr "網頁" @@ -11040,74 +11214,74 @@ msgstr "網頁" msgid "Western European" msgstr "西歐" -#. Resource IDs: (198) +#. Resource IDs: (3161) msgid "" "When activated, hold down the SHIFT key when right-clicking to get the " "TortoiseGit menus added to the context menu" -msgstr "啟用後，當單擊右鍵時保持 SHIFT 鍵按下，從而將 TortoiseSVN 功能表增加到上下文功能表" +msgstr "啟用後，當單擊右鍵並保持 SHIFT 鍵按下時，才會顯示 TortoiseGit 快顯功能表。" -#. Resource IDs: (604) +#. Resource IDs: (9661) msgid "" "When applying a patch, ignore changes in whitespace in context lines if " "necessary" -msgstr "在套用補綴檔時，忽略空白的改變" +msgstr "在套用補綴檔時，忽略空白字元的變更。" -#. Resource IDs: (91) +#. Resource IDs: (1441) msgid "" "When closing a progress dialog with a running git process, ask for " "confirmation before killing it" -msgstr "當要關閉進度視窗仍有執行中的 git 程序，需確認才停止它" +msgstr "當想要關閉仍有執行中 git 程序的進度視窗時，需經確認後才能停止它。" -#. Resource IDs: (94) +#. Resource IDs: (1488) msgid "" "When enabled, TortoiseGit move context menu items will be available when " "dragging folders / files" -msgstr "啟用後, 在拖曳資料夾/檔案時, 將顯示 TortoiseGit 快顯功能表移動選項" +msgstr "啟用後，在拖曳「資料夾／檔案」時，將顯示 TortoiseGit 快顯功能表移動選項。" -#. Resource IDs: (95) +#. Resource IDs: (1519) msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." msgstr "啟用後，較大的版本號在前面，因為新版通常比較有用。" -#. Resource IDs: (197) +#. Resource IDs: (3141) msgid "" "When enabled, the versioned items listed in the commit dialog are " "automatically selected" -msgstr "啟用時, 送交視窗中, 有版本控制的項目會自動被選取." +msgstr "啟用時，送交視窗中有版本控制的項目會自動被選取。" -#. Resource IDs: (604) +#. Resource IDs: (9660) msgid "" "When the patch does not apply cleanly, fall back on 3-way merge if the patch" " records the identity of blobs it is supposed to apply to and we have those " "blobs available locally." -msgstr "當套用補綴失敗時，嘗試3路合併。" +msgstr "無法乾淨地套用補綴時，如果本機中含有補綴檔中記錄用來套用補綴的 blobs，則嘗試三方合併。" -#. Resource IDs: (92) +#. Resource IDs: (1459) msgid "" "When you type the URL, the remote name will be automatically filled with " "\"origin\" if the remote name is empty, so you do not have to." -msgstr "如果遠端名稱為空，當你鍵入的URL時遠端名稱將被自動填充為“origin”，所以你不必填。" +msgstr "如果遠端名稱為空，當你鍵入 URL 時遠端名稱將被自動填充為「origin」，所以你不必填。" -#. Resource IDs: (96) +#. Resource IDs: (1533) msgid "Whether to reference only annotated tags, all tags or all refs" -msgstr "搜尋參考點的依據可以是 (1)只有含附註的標籤, (2)所有標籤, 或是 (3)所有參考點" +msgstr "搜尋參照的依據可以是 (1)只有含附註的標籤、(2)所有標籤、(3)所有參照" #. Resource IDs: (1409) msgid "" "While running daemon, all data of this repository is exposed without " "authentication and/or encryption." -msgstr "當執行守護行程時，此檔案庫的所有資料都可以被存取而沒有認證及/或加密。" +msgstr "當執行 daemon 時，此版本庫的所有資料將在不需要認證並且沒有加密的情況下被直接存取。" -#. Resource IDs: (101) +#. Resource IDs: (1601) msgid "Whitespace changes (tabs, spaces)" msgstr "空白變更 (tabs, spaces)" -#. Resource IDs: (65535) +#. Resource IDs: (156, 65535) msgid "Whitespaces" msgstr "空白字元" -#. Resource IDs: (1065) +#. Resource IDs: (17038) msgid "Window Position" msgstr "視窗位置" @@ -11115,15 +11289,15 @@ msgstr "視窗位置" msgid "Windows" msgstr "Windows" -#. Resource IDs: (156, 626) +#. Resource IDs: (208, 10003) msgid "Windows 2000" msgstr "Windows 2000" -#. Resource IDs: (156, 626) +#. Resource IDs: (210, 10001) msgid "Windows 7" msgstr "Windows 7" -#. Resource IDs: (156, 626) +#. Resource IDs: (212, 10005) msgid "Windows XP" msgstr "Windows XP" @@ -11165,188 +11339,184 @@ msgstr "Windows-1258" #. Resource IDs: (65535) msgid "Within a file:" -msgstr "檔案內" +msgstr "檔案內(-M)：" -#. Resource IDs: (2054) +#. Resource IDs: (32860) msgid "Within file" msgstr "在檔案之內" -#. Resource IDs: (20, 158) +#. Resource IDs: (158, 306) msgid "Working Tree" msgstr "工作目錄" #. Resource IDs: (1335, 1472) msgid "Working Tree Path:" -msgstr "工作目錄路徑:" +msgstr "工作目錄路徑：" -#. Resource IDs: (1253) +#. Resource IDs: (20044) msgid "Working dir changes" msgstr "工作目錄改動" -#. Resource IDs: (156) +#. Resource IDs: (32881) msgid "Wrap long lines" msgstr "自動折行" -#. Resource IDs: (2056) +#. Resource IDs: (32881) msgid "" "Wrap long lines at the right border of the view\n" "Wrap long lines" msgstr "在檢視的右邊界換行\n長的行換行" -#. Resource IDs: (73) -msgid "Yes" -msgstr "是" - -#. Resource IDs: (145) +#. Resource IDs: (2306) msgid "Yes to all" msgstr "全部皆是" -#. Resource IDs: (201) +#. Resource IDs: (3202) msgid "You already have the latest version installed." -msgstr "你已經安裝了最新版." +msgstr "你已經安裝了最新版。" #. Resource IDs: (65535) msgid "" "You can disable specific Overlay handlers here.\n" "Disabled handlers won't use up an overlay slot and give other shell extensions a chance to show their overlays." -msgstr "你可以停用特定的圖示覆蓋。\n停用圖示覆蓋將不顯示圖示，以便其它的擴展程式覆蓋。" +msgstr "你可以停用特定的圖示覆蓋。\n作業系統可顯示的圖示數量有限，停用圖示可讓其它擴展程式有機會顯示它們的圖示。" -#. Resource IDs: (1001) +#. Resource IDs: (16005) #, c-format msgid "You can paste bitmap with the size (%d x %d) only!" msgstr "只能貼上 %d x %d 大小的點陣圖!" -#. Resource IDs: (1016) +#. Resource IDs: (16243) #, c-format msgid "You can't create more than %d user-defined toolbars!" msgstr "最多只能建了 %d 組自定工具列!" -#. Resource IDs: (16) +#. Resource IDs: (253) msgid "" "You can't set this property on folders, only on files!\n" "If you want to set it on all files within that folder,\n" "you must activate the 'recursive' checkbox." -msgstr "這個性質不能設定在資料夾上, 只能設定在檔案上!\n如果你想要套用在資料夾內的所有檔案,\n請勾選「遞迴」." +msgstr "這個性質不能設定在資料夾上，只能設定在檔案上！\n如果你想要套用在資料夾內的所有檔案，\n請勾選「遞迴」。" -#. Resource IDs: (84) +#. Resource IDs: (1331) msgid "You cannot change the type of this ref with a rename." -msgstr "你不能透過重新命名來更改這參考點的類型" +msgstr "你不能透過重新命名來更改這參照的類型" -#. Resource IDs: (84) +#. Resource IDs: (1338) msgid "" "You have an old version of Git for Windows (https://msysgit.github.io/) installed which contains security issues.\n" "\n" "You should consider an upgrade to 1.9.5+." -msgstr "你安裝了舊版的、有安全漏洞的 Git for Windows (https://msysgit.github.io/)\n\n你應該考慮升級到 1.9.5+." +msgstr "你安裝了舊版的、有安全漏洞的 Git for Windows （https://msysgit.github.io/）\n\n你應該考慮升級到 1.9.5+。" -#. Resource IDs: (86) +#. Resource IDs: (1373) msgid "" "You have checked \"include untracked\".\n" "This includes a \"git clean -fd\" call, so ignored files/directories are removed w/o using recycle bin." -msgstr "你選擇了 「包含未追蹤的檔案」，這包含一個 \"git clean -fd\" 命令，因以不會使用資源回收筒來移除這些檔案/目錄。" +msgstr "你選擇了 「包含未追蹤的檔案」。\n這包含一個「git clean -fd」命令，因此不會使用資源回收筒來移除這些「檔案／目錄」。" -#. Resource IDs: (7) +#. Resource IDs: (104) msgid "You have marked changed blocks. How should those blocks be saved?" msgstr "你標記了一些已修改區塊，要如何儲存它們？" -#. Resource IDs: (16) +#. Resource IDs: (254) msgid "" "You have modified properties without saving them first.\n" "Do you want to save them now?" -msgstr "已修改過性質但尚未儲存.\n要現在儲存嗎?" +msgstr "已修改過性質但尚未儲存。\n要現在儲存嗎？" -#. Resource IDs: (87) +#. Resource IDs: (1391) #, c-format msgid "" "You have selected %d items to show the diff for.\n" "For every of these items a new instance of the diff viewer will be started.\n" "Do you really want to show the diff for so many items at once?" -msgstr "你已選取 %d 個檔案去顯示差異\n對於每一檔案，會啟動一個新的差異檢視器實體\n你真的要一次過顯示這麼多檔案的差異？" +msgstr "你已選取 %d 個檔案去顯示差異。\n對於每一檔案，會啟動一個新的差異檢視器實體。\n你真的要一次顯示這麼多檔案的差異？" -#. Resource IDs: (169) +#. Resource IDs: (2703) msgid "" "You haven't entered an issue number!\n" "Are you sure you want to commit without an issue number?" -msgstr "你尚未輸入問題編號!\n確定要進行提交嗎?" +msgstr "你尚未輸入問題編號！\n確定要進行提交嗎？" -#. Resource IDs: (68) +#. Resource IDs: (1081) msgid "You haven't entered your Signed-Off-By line!" msgstr "未輸入 Signed-Off-By" -#. Resource IDs: (68) +#. Resource IDs: (1085) msgid "" "You marked some files as \"Restore after commit\".\n" "Do you want to restore them now? You might lose all changes to this file after marking it." -msgstr "有一些檔案加上 \"提交後還原\"\n是否現在就還原這些檔案？你可能會丟失這些檔案的改動" +msgstr "有一些檔案加上「提交後還原」\n是否現在就還原這些檔案？你可能會丟失這些檔案的改動。" -#. Resource IDs: (1002) +#. Resource IDs: (16024) #, c-format msgid "You may define up to %d tools." msgstr "你可以定義最多 %d 組工具." -#. Resource IDs: (170) +#. Resource IDs: (2708) msgid "You must enter a log message for the commit" -msgstr "必須為提交輸入訊息" +msgstr "必須輸入日誌訊息" -#. Resource IDs: (196) +#. Resource IDs: (3131) msgid "You must restart your system for the changes to take effect." -msgstr "你需要重新開機後讓這些修改生效." +msgstr "你需要重新開機後讓這些修改生效。" -#. Resource IDs: (65) +#. Resource IDs: (1031) msgid "You must select a filename for the zip-file!" -msgstr "必須為 zip 檔選擇檔名" +msgstr "必須為 zip 檔選擇檔名！" -#. Resource IDs: (65) +#. Resource IDs: (1030) msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." msgstr "你選擇了一個資料夾\r\n只能匯出到 zip 檔" -#. Resource IDs: (77) +#. Resource IDs: (1219) msgid "" "You selected an unversioned file.\n" "The file will be added to version control when you commit." -msgstr "你選擇了無版本控制的檔案.\n它會在送交之前被加入版本控制." +msgstr "你選擇了無版本控制的檔案。\n提交時，它會被加入版本控制。" -#. Resource IDs: (1001) +#. Resource IDs: (16002) msgid "You should enter a text!" msgstr "請輸入文字!" -#. Resource IDs: (1001) +#. Resource IDs: (16001) msgid "You should select an image!" msgstr "請選擇一個影像!" -#. Resource IDs: (195) +#. Resource IDs: (3108) #, c-format msgid "" "You've changed the icon set from %s to %s.\n" "That change won't take effect until you restart your computer or logoff and logon again!" -msgstr "你已經將圖示組從 %s 變更為 %s.\n在重新登出登入或是重新開機之前變更並不會生效!" +msgstr "你已經將圖示組從 %s 變更為 %s。\n在重新登出登入或是重新開機之前變更並不會生效！" -#. Resource IDs: (170) +#. Resource IDs: (2706) msgid "" "Your previously entered log messages have been saved.\n" "Click here to read and insert them again." -msgstr "你之前輸入的紀錄訊息已經儲存.\n點擊這裡可以閱讀或再次使用它們." +msgstr "你上次輸入的日誌訊息已經被儲存。\n點擊這裡可以把它們讀取回來。" #. Resource IDs: (1112) msgid "Your version is:" -msgstr "你的版本是:" +msgstr "你的版本是：" -#. Resource IDs: (201) +#. Resource IDs: (3200) #, c-format msgid "Your version is: %d.%d.%d.%d" -msgstr "你的版本是: %d.%d.%d.%d" +msgstr "你的版本是：%d.%d.%d.%d" #. Resource IDs: (1074) msgid "Zip File" msgstr "Zip 檔案" #. Resource IDs: (32783) -msgid "Zoo&m out" -msgstr "縮小(&M)" +msgid "Zoo&m out\t-" +msgstr "縮小(&M)\t-" -#. Resource IDs: (1069) +#. Resource IDs: (17093) msgid "Zoom" msgstr "縮放" @@ -11358,84 +11528,84 @@ msgstr "放大(&I)" msgid "Zoom &Out" msgstr "縮小(&O)" -#. Resource IDs: (2051) +#. Resource IDs: (32803) #, c-format msgid "Zoom 100%" msgstr "縮放至原始大小" -#. Resource IDs: (3633) +#. Resource IDs: (58117) msgid "" "Zoom In\n" "Zoom In" msgstr "放大\n放大" -#. Resource IDs: (3633) +#. Resource IDs: (58118) msgid "" "Zoom Out\n" "Zoom Out" msgstr "縮小\n縮小" #. Resource IDs: (32784) -msgid "Zoom i&n" -msgstr "放大(&N)" +msgid "Zoom i&n\t+" +msgstr "放大(&N)\t+" -#. Resource IDs: (2049) +#. Resource IDs: (32772) msgid "Zoom in" msgstr "放大" -#. Resource IDs: (2049) +#. Resource IDs: (32773) msgid "Zoom out" msgstr "縮小" -#. Resource IDs: (2051) +#. Resource IDs: (32804) msgid "Zoom to fit" msgstr "縮放至合適大小" -#. Resource IDs: (2051) +#. Resource IDs: (32809) msgid "Zoom to fit in height" msgstr "縮放至合適高度" -#. Resource IDs: (2051) +#. Resource IDs: (32810) msgid "Zoom to fit in width" msgstr "縮放至合適闊度" -#. Resource IDs: (1070) +#. Resource IDs: (17114) msgid "[Default]" msgstr "[預設]" -#. Resource IDs: (1001) +#. Resource IDs: (16009) msgid "[Unassigned]" msgstr "[未指定]" -#. Resource IDs: (93) +#. Resource IDs: (1472) #, c-format msgid "" "\"%s\" contains a git repository. It will not work as a submodule out of the box.\n" "Do you want to delete the .git-entry and add all files to the top repository or keep it as a separate repository in a subdirectory?" -msgstr "\"%s\" 包含一個 git 檔案庫，但子模組不能運作。\n你要刪除 .git 及加入所有檔案至上層檔案庫，還是在子目錄保留為一個獨立的檔案庫？" +msgstr "「%s」包含一個 git 版本庫，但不能被當作子模組而運作。\n你要刪除「.git」並加入所有檔案至上層版本庫，還是在子目錄保留為一個獨立的版本庫？" -#. Resource IDs: (92) +#. Resource IDs: (1471) #, c-format msgid "" "\"%s\" contains a git submodule. It is likely that this doesn't work any more on the destination after copying.\n" "Do you want to delete the .git-entry and add all files to the top repository or ignore this possible issue and keep it?" -msgstr "\"%s\" 包含一個 git 子模組，但很可能在複製後不能運作。\n你要刪除 .git 及加入所有檔案至上層檔案庫，還是保留它而忽略可能發生的問題？" +msgstr "「%s」包含一個 git 子模組，但很可能在複製後不能運作。\n你要刪除「.git」及加入所有檔案至上層版本庫，還是保留它而忽略可能發生的問題？" -#. Resource IDs: (72) +#. Resource IDs: (1141) #, c-format msgid "\"%s\" is invalid." -msgstr "\"%s\" 無效" +msgstr "「%s」無效" -#. Resource IDs: (602) +#. Resource IDs: (9622) #, c-format msgid "\"%s\" is not git repository" -msgstr "\"%s\"不是git倉儲" +msgstr "「%s」不是 git 版本庫" -#. Resource IDs: (65) +#. Resource IDs: (1037) msgid "" "\"git am\" is still in apply mode.\n" "Do you want to abort?" -msgstr "\"git am\" 仍在套用模式\n要中止嗎？" +msgstr "「git am」仍在套用模式。\n要中止嗎？" #. Resource IDs: (65535) msgid "_POPUP_" @@ -11443,35 +11613,40 @@ msgstr "_POPUP_" #. Resource IDs: (1682) msgid "add \"cherry picked from\"" -msgstr "增加「摘取從」" +msgstr "加入「cherry picked from」" -#. Resource IDs: (10) +#. Resource IDs: (155) msgid "added" -msgstr "增加" +msgstr "已加入" #. Resource IDs: (65535) msgid "added files" -msgstr "增加的檔案" +msgstr "加入的檔案" -#. Resource IDs: (3841) +#. Resource IDs: (61446) msgid "an unnamed file" -msgstr "無名檔案" +msgstr "未命名檔案" #. Resource IDs: (1085) msgid "and support the developers" msgstr "並請支持開發者" -#. Resource IDs: (195) +#. Resource IDs: (3110) msgid "assume-valid" msgstr "假設有效" -#. Resource IDs: (245) +#. Resource IDs: (3904) msgid "author" msgstr "作者" +#. Resource IDs: (1421) +#, c-format +msgid "author (>= 0.5%)" +msgstr "作者 (>= 0.5%)" + #. Resource IDs: (65535) msgid "based on TortoiseSVN (http://www.tortoisesvn.net/)" -msgstr "基于TortoiseSVN (http://www.tortoisesvn.net/)" +msgstr "基于 TortoiseSVN（http://www.tortoisesvn.net/）" #. Resource IDs: (65535) msgid "bugtraq.append" @@ -11501,30 +11676,30 @@ msgstr "bugtraq.url" msgid "bugtraq.warningifnoissue" msgstr "bugtraq.warningifnoissue" -#. Resource IDs: (244, 245) +#. Resource IDs: (3903, 3905) msgid "commits" -msgstr "提交紀錄" +msgstr "提交記錄" -#. Resource IDs: (11) +#. Resource IDs: (161) msgid "conflicted" msgstr "衝突" -#. Resource IDs: (208) +#. Resource IDs: (3322) #, c-format msgid "" "copied from\r\n" "%s - revision %ld" msgstr "複製自\r\n%s - 版本 %ld" -#. Resource IDs: (605) +#. Resource IDs: (9667) msgid "day" msgstr "日" -#. Resource IDs: (10) +#. Resource IDs: (157) msgid "deleted" msgstr "刪除" -#. Resource IDs: (7) +#. Resource IDs: (108) msgid "diff from pipe" msgstr "來自管道的差異" @@ -11536,7 +11711,7 @@ msgstr "dummy" msgid "eMail settings" msgstr "電郵設定" -#. Resource IDs: (79) +#. Resource IDs: (1262) #, c-format msgid "" "exported\n" @@ -11545,16 +11720,16 @@ msgid "" "%s" msgstr "完成匯出\n%s\n至\n%s" -#. Resource IDs: (13) +#. Resource IDs: (204) msgid "external" msgstr "外部" -#. Resource IDs: (66) +#. Resource IDs: (1047) #, c-format msgid "git did not exit cleanly (exit code %d)" -msgstr "Git 並非正常地結束 (傳回 %d)" +msgstr "Git 不正常結束（傳回 %d）" -#. Resource IDs: (13) +#. Resource IDs: (197) msgid "ignored" msgstr "忽略" @@ -11562,15 +11737,15 @@ msgstr "忽略" msgid "include &untracked" msgstr "包括未追蹤的" -#. Resource IDs: (13) +#. Resource IDs: (196) msgid "incomplete" msgstr "未完成" -#. Resource IDs: (1780, 1781, 1782, 1783) +#. Resource IDs: (1780, 1781, 1782, 1783, 1791, 1792, 1793) msgid "inherit" msgstr "繼承" -#. Resource IDs: (214) +#. Resource IDs: (3409) msgid "item kept locally" msgstr "檔案保留於本地端" @@ -11578,16 +11753,16 @@ msgstr "檔案保留於本地端" msgid "keep the file lists in English" msgstr "保持用英語顯示檔案列表" -#. Resource IDs: (69) +#. Resource IDs: (1091) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" "%s = %ld\n" "%s = %ld\n" "%s = %ld" -msgstr "行: %d(+) %d(-) 檔案: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" +msgstr "行：%d(+) %d(-) 檔案：%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" -#. Resource IDs: (69) +#. Resource IDs: (1092) #, c-format msgid "" "line: %d(+) %d(-) files: %s = %ld\n" @@ -11596,33 +11771,33 @@ msgid "" "%s = %ld\n" "%s = %ld\n" "%s = %ld" -msgstr "行: %d(+) %d(-) 檔案: %s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" +msgstr "行：%d(+) %d(-) 檔案：%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld\n%s = %ld" #. Resource IDs: (1494) msgid "master" msgstr "master" -#. Resource IDs: (11, 65535) +#. Resource IDs: (160, 65535) msgid "merged" msgstr "合併" -#. Resource IDs: (10) +#. Resource IDs: (156) msgid "missing" msgstr "缺少" #. Resource IDs: (65535) msgid "missing/deleted/replaced" -msgstr "缺少/已刪除/已取代" +msgstr "遺失／已刪除／已取代" -#. Resource IDs: (10) +#. Resource IDs: (159) msgid "modified" -msgstr "己修改" +msgstr "已修改" #. Resource IDs: (65535) msgid "modified/copied" -msgstr "已修改/複製" +msgstr "已修改／已複製" -#. Resource IDs: (245) +#. Resource IDs: (3910) msgid "month" msgstr "月" @@ -11630,52 +11805,56 @@ msgstr "月" msgid "new branch" msgstr "新建分支" -#. Resource IDs: (18) +#. Resource IDs: (274) msgid "no" msgstr "否" -#. Resource IDs: (10) +#. Resource IDs: (151) msgid "no description for this command is available" msgstr "此指令尚無說明" -#. Resource IDs: (10) +#. Resource IDs: (153) msgid "non-versioned" msgstr "無版本控制" -#. Resource IDs: (97) +#. Resource IDs: (1539) msgid "none" msgstr "無" -#. Resource IDs: (10) +#. Resource IDs: (154) msgid "normal" msgstr "一般" -#. Resource IDs: (1256) +#. Resource IDs: (20087) msgid "not found" msgstr "找不到" -#. Resource IDs: (11) +#. Resource IDs: (162) msgid "obstructed" msgstr "阻礙" -#. Resource IDs: (3845) +#. Resource IDs: (61504) #, c-format msgid "on %1" msgstr "於 %1" -#. Resource IDs: (3869) +#. Resource IDs: (2707) +msgid "patched" +msgstr "" + +#. Resource IDs: (61888) msgid "pixels" msgstr "圖素" #. Resource IDs: (65535) msgid "possible or real conflict/obstructed" -msgstr "可能衝突/阻塞" +msgstr "可能的或真實的「衝突／阻塞」" -#. Resource IDs: (3845) +#. Resource IDs: (61509) msgid "prn" msgstr "prn" -#. Resource IDs: (245) +#. Resource IDs: (3911) msgid "quarter of year" msgstr "季" @@ -11683,35 +11862,35 @@ msgstr "季" msgid "renamed" msgstr "已重新命名" -#. Resource IDs: (10) +#. Resource IDs: (158) msgid "replaced" msgstr "取代" -#. Resource IDs: (169) +#. Resource IDs: (2701) msgid "scanning path:" msgstr "掃瞄路徑：" -#. Resource IDs: (195) +#. Resource IDs: (3111) msgid "skip-worktree" msgstr "skip-worktree" -#. Resource IDs: (208) +#. Resource IDs: (3323) #, c-format msgid "" "switched to\r\n" "%s" msgstr "切換至\r\n%s" -#. Resource IDs: (1386) +#. Resource IDs: (1390) msgid "take care of submodule changes" msgstr "留意子模組的改變" -#. Resource IDs: (3845) +#. Resource IDs: (61513) #, c-format msgid "to %1" msgstr "至 %1" -#. Resource IDs: (80, 284) +#. Resource IDs: (1276, 4531) #, c-format msgid "to %s" msgstr "至 %s" @@ -11720,35 +11899,35 @@ msgstr "至 %s" msgid "u&nknown changes" msgstr "未知的變更(&N)" -#. Resource IDs: (245) +#. Resource IDs: (3909) msgid "week" msgstr "週" -#. Resource IDs: (89) +#. Resource IDs: (1408) msgid "wincred - all Windows users" msgstr "wincred - 所有 Windows 使用者" -#. Resource IDs: (88) +#. Resource IDs: (1402) msgid "wincred - current Windows user" -msgstr "wincred - 當前 Windows 使用者" +msgstr "wincred - 目前 Windows 使用者" -#. Resource IDs: (88) +#. Resource IDs: (1399) msgid "wincred - this repository only" -msgstr "wincred - 只限此檔案庫" +msgstr "wincred - 只限此版本庫" -#. Resource IDs: (88) +#. Resource IDs: (1403) msgid "winstore - current Windows user" -msgstr "winstore - 當前 Windows 使用者" +msgstr "winstore - 目前 Windows 使用者" -#. Resource IDs: (88) +#. Resource IDs: (1401) msgid "winstore - this repository only" -msgstr "winstore - 只限此檔案庫" +msgstr "winstore - 只限此版本庫" -#. Resource IDs: (245) +#. Resource IDs: (3912) msgid "year" msgstr "年" -#. Resource IDs: (18) +#. Resource IDs: (273) msgid "yes" msgstr "是" -- 2.11.4.GIT