From a6857bfdc5b3d39baeb370fcd0870ce2dca7af0b Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 8 Apr 2015 15:52:38 +0200 Subject: [PATCH] Sync translations with Transifex Signed-off-by: Sven Strickroth --- Languages/Tortoise_bg_BG.po | 196 +++++++++++++---- Languages/Tortoise_ca.po | 196 +++++++++++++---- Languages/Tortoise_cs.po | 199 +++++++++++++---- Languages/Tortoise_de.po | 200 +++++++++++++---- Languages/Tortoise_es_ES.po | 200 +++++++++++++---- Languages/Tortoise_fr.po | 222 ++++++++++++++----- Languages/Tortoise_hu.po | 260 ++++++++++++++++------ Languages/Tortoise_id.po | 196 +++++++++++++---- Languages/Tortoise_it_IT.po | 196 +++++++++++++---- Languages/Tortoise_ja.po | 198 +++++++++++++---- Languages/Tortoise_ko_KR.po | 199 +++++++++++++---- Languages/Tortoise_nl_NL.po | 199 +++++++++++++---- Languages/Tortoise_pl_PL.po | 198 +++++++++++++---- Languages/Tortoise_pt_BR.po | 198 +++++++++++++---- Languages/Tortoise_pt_PT.po | 196 +++++++++++++---- Languages/Tortoise_ro.po | 200 +++++++++++++---- Languages/Tortoise_ru.po | 206 ++++++++++++++---- Languages/Tortoise_sk.po | 196 +++++++++++++---- Languages/Tortoise_sr@latin.po | 196 +++++++++++++---- Languages/Tortoise_sv.po | 264 +++++++++++++++------- Languages/Tortoise_tr.po | 196 +++++++++++++---- Languages/Tortoise_vi.po | 196 +++++++++++++---- Languages/Tortoise_zh_CN.po | 482 +++++++++++++++++++++++++---------------- Languages/Tortoise_zh_TW.po | 206 ++++++++++++++---- 24 files changed, 3991 insertions(+), 1204 deletions(-) diff --git a/Languages/Tortoise_bg_BG.po b/Languages/Tortoise_bg_BG.po index 1f404247b..8ee0a2b62 100644 --- a/Languages/Tortoise_bg_BG.po +++ b/Languages/Tortoise_bg_BG.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -656,6 +656,10 @@ msgstr "&Включване на сървъра-посредник" msgid "&Enable edit" msgstr "" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Експорт на избраното в..." @@ -922,6 +926,10 @@ msgstr "&Нов" msgid "&New..." msgstr "&Нов..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Следваща страница" @@ -950,6 +958,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Една страница" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Отваряне" @@ -958,6 +970,10 @@ msgstr "&Отваряне" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -1419,6 +1435,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1708,6 +1728,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Добавяне на специфична за този тип файлове програма за сравняване" @@ -1852,6 +1876,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Вече е последна версия." @@ -1944,6 +1974,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Менюта на приложната рамка:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2094,10 +2128,6 @@ msgid "Authors case sensitive" msgstr "Чувствителност към регистъра за имената на авторите" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Автори:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3246,7 +3276,7 @@ msgid "Copying..." msgstr "Копиране..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3510,10 +3540,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Заслуги:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Изрязване" @@ -3904,6 +3930,10 @@ msgstr "" msgid "Directory:" msgstr "Директория:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4116,6 +4146,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Да не се показва повече това съобщение" @@ -4252,6 +4286,10 @@ msgstr "" msgid "Edit..." msgstr "Промяна..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4861,6 +4899,10 @@ msgid "" "Find" msgstr "Търсене на специфичен текст\nТърсене" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -4999,10 +5041,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "" - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "От" @@ -5068,6 +5106,10 @@ msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "Грешка при създаване на обект растерно изображение от GDI+. Най-вероятно липсва достатъчно свободна памет." +#. Resource IDs: (82) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Събира се информация. Моля, изчакайте..." @@ -5463,6 +5505,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5471,6 +5517,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5479,6 +5533,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5487,6 +5545,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5895,6 +5961,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Включване само на следния обхват от редакции:" @@ -6316,6 +6386,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6536,10 +6610,6 @@ msgstr "Преместване и преименуване" msgid "Move to changelist" msgstr "Преместване в списък с промени" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Преместване/преименуване" @@ -7092,6 +7162,10 @@ msgstr "Отваряне на файл с изображение..." msgid "Open parent folder" msgstr "Отваряне на съдържащата папка" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7166,6 +7240,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8103,10 +8181,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Изисква потребителско име и парола" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8545,6 +8619,10 @@ msgstr "Да се запишат ли промените в %1?" msgid "Save modifications." msgstr "" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Запис на &редакция в..." @@ -8626,6 +8704,10 @@ msgstr "Превъртане на ляво" msgid "Scroll Right" msgstr "Превъртане на дясно" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "&Търсене в дневника..." @@ -9148,6 +9230,10 @@ msgid "" "Show Whitespaces" msgstr "" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9206,6 +9292,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "" @@ -9289,10 +9379,6 @@ msgstr "Указва максималния брой съобщения, кои msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Разделяне на редовете" @@ -9464,10 +9550,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9491,6 +9573,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Подмодули" @@ -9499,13 +9585,6 @@ msgstr "Подмодули" msgid "Success" msgstr "Успешно" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Превключи" @@ -9617,6 +9696,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10064,6 +10147,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10289,6 +10378,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10716,6 +10816,10 @@ msgstr "Използване на текстовият блок от левия msgid "Use th&is text block" msgstr "Използване на &този текстов блок" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10786,12 +10890,20 @@ msgstr "Потребителско име:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Валидни опции за командния ред са:\n/base:<път до базовия файл>\n/theirs:<път до 'техния' файл>\n/mine:<път до 'моя' файл>\n/merged:<път до крайния, слят файл>\n/diff:<път до Unified Diff файл>\n/patchpath:<път до папка>" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11409,6 +11521,10 @@ msgstr "ден" msgid "deleted" msgstr "изтрит" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_ca.po b/Languages/Tortoise_ca.po index 46d615eb7..7d92a1cdc 100644 --- a/Languages/Tortoise_ca.po +++ b/Languages/Tortoise_ca.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -657,6 +657,10 @@ msgstr "&Habilita Servidor intermediari" msgid "&Enable edit" msgstr "&Activa l'edició" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exporta selecció a..." @@ -923,6 +927,10 @@ msgstr "&Nou" msgid "&New..." msgstr "&Nou..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "Pàgina &Següent" @@ -951,6 +959,10 @@ msgstr "&D'acord" msgid "&One Page" msgstr "&Una Pàgina" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Obre" @@ -959,6 +971,10 @@ msgstr "&Obre" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Obre...\tCtrl+O" @@ -1420,6 +1436,10 @@ msgstr ".gitignore a l'arrel del dipòsit" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1709,6 +1729,10 @@ msgstr "Afegir Remot" msgid "Add \"&Signed-off-by\"" msgstr "Afegeix \"Signat per\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Afegeix utilitat de comparació per a extensions específiques" @@ -1853,6 +1877,12 @@ msgstr "Permet l'edició per aquesta vista\nPermet l'edició" msgid "Allow to use custom Gravatar URL" msgstr "Permet utilitzar una url de Gravatar personalitzada" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Ja està al dia" @@ -1945,6 +1975,10 @@ msgstr "Afegeix aquest bloc a l'esquerra, al final" msgid "Application Frame Menus: " msgstr "Menús d'Estructura de l'Aplicació: " +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Aplica pedaç serial" @@ -2095,10 +2129,6 @@ msgid "Authors case sensitive" msgstr "Autors distingint Majusc./minúsc." #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autors:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3247,7 +3277,7 @@ msgid "Copying..." msgstr "Copiant..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3511,10 +3541,6 @@ msgstr "Auxiliar de credencials:" msgid "Credentials" msgstr "Credencials" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Crèdits:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Re&talla" @@ -3905,6 +3931,10 @@ msgstr "Dir..." msgid "Directory:" msgstr "Directori:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4117,6 +4147,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "No ho desis\nRecarrega les vistes sense desar les modificacions" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "No mostrar més aquest missatge " @@ -4253,6 +4287,10 @@ msgstr "Edita gitconfig per tot el sistema" msgid "Edit..." msgstr "Edita..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4862,6 +4900,10 @@ msgid "" "Find" msgstr "Troba el text especificat\nTroba" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5000,10 +5042,6 @@ msgstr "No s'ha trobat un missatge per aquesta entrega. N'heu d'introduir un per msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "De" @@ -5069,6 +5107,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Obtenint informació. Si us plau espereu..." @@ -5464,6 +5506,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5472,6 +5518,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5480,6 +5534,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5488,6 +5546,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5896,6 +5962,10 @@ msgstr "Inclou etiquetes" msgid "Include &ignored files" msgstr "Inclou arxius ignorats" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Inclou només el següent rang de revisions:" @@ -6317,6 +6387,10 @@ msgid "" "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) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6537,10 +6611,6 @@ msgstr "Mou i canvia el nom" msgid "Move to changelist" msgstr "Mou a la llista de canvis" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Mou per extendre el menú contextual (prem MAJUSC per mostrar-ho)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Mou/Canvia el nom" @@ -7093,6 +7163,10 @@ msgstr "Obre fitxer d'imatge" msgid "Open parent folder" msgstr "Obre carpeta pare" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Obre aquest document" @@ -7167,6 +7241,10 @@ msgstr "Sobreesciu la branca, si ja existeix" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8104,10 +8182,6 @@ msgstr "Demana una estirada" msgid "Requests a username and a password" msgstr "Demana un nom d'usuari i contrasenya" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "És necessari tenir GPG i una clau sense contrasenya." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Res&ol..." @@ -8546,6 +8620,10 @@ msgstr "Desa canvis a %1?" msgid "Save modifications." msgstr "Desa canvis" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Desa revisió &a..." @@ -8627,6 +8705,10 @@ msgstr "Mou cap a l'Esquerra" msgid "Scroll Right" msgstr "Mou cap a la Dreta" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Cerca missatges &log..." @@ -9149,6 +9231,10 @@ msgid "" "Show Whitespaces" msgstr "Mostra caràcters especials pels espais en blanc i els canvis de línia\nMostra espais en blanc" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) 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" @@ -9207,6 +9293,10 @@ msgstr "Mostra el registre per l'arxiu/carpeta seleccionat" msgid "Si&gn" msgstr "&Signa" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Estil platejat" @@ -9290,10 +9380,6 @@ msgstr "Especifica quants elements es volen mantenir en el diàleg de missatges msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Parteix línies" @@ -9465,10 +9551,6 @@ msgstr "" msgid "Submodule Diff" msgstr "Diff del sub-mòdul" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Informació del sub-mòdul" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Inicialització del sub-mòdul" @@ -9492,6 +9574,10 @@ msgid "" "Revision %2!s!" msgstr "Sub-mòdul \"%1!s!\"\nRevisió %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Sub-mòduls" @@ -9500,13 +9586,6 @@ msgstr "Sub-mòduls" msgid "Success" msgstr "Èxit" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Canvia" @@ -9618,6 +9697,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "&Etiquetes:" @@ -10065,6 +10148,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10290,6 +10379,17 @@ msgstr "TortoiseGitMerge no pot processar aquest arxiu de pedaç. L'arxiu \"%s\" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Total de línies canviades, incloent arxius afegits/eliminats:" @@ -10717,6 +10817,10 @@ msgstr "Utilitza bloc text de la vista esquerra\nUtilitza bloc esquerra" msgid "Use th&is text block" msgstr "Utilitza a&quest bloc de text" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10787,12 +10891,20 @@ msgstr "Nom d'usuari" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Les comandes vàlides són:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11410,6 +11522,10 @@ msgstr "dia" msgid "deleted" msgstr "suprimit" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_cs.po b/Languages/Tortoise_cs.po index 489b610ed..aae722d8e 100644 --- a/Languages/Tortoise_cs.po +++ b/Languages/Tortoise_cs.po @@ -1,9 +1,10 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: +# Jiří Engelthaler , 2015 # Lübbe TortoiseSVN , 2011 # Lübbe TortoiseSVN , 2011 # Sven Strickroth , 2012-2013 @@ -15,7 +16,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-01-27 21:48+0000\n" +"PO-Revision-Date: 2015-04-03 07:21+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" @@ -657,6 +658,10 @@ msgstr "&Povolit proxy server" msgid "&Enable edit" msgstr "&Povolit úpravy" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "&Ukončit" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportovat výběr do..." @@ -923,6 +928,10 @@ msgstr "&Nové " msgid "&New..." msgstr "&Nové..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Další >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Další stránka" @@ -951,6 +960,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Jedna stránka" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "&Na" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Otevřít" @@ -959,6 +972,10 @@ msgstr "&Otevřít" 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) msgid "&Open...\tCtrl+O" msgstr "&Otevřít...\tCtrl+O" @@ -1420,6 +1437,10 @@ msgstr ".gitignore v kořeni úložiště" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig v kořeni úložiště" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< &Předchozí" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1709,6 +1730,10 @@ msgstr "Přidat vzdálenou" msgid "Add \"&Signed-off-by\"" msgstr "&Přidat \"Podepsal(a)\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "Přidat další odevzdání?" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Přidat program pro porovnání na základě přípony" @@ -1853,6 +1878,12 @@ msgstr "Povolit úpravy tohoto zobrazení\nPovolit úpravy" msgid "Allow to use custom Gravatar URL" msgstr "Povolit používání vlastních URL Gravatar" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Již je aktuální." @@ -1945,6 +1976,10 @@ msgstr "Umístit tento blok za konec levého" msgid "Application Frame Menus: " msgstr "Nabídky rámečků aplikace" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "Použít &záplatu..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Použít řadovou záplatu..." @@ -2095,10 +2130,6 @@ msgid "Authors case sensitive" msgstr "Citlivost na velikost písmen u autorů" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autoři:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3247,8 +3278,8 @@ msgid "Copying..." msgstr "Kopírování..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Všechna práva vyhrazena (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "Všechna práva vyhrazena (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3511,10 +3542,6 @@ msgstr "Pomocník pověření:" msgid "Credentials" msgstr "Pověření" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Poděkování:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Vyjmout" @@ -3905,6 +3932,10 @@ msgstr "Adresář..." msgid "Directory:" msgstr "Adresář:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "Zakázat zvuky" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4117,6 +4148,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Neukládat\nZnovu načíst zobrazení bez uložení změn" +#. Resource IDs: (65535) +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) msgid "Don't show this message again" msgstr "Tuto zprávu již nezobrazovat" @@ -4253,6 +4288,10 @@ msgstr "Upravit &globální nastavení git" msgid "Edit..." msgstr "Upravit..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "Upravit/Rozdělit odevzdání" + #. Resource IDs: (1770) msgid "Effective" msgstr "Účinné" @@ -4862,6 +4901,10 @@ msgid "" "Find" msgstr "Najít zadaný text\nNajít" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "Najít:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5000,10 +5043,6 @@ msgstr "Nalezena prázdná zpráva odevzdání. Musíte nějakou zadat, jinak p msgid "Found auto words:" msgstr "Nalezena automatická slova:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Od" @@ -5069,6 +5108,10 @@ 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) +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) msgid "Gathering information. Please wait..." msgstr "Shromažďování informací. Prosím čekejte..." @@ -5464,6 +5507,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5472,6 +5519,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5480,6 +5535,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5488,6 +5547,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5896,6 +5963,10 @@ msgstr "Zahrnout &značky" msgid "Include &ignored files" msgstr "Zahrnout &ignorované soubory" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "Zahrnout FETCH_HEAD v seznamech výběru větví" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Zahrnout pouze následující rozsah revizí:" @@ -6317,6 +6388,10 @@ msgid "" "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) +msgid "Mark for comparison" +msgstr "Označit pro porovnání" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Označit tento blok" @@ -6537,10 +6612,6 @@ msgstr "Přesunout a přejmenovat" msgid "Move to changelist" msgstr "Přesunout do seznamu změn" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Přesunout do rozšířené kontextové nabídky (pro zobrazení použijte klávesu shift)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Přesunout/Přejmenovat" @@ -7093,6 +7164,10 @@ msgstr "Otevřít obrázkový soubor..." msgid "Open parent folder" msgstr "Otevřít nadřazenou složku" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "Otevřít záplatový soubor" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Otevřít tento dokument" @@ -7167,6 +7242,10 @@ msgstr "Přepsat větev pokud existuje" msgid "Overwrite" msgstr "Přepsat" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "&Nastavení stránky..." + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8104,10 +8183,6 @@ msgstr "Zažádat o stažení" msgid "Requests a username and a password" msgstr "Žádá o uživatelské jméno a heslo" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Vyžaduje GPG a klíč bez hesla." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "&Vyřešit" @@ -8546,6 +8621,10 @@ msgstr "Uložit změny do %1?" msgid "Save modifications." msgstr "Uložit změny." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "Uložit záplatový soubor" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Uložit revizi &do..." @@ -8627,6 +8706,10 @@ msgstr "Posunout doleva" msgid "Scroll Right" msgstr "Posunout doprava" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "N&astavení" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Prohledat &zprávy protokolu..." @@ -9149,6 +9232,10 @@ msgid "" "Show Whitespaces" msgstr "Zobrazí zvláštní znaky pro mezery a nové řádky\nZobrazit mezery" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "Zobrazit stav podúložišť v nadřazených složkách" + #. Resource IDs: (87) 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ů" @@ -9207,6 +9294,10 @@ msgstr "Zobrazí protokol pro zvolený soubor/složku" msgid "Si&gn" msgstr "&Podepsat" +#. Resource IDs: (65535) +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) msgid "Silver Style" msgstr "Stříbrný Styl" @@ -9290,10 +9381,6 @@ msgstr "Určuje kolik položek chcete uchovat v dialogovém okně nedávných zp msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "Rozdělit odevzdání" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Rozdělit řádky" @@ -9465,10 +9552,6 @@ msgstr "Přidání podmodulu..." msgid "Submodule Diff" msgstr "Porovnat podmodul" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Informace o podmodulu" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Zavedení podmodulů" @@ -9492,6 +9575,10 @@ msgid "" "Revision %2!s!" msgstr "Podmodul \"%1!s!\"\nRevize %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "Podmodul projektu:" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Podmoduly" @@ -9500,13 +9587,6 @@ msgstr "Podmoduly" msgid "Success" msgstr "Úspěch" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Přejít" @@ -9618,6 +9698,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "&Značky:" @@ -10065,6 +10149,12 @@ msgid "" "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) +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) #, c-format msgid "" @@ -10290,6 +10380,17 @@ msgstr "TortoiseGitMerge nemůže zpracovat tuto záplatu. Název souboru \"%s\" msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "TortoiseGitUDiff: sjednocený prohlížeč rozdílů pro TortoiseGit\n\nDostupné parametry příkazové řádky jsou:\n/patchfile:\"cesta k souboru sjednoceného rozdílu\"\n/title:\"název zobrazeného okna prohlížeče\"\n/? - tato nápověda\n/p - číst vstup pro porovnání z konzole" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Celkem změněných řádků včetně přidaných/smazaných souborů:" @@ -10717,6 +10818,10 @@ msgstr "Použít textový blok z levého zobrazení\nPoužít levý blok" msgid "Use th&is text block" msgstr "&Použít tento blok textu" +#. Resource IDs: (98) +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) #, c-format msgid "" @@ -10787,12 +10892,20 @@ msgstr "Uživatelské jméno:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Platné možnosti příkazového řádku jsou:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/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) msgid "Value" @@ -11410,6 +11523,10 @@ msgstr "den" msgid "deleted" msgstr "smazáno" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "porovnání ze vstupu" + #. Resource IDs: (58116) msgid "dummy" msgstr "maketa" diff --git a/Languages/Tortoise_de.po b/Languages/Tortoise_de.po index ea28339b4..66ab6dfbb 100644 --- a/Languages/Tortoise_de.po +++ b/Languages/Tortoise_de.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -10,14 +10,14 @@ # Lübbe , 2012 # Lübbe Onken , 2011-2012, 2013 # Lübbe TortoiseSVN , 2012 -# Sven Strickroth , 2012-2014 +# Sven Strickroth , 2012-2015 # Torsten Widmann , 2012 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:35+0000\n" +"PO-Revision-Date: 2015-04-08 13:41+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" @@ -659,6 +659,10 @@ msgstr "Aktiviere &Proxy Server" msgid "&Enable edit" msgstr "B&earbeiten aktivieren" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "&Beenden" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportiere Auswahl in..." @@ -925,6 +929,10 @@ msgstr "&Neu " msgid "&New..." msgstr "&Neu..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Nächste >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Nächste Seite" @@ -953,6 +961,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Eine Seite" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "&Auf" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "Ö&ffnen" @@ -961,6 +973,10 @@ msgstr "Ö&ffnen" msgid "&Open Git for Windows WebSite" msgstr "Ö&ffne \"Git für Windows\" WebSite" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "&Öffnen..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "Ö&ffnen...\tCtrl+O" @@ -1422,6 +1438,10 @@ msgstr ".gitignore im Projektarchiv Wurzelverzeichnis" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig im Projektwurzelverzeichnis" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< &Vorherige" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1711,6 +1731,10 @@ msgstr "Archiv hinzufügen" msgid "Add \"&Signed-off-by\"" msgstr "\"&Signed-off-by\" hinzufügen" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "Weitere Eintragung hinzufügen?" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Vergleichsprogramm für bestimmte Dateitypen hinzufügen" @@ -1855,6 +1879,12 @@ msgstr "Bearbeiten für diese Ansicht zulassen\nBearbeiten zulassen" msgid "Allow to use custom Gravatar URL" msgstr "Benutze benutzerdefinierte Gravatar URL" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Bereits auf dem neusten Stand." @@ -1947,6 +1977,10 @@ msgstr "Diesen Block links anfügen" msgid "Application Frame Menus: " msgstr "Application Frame Menus: " +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "&Patch anwenden..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Patch-Reihe anwenden..." @@ -2097,10 +2131,6 @@ msgid "Authors case sensitive" msgstr "Groß-/Kleinschreibung bei Autoren beachten" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autoren:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3249,8 +3279,8 @@ msgid "Copying..." msgstr "Kopiere..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "Copyright (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3513,10 +3543,6 @@ msgstr "Credential helper:" msgid "Credentials" msgstr "Anmeldeinformationen" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Danksagung:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "A&usschneiden" @@ -3907,6 +3933,10 @@ msgstr "Verz..." msgid "Directory:" msgstr "Verzeichnis:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "Sounds deaktivieren" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4119,6 +4149,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Nicht speichern\nDie Ansichten neu laden, ohne die Änderungen zu speichern." +#. Resource IDs: (65535) +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) msgid "Don't show this message again" msgstr "Diese Meldung nicht wieder anzeigen" @@ -4255,6 +4289,10 @@ msgstr "S&ystemweite gitconfig bearbeiten" msgid "Edit..." msgstr "Bearbeiten..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "Eintragung bearbeiten/aufspalten" + #. Resource IDs: (1770) msgid "Effective" msgstr "Effektiv" @@ -4864,6 +4902,10 @@ msgid "" "Find" msgstr "Angegebenen Text suchen\nSuchen" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "Suchen:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5002,10 +5044,6 @@ msgstr "Eine leere Log-Meldung wurde gefunden. Sie müssen eine eingeben, um das msgid "Found auto words:" msgstr "Gefundene Autotexte:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Von" @@ -5071,6 +5109,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "Markierung GPG-signieren, beachten Sie die Hilfe für Details" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Sammle Informationen. Bitte warten..." @@ -5466,6 +5508,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +B" @@ -5474,6 +5520,14 @@ msgstr "ID:32772:V +B" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +L" @@ -5482,6 +5536,10 @@ msgstr "ID:32774:V C +L" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5490,6 +5548,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +O" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5898,6 +5964,10 @@ msgstr "Markierungen einschließen" msgid "Include &ignored files" msgstr "beachte &ignorierte Dateien" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "FETCH_HEAD in Zweig-Auswahlboxen anzeigen" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Nur den folgenden Revisionsbereich einschließen:" @@ -6319,6 +6389,10 @@ msgid "" "The file status is changed to modified" msgstr "Als aufgelöst markieren\nDer Status der Datei wird auf 'verändert' gesetzt" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "Für Vergleich auswählen" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Block markieren" @@ -6539,10 +6613,6 @@ msgstr "Verschieben und umbenennen" msgid "Move to changelist" msgstr "Zur Änderungsliste hinzufügen" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Zum erweiteren Kontextmenü verschieben (zum Anzeigen die Umschalttaste drücken)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Verschieben/Umbenennen" @@ -7095,6 +7165,10 @@ msgstr "Öffne Bilddatei..." msgid "Open parent folder" msgstr "Elternordner öffnen" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "Patch-Datei öffnen" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Dieses Dokument öffnen" @@ -7169,6 +7243,10 @@ msgstr "Überschreibe Zweig, falls er existiert" msgid "Overwrite" msgstr "Überschreiben" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "Seite &einrichten..." + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8106,10 +8184,6 @@ msgstr "Anforderungsanfrage" msgid "Requests a username and a password" msgstr "Erfragt Anwendername und Passwort" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Erfordert GPG und einen Schlüssel ohne Passphrase." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Konflikt &lösen..." @@ -8548,6 +8622,10 @@ msgstr "Änderungen in %1 speichern?" msgid "Save modifications." msgstr "Änderungen speichern." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "Patch-Datei &speichern" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Speichere Revision &unter..." @@ -8629,6 +8707,10 @@ msgstr "Nach links rollen" msgid "Scroll Right" msgstr "Nach rechts rollen" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "Eins&tellungen" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Durchsuche &Logmeldungen..." @@ -9151,6 +9233,10 @@ msgid "" "Show Whitespaces" msgstr "Leerzeichen und Zeilenumbrüche hervorheben\nNichtdruckbare Zeichen anzeigen" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "Zeige Status von Subrepositories in Eltern-Verzeichnissen" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Ersetzt Teile des Refnamens durch Symbole" @@ -9209,6 +9295,10 @@ msgstr "Zeigt das Log der gewählten Datei/Ordner" msgid "Si&gn" msgstr "Si&gnieren" +#. Resource IDs: (65535) +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) msgid "Silver Style" msgstr "Silberner Stil" @@ -9292,10 +9382,6 @@ msgstr "Legt fest, wie viele Einträge in der Liste der letzten Logmeldungen ges msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "Eintragung aufteilen" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Zeilen splitten" @@ -9467,10 +9553,6 @@ msgstr "Submodul hinzufügen..." msgid "Submodule Diff" msgstr "Submodul vergleichen" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Submodul Informationen" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Submodul(e) einrichten" @@ -9494,6 +9576,10 @@ msgid "" "Revision %2!s!" msgstr "Submodul \"%1!s!\"\nRevision %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "Submodul des Projekts:" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Submodule" @@ -9502,13 +9588,6 @@ msgstr "Submodule" msgid "Success" msgstr "Erfolgreich" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Wechseln" @@ -9620,6 +9699,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Markierun&gen:" @@ -10067,6 +10150,12 @@ msgid "" "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) +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) #, c-format msgid "" @@ -10292,6 +10381,17 @@ msgstr "TortoiseGitMerge kann diesen Patch nicht verarbeiten. Der Dateiname \"%s msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "TortoiseGitUDiff: Der Unified-Diff-Viewer von TortoiseGit\n\nVerfügbare Kommandozeilenparameter sind:\n/patchfile:\"Pfad zur unified diff Datei\"\n/title:\"Titel der im Viewer angezeigt werden soll\"\n/? - dieser Dialog\n/p - Lese die Vergleichseingabe vom Standard-Input der Konsole" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Insgesamt modifizierte Zeilen inklusive neue/gelöschte Dateien" @@ -10719,6 +10819,10 @@ msgstr "Verwende Block aus der linken Seite\nVerwende linken Block" msgid "Use th&is text block" msgstr "Verwende &diesen Textblock" +#. Resource IDs: (98) +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) #, c-format msgid "" @@ -10789,12 +10893,20 @@ msgstr "Benutzername:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Kommandozeilenoptionen:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/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) msgid "Value" @@ -11412,6 +11524,10 @@ msgstr "Tag" msgid "deleted" msgstr "Gelöscht" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "Vergleichen über Standard-Input-Pipe" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_es_ES.po b/Languages/Tortoise_es_ES.po index 8fd2755b3..dfa2dec78 100644 --- a/Languages/Tortoise_es_ES.po +++ b/Languages/Tortoise_es_ES.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -7,7 +7,7 @@ # TempEmail.net , 2013 # ivan_rodriguez , 2014 # ivan_rodriguez , 2014 -# strel, 2013-2014 +# strel, 2013-2015 # Sven Strickroth , 2012-2013 # TempEmail.net , 2013 msgid "" @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 17:34+0000\n" +"PO-Revision-Date: 2015-04-02 22:23+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" @@ -657,6 +657,10 @@ msgstr "&Habilitar servidor proxy" msgid "&Enable edit" msgstr "&Habilitar edición" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "&Salir" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportar selección a..." @@ -923,6 +927,10 @@ msgstr "&Nuevo" msgid "&New..." msgstr "&Nuevo..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Siguiente>" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Página siguiente" @@ -951,6 +959,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Página única" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "&Sobre" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Abrir" @@ -959,6 +971,10 @@ msgstr "&Abrir" msgid "&Open Git for Windows WebSite" msgstr "&Abrir Git para Sitio Web de Windows" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "&Abrir..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -1420,6 +1436,10 @@ msgstr ".gitignore en la raiz de repositorio" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig en la raíz del repositorio" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< &Anterior" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1709,6 +1729,10 @@ msgstr "Añadir Remoto" msgid "Add \"&Signed-off-by\"" msgstr "Añadir \"&Firmado por\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "¿Añadir otra consignación (commit)?" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Añadir programa específico para extensiones diff" @@ -1853,6 +1877,12 @@ msgstr "Permitir edición de esta vista\nPermitir edición" msgid "Allow to use custom Gravatar URL" msgstr "Permitir URL de Gravatar personalizado" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Ya está actualizado." @@ -1945,6 +1975,10 @@ msgstr "Anexar este bloque a la izquierda" msgid "Application Frame Menus: " msgstr "Cuadros de menú de aplicación:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "Aplicar &parche..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Aplicar parche de serie..." @@ -2095,10 +2129,6 @@ msgid "Authors case sensitive" msgstr "Alfabéticamente A_a-Z_z " #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autores:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3247,8 +3277,8 @@ msgid "Copying..." msgstr "Copiando..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "Copyright (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3511,10 +3541,6 @@ msgstr "Ayudante de credenciales:" msgid "Credentials" msgstr "Credenciales" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Créditos:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Cor&tar" @@ -3905,6 +3931,10 @@ msgstr "Dir..." msgid "Directory:" msgstr "Directorio:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "Deshabilitar sonidos" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4117,6 +4147,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "No guardar\nRecargar las vistas sin guardar las modificaciones" +#. Resource IDs: (65535) +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) msgid "Don't show this message again" msgstr "No mostrar este mensaje de nuevo" @@ -4253,6 +4287,10 @@ msgstr "Editar .gitconfig del &sistema" msgid "Edit..." msgstr "Editar..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "Editar/Dividir consignación (commit)" + #. Resource IDs: (1770) msgid "Effective" msgstr "Efectivo" @@ -4862,6 +4900,10 @@ msgid "" "Find" msgstr "Buscar el texto señalado\nBuscar" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "Buscar:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5000,10 +5042,6 @@ msgstr "Detectado un mensaje de consigna vacío. Tienes que introducir uno o la msgid "Found auto words:" msgstr "Se encontraron auto palabras:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Desde" @@ -5069,6 +5107,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "GPG firma la etiqueta, vea el manual para los detalles" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Obteniendo información. Por favor, espere..." @@ -5464,6 +5506,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5472,6 +5518,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5480,6 +5534,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5488,6 +5546,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5896,6 +5962,10 @@ msgstr "Incluir &Etiquetas" msgid "Include &ignored files" 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" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Incluir sólo los siguientes rangos de revisiones:" @@ -6317,6 +6387,10 @@ msgid "" "The file status is changed to modified" msgstr "Marcar como resuelto\nEl estatus del fichero se cambió a modificado" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "Marcar para comparación" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Marcar este bloque" @@ -6537,10 +6611,6 @@ msgstr "Mover y renombrar" msgid "Move to changelist" msgstr "Mover a lista decambios" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Mover al menú contextual extendido (pulsa shift para mostrarlo)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Mover/Renombrar" @@ -7093,6 +7163,10 @@ msgstr "Abrir archivo de imagen..." msgid "Open parent folder" msgstr "Abrir carpeta antecesora" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "Abrir fichero de parche" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Abrir este documento" @@ -7167,6 +7241,10 @@ msgstr "Reemplazar ramal si existe" msgid "Overwrite" msgstr "Sobreescribir" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "Configuración de p&ágina..." + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8104,10 +8182,6 @@ msgstr "Solicitar pull (tomar)" msgid "Requests a username and a password" msgstr "Se requiere un nombre de usuario y una contraseña" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Se requiere GPG y una clave sin contraseña." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Res&olver..." @@ -8546,6 +8620,10 @@ msgstr "¿Guardar cambios a %1?" msgid "Save modifications." msgstr "Guardar modificaciones." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "Guardar fichero de parche" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Guardar revisión &en..." @@ -8627,6 +8705,10 @@ msgstr "Desplazar a la izquierda" msgid "Scroll Right" msgstr "Desplazar a la derecha" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "Con&figuración..." + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Buscar mensajes de &Reg..." @@ -9149,6 +9231,10 @@ msgid "" "Show Whitespaces" msgstr "Mostrar caracteres especiales para los espacios en blanco y saltos de línea\nMostrar espacios en blanco" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "Mostrar estado de subrepositorios en carpetas progenitoras" + #. Resource IDs: (87) 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" @@ -9207,6 +9293,10 @@ msgstr "Mostrar el reg. del archivo/carpeta seleccionado(a)" msgid "Si&gn" msgstr "Fir&ma" +#. Resource IDs: (65535) +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) msgid "Silver Style" msgstr "Estilo plateado" @@ -9290,10 +9380,6 @@ msgstr "Especifica cuantos objetos quieres mantener en el registro de diálogo d msgid "Spin1" msgstr "Madeja1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "Dividir consignación (commit)" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Dividir líneas" @@ -9465,10 +9551,6 @@ msgstr "Submódulo Añadir..." msgid "Submodule Diff" msgstr "Submódulo Dif." -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Submódulo info" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Submódulo Init" @@ -9492,6 +9574,10 @@ msgid "" "Revision %2!s!" msgstr "Submódulo \"%1!s!\"\nRevisión %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "Submódulo del proyecto:" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Submódulos" @@ -9500,13 +9586,6 @@ msgstr "Submódulos" msgid "Success" msgstr "Correcto" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Conmutar" @@ -9618,6 +9697,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Eti&quitas:" @@ -10065,6 +10148,12 @@ msgid "" "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) +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) #, c-format msgid "" @@ -10290,6 +10379,17 @@ msgstr "TortoiseGitMerge no puede procesar este fichero de parche. El nombre de msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "TortoiseGitUDiff: el visor diff unificado para TortoiseGit\n\nLos parámetros de línea de comandos disponibles son:\n/patchfile:\"ruta al fichero diff unificado\"\n/title:\"título a mostrar para el visor\"\n/? - este cuadro de diálogo de ayuda\n/p - lee la entrada de diff de la canalización (pipe) de la consola" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Total de líneas cambiadas incluyendo ficheros añadidos/borrados:" @@ -10717,6 +10817,10 @@ msgstr "Usar el bloque de texto de la vista Izqi\nUsar bloque Izqi" msgid "Use th&is text block" msgstr "Usar es&te bloque de texto" +#. Resource IDs: (98) +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) #, c-format msgid "" @@ -10787,12 +10891,20 @@ msgstr "Nombre de Usuario:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Opciones válidas de línes de comandos:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/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) msgid "Value" @@ -11410,6 +11522,10 @@ msgstr "día" msgid "deleted" msgstr "Eliminado" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "diff desde pipe" + #. Resource IDs: (58116) msgid "dummy" msgstr "muerto" diff --git a/Languages/Tortoise_fr.po b/Languages/Tortoise_fr.po index 0b028866f..be633e97b 100644 --- a/Languages/Tortoise_fr.po +++ b/Languages/Tortoise_fr.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -11,7 +11,7 @@ # gregseth , 2013 # gregseth , 2013 # lkppo, 2012 -# bauland , 2014 +# bauland , 2014-2015 # peter griffin , 2013 # Fred , 2013 # Fred , 2013 @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -616,7 +616,7 @@ msgstr "&Ranger" #. Resource IDs: (1032) msgid "&Don't ask me again" -msgstr "" +msgstr "Ne plus &demander" #. Resource IDs: (1384) msgid "&Down" @@ -666,6 +666,10 @@ msgstr "Utilis&er un serveur proxy" msgid "&Enable edit" msgstr "&Activer l'édition" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "Quitt&er" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exporter la sélection vers..." @@ -932,6 +936,10 @@ msgstr "&Nouveau" msgid "&New..." msgstr "&Nouveau..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Suivant >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Page Suivante" @@ -960,6 +968,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Une Page" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Ouvrir" @@ -968,6 +980,10 @@ msgstr "&Ouvrir" msgid "&Open Git for Windows WebSite" msgstr "&Ouvrir le site de Git pour Windows" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "&Ouvrir..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Ouvrir...\tCtrl+O" @@ -1054,7 +1070,7 @@ msgstr "Expression &Régulière" #. Resource IDs: (97) msgid "&Remind me later" -msgstr "" +msgstr "Me le &rappeler plus tard" #. Resource IDs: (1617) msgid "&Remote Branch:" @@ -1429,6 +1445,10 @@ msgstr ".gitignore dans le dépôt racine" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig dans le dépôt racine" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< &Précédent" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1718,6 +1738,10 @@ msgstr "Ajouter à distance" msgid "Add \"&Signed-off-by\"" msgstr "Ajouter une \"&signature\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Ajouter un programme de comparaison selon l'extension" @@ -1862,6 +1886,12 @@ msgstr "Autoriser l'édition pour cette vue\nAutoriser l'édition" msgid "Allow to use custom Gravatar URL" msgstr "Autoriser l'utilisation d'URL Gravatar personnalisée" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Déjà à jour." @@ -1954,6 +1984,10 @@ msgstr "Annexer ce bloc à gauche" msgid "Application Frame Menus: " msgstr "Menus de la Bordure de l'Application :" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "Appliquer le patch..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Appliquer une série de patchs..." @@ -2104,10 +2138,6 @@ msgid "Authors case sensitive" msgstr "Auteurs sensibles à la casse" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Auteurs :" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3256,8 +3286,8 @@ msgid "Copying..." msgstr "Copie..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "Copyright (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3520,10 +3550,6 @@ msgstr "Crédit des aides:" msgid "Credentials" msgstr "Crédits" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Crédits :" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "C&ouper" @@ -3746,11 +3772,11 @@ msgstr "Supprime" #. Resource IDs: (97) msgid "Deleting cached data" -msgstr "" +msgstr "Efface les données du cache" #. Resource IDs: (97) msgid "Deleting file" -msgstr "" +msgstr "Efface les fichiers" #. Resource IDs: (88) msgid "Deleting remote refs..." @@ -3914,6 +3940,10 @@ msgstr "Rép..." msgid "Directory:" msgstr "Répertoire :" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "Désactiver le son" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -3922,7 +3952,7 @@ msgstr "Désactiver cette option si vous avez une énorme arborescence de travai #. Resource IDs: (97) msgid "Disable update checks" -msgstr "" +msgstr "Désactiver les recherches de mises à jour" #. Resource IDs: (2054) msgid "Disabled" @@ -4007,7 +4037,7 @@ 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 "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) msgid "Do you really want to mark the selected file(s) as assume-valid?" @@ -4126,6 +4156,10 @@ msgid "" "Reload the views without saving the 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 "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Ne plus afficher ce message" @@ -4262,6 +4296,10 @@ msgstr "Modifier le fichier .gitconfig &local" msgid "Edit..." msgstr "Éditer..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "Effectife" @@ -4871,6 +4909,10 @@ msgid "" "Find" msgstr "Rechercher le texte spécifié\nRechercher" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "Trouve:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5009,10 +5051,6 @@ msgstr "Un message de livraison vide a été trouvé. Vous devez en entrer un ou msgid "Found auto words:" msgstr "Mots automatiques trouvés:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Depuis" @@ -5078,6 +5116,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Obtention d'informations. Veuillez patienter..." @@ -5473,6 +5515,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +S" @@ -5481,6 +5527,14 @@ msgstr "ID:32772:V +S" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5489,6 +5543,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5497,6 +5555,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5905,6 +5971,10 @@ msgstr "Inclure les é&tiquettes" msgid "Include &ignored files" msgstr "Inclure les fichiers &ignorés" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "N'inclure que les révisions suivantes:" @@ -6326,6 +6396,10 @@ msgid "" "The file status is changed to modified" msgstr "Marquer comme résolu⏎\nLe statut du fichier est changé en modifié" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "Marqué pour la comparaison" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Marquer ce bloc" @@ -6546,10 +6620,6 @@ msgstr "Déplacer et renommer" msgid "Move to changelist" msgstr "Déplacer vers la liste de changements" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Se déplacer dans le menu contextuel étendu (presser la touche shift pour l'afficher)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Déplacer/Renommer" @@ -6920,7 +6990,7 @@ msgstr "Nombre de caractères nécessaires pour déplacer ou copier la détectio #. Resource IDs: (96) msgid "Number of characters to show in the abbreviated hash part" -msgstr "" +msgstr "Nombre de caractères à afficher dans la partie abrégée de hachage" #. Resource IDs: (1160) msgid "Number of weeks:" @@ -7102,6 +7172,10 @@ msgstr "Charger le fichier image..." msgid "Open parent folder" msgstr "Ouvrir le répertoire parent" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "Ouvrir le fichier de patch" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Ouvrir ce document" @@ -7176,6 +7250,10 @@ msgstr "Ecraser la branche si elle existe" msgid "Overwrite" msgstr "Remplacer" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "Paramétrage de la p&age" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8113,10 +8191,6 @@ msgstr "Demande de tirage" msgid "Requests a username and a password" msgstr "Requiert un nom d'utilisateur et un mot de passe" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Demande une empreinte GPG et une clef sans passphrase." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Rés&oudre..." @@ -8157,7 +8231,7 @@ msgstr "Résoudre" #. Resource IDs: (4595) msgid "Resolve Submodule Conflict" -msgstr "" +msgstr "Résoudre le conflit de sous-module" #. Resource IDs: (282) msgid "Resolve conflict using 'mine'" @@ -8555,6 +8629,10 @@ msgstr "Enregistrer les changements dans %1?" msgid "Save modifications." msgstr "Sauver les modifications." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "Sauvegarder le fichier de patch" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Enregis&trer la révision sous..." @@ -8636,6 +8714,10 @@ msgstr "Défiler à Gauche" msgid "Scroll Right" msgstr "Défiler à Droite" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "Paramé&tres..." + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Recherche dans le fichier journa&l..." @@ -8979,7 +9061,7 @@ msgstr "Afficher un aperçu de l'intégralité de la courbe" #. Resource IDs: (1074) msgid "Show asterisk log prefix" -msgstr "" +msgstr "Afficher les astérisques dans les préfixes de journaux" #. Resource IDs: (97) msgid "Show asterisk log prefix in log dialog" @@ -9158,6 +9240,10 @@ msgid "" "Show Whitespaces" msgstr "Afficher des caractères spéciaux à la place des espaces et les sauts de ligne\nAfficher les espaces" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "Montrer le statuts des sous répertoire dans les dossiers parents" + #. Resource IDs: (87) 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" @@ -9216,6 +9302,10 @@ msgstr "Afficher le journal du fichier ou du répertoire sélectionné" msgid "Si&gn" msgstr "Si&gner" +#. Resource IDs: (65535) +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) msgid "Silver Style" msgstr "Style Silver" @@ -9299,10 +9389,6 @@ msgstr "Spécifie combien d'éléments vous voulez garder dans la boîte de dial msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "Séparer la livraison" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Séparer lignes" @@ -9474,10 +9560,6 @@ msgstr "Ajout du sous-module..." msgid "Submodule Diff" msgstr "Diff du sous-module" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Information du sous-module" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Initialisation du sous-module" @@ -9501,6 +9583,10 @@ msgid "" "Revision %2!s!" msgstr "Sous-module \"%1!s!\"↩⏎\nRévision %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "Sous module du Projet:" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Sous-modules" @@ -9509,13 +9595,6 @@ msgstr "Sous-modules" msgid "Success" msgstr "Succès" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Permutter" @@ -9627,6 +9706,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Bali&ses:" @@ -10074,6 +10157,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10299,6 +10388,17 @@ msgstr "TortoiseGitMerge ne peut pas utiliser ce fichier comme patch. Le nom \"% msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Nombre total de lignes modifiées incluant les fichiers ajoutés et supprimés:" @@ -10642,7 +10742,7 @@ msgstr "Utiliser les deux blocs de texte (celui-ci en dernier)" #. Resource IDs: (97) msgid "Use configured server" -msgstr "" +msgstr "Utiliser le serveur configuré" #. Resource IDs: (156) msgid "Use left block" @@ -10726,6 +10826,10 @@ msgstr "Utiliser le bloc de texte de la vue de gauche\nUtiliser le bloc gauche" msgid "Use th&is text block" msgstr "Ut&iliser ce bloc de texte" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10796,12 +10900,20 @@ msgstr "Nom :" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Les options de la ligne de commandes valides sont :\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11419,6 +11531,10 @@ msgstr "jour" msgid "deleted" msgstr "effacé" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" @@ -11535,7 +11651,7 @@ msgstr "non versionné" #. Resource IDs: (97) msgid "none" -msgstr "" +msgstr "aucun" #. Resource IDs: (10) msgid "normal" diff --git a/Languages/Tortoise_hu.po b/Languages/Tortoise_hu.po index 8daed4339..ca737278d 100644 --- a/Languages/Tortoise_hu.po +++ b/Languages/Tortoise_hu.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -10,14 +10,14 @@ # Gábor Prótár , 2013-2014 # Hgrg , 2013 # Hgrg , 2013 -# Péter Handbauer , 2014 +# Péter Handbauer , 2014-2015 # Sven Strickroth , 2013 msgid "" msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -190,7 +190,7 @@ msgstr "%1\nA fájl nem található.\nEllenőrizd, hogy helyes-e az elérési ú #. Resource IDs: (91) #, c-format msgid "%HOME%/.gitconfig or %XDGHOME%/git/config" -msgstr "" +msgstr "%HOME%/.gitconfig vagy %XDGHOME%/git/config" #. Resource IDs: (357) #, c-format @@ -220,7 +220,7 @@ msgstr "%d fájl eltávolítva." #. Resource IDs: (69) #, c-format msgid "%d files reverted to %s." -msgstr "" +msgstr "%d fájl visszaállítva %s verzióra." #. Resource IDs: (169) #, c-format @@ -659,6 +659,10 @@ msgstr "&Proxy szerver engedélyezése" msgid "&Enable edit" msgstr "" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Kijelölés exportálása ide..." @@ -925,6 +929,10 @@ msgstr "&Új" msgid "&New..." msgstr "&Új..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Következő oldal" @@ -953,6 +961,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Egy oldal" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Megnyitás" @@ -961,6 +973,10 @@ msgstr "&Megnyitás" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Megnyitás...⇥Ctrl+O" @@ -1422,6 +1438,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1550,7 +1570,7 @@ msgstr "" #. Resource IDs: (85) msgid "A branch with this name already exists." -msgstr "" +msgstr "Már létezik azonos nevű branch." #. Resource IDs: (69) msgid "" @@ -1560,7 +1580,7 @@ msgstr "" #. Resource IDs: (201) msgid "A newer version is available. Please download the current version!" -msgstr "" +msgstr "Újabb verzió érhető el. Kérem töltse le a friss verziót!" #. Resource IDs: (195) msgid "" @@ -1636,7 +1656,7 @@ msgstr "" #. Resource IDs: (15) msgid "Aborts a running merge." -msgstr "" +msgstr "Futó merge megszakítása." #. Resource IDs: (156) msgid "About" @@ -1711,6 +1731,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Kiterjesztésfüggő diff program hozzáadáasa" @@ -1855,6 +1879,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1937,16 +1967,20 @@ msgstr "" #. Resource IDs: (251) msgid "Append right block" -msgstr "" +msgstr "Baloldali blokk hozzáfűzése." #. Resource IDs: (251) msgid "Append this block to left" -msgstr "" +msgstr "Jelen blokk hozzáfűzése balra" #. Resource IDs: (65535) msgid "Application Frame Menus: " msgstr "Alkalmazás Keret Menü" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2043,7 +2077,7 @@ msgstr "Jelenlegi verzió: %d" #. Resource IDs: (84) msgid "At the moment, you can only rename branches." -msgstr "" +msgstr "Jelen pillanatban a branch-ágak csak átnevezhetők." #. Resource IDs: (3843) msgid "Attempted an unsupported operation." @@ -2066,7 +2100,7 @@ msgstr "A program %1-ból olvasás közben kísérelt meg írni." #. Resource IDs: (65535) msgid "Attention: This command affects the whole working tree!" -msgstr "" +msgstr "Figyelem: A parancs a teljes fejelsztői fát befolyásolja!" #. Resource IDs: (131, 160) msgid "Authentication" @@ -2097,10 +2131,6 @@ msgid "Authors case sensitive" msgstr "Fejlesztők nevében számít a kisbetű/nagybetű" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Fejlesztők:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -2457,7 +2487,7 @@ msgstr "Mégse" msgid "" "Cancel\n" "Don't quit TortoiseGitMerge" -msgstr "" +msgstr "Mégse\nNem lép ki a TortoiseGitMerge" #. Resource IDs: (315) msgid "" @@ -2469,13 +2499,13 @@ msgstr "" msgid "" "Cancel\n" "Keep the empty file." -msgstr "" +msgstr "Mégse\nÜres fájl megtartása." #. Resource IDs: (315) msgid "" "Cancel\n" "Resolve the conflicts first." -msgstr "" +msgstr "Mégse\nKonfliktusok feloldása először." #. Resource IDs: (315) msgid "" @@ -2520,7 +2550,7 @@ msgstr "Jobbklikk-re megjelenő menü" #. Resource IDs: (117) msgid "Case-sensitive" -msgstr "" +msgstr "Nagybetű érzékeny" #. Resource IDs: (65535) msgid "Cate&gories:" @@ -2824,7 +2854,7 @@ msgstr "Vágólap" #. Resource IDs: (606) msgid "Clone" -msgstr "" +msgstr "Klónozás" #. Resource IDs: (1572) msgid "Clone Existing Repository" @@ -2836,7 +2866,7 @@ msgstr "Tároló klónozása" #. Resource IDs: (1653) msgid "Clone into Bare Repo" -msgstr "" +msgstr "Klónozás csupasz tárolóba" #. Resource IDs: (14) msgid "Clone..." @@ -2878,7 +2908,7 @@ msgstr "Bezárja az aktív ablakot és megkérdezi, hogy elmentse-e a dokumentum #. Resource IDs: (156) msgid "Collapse" -msgstr "" +msgstr "Összecsukás" #. Resource IDs: (2055) msgid "" @@ -2908,7 +2938,7 @@ msgstr "" #. Resource IDs: (1255) msgid "Combine to one commit" -msgstr "" +msgstr "Egyesítés egy kommitba" #. Resource IDs: (65535) msgid "Comman&ds:" @@ -3080,7 +3110,7 @@ msgstr "Beállítások" #. Resource IDs: (65535) msgid "Config source" -msgstr "" +msgstr "Forrás beállítása" #. Resource IDs: (65535) msgid "Config type:" @@ -3118,7 +3148,7 @@ msgstr "" #. Resource IDs: (1768) msgid "Confirm to kill running git process" -msgstr "" +msgstr "Futó git folyamat kilövésének megerősítése" #. Resource IDs: (1257, 4568) msgid "Conflict" @@ -3126,7 +3156,7 @@ msgstr "Konfliktus" #. Resource IDs: (67) msgid "Conflict Files" -msgstr "" +msgstr "Konfliktus fájlok" #. Resource IDs: (65535) msgid "Conflict resolved" @@ -3138,7 +3168,7 @@ msgstr "Konfliktusos" #. Resource IDs: (86) msgid "Conflicts" -msgstr "" +msgstr "Konfliktusok" #. Resource IDs: (188) #, c-format @@ -3163,11 +3193,11 @@ msgstr "Dokkolt ablak összecsukása" #. Resource IDs: (501) msgid "Convert spaces to tabs" -msgstr "" +msgstr "Szóközök cseréje tabulátorra" #. Resource IDs: (501) msgid "Convert tabs to spaces" -msgstr "" +msgstr "Tabulátorok cseréje szóközre" #. Resource IDs: (1253) msgid "Cop&y" @@ -3206,11 +3236,11 @@ msgstr "Másolás és átnevezés" #. Resource IDs: (1252) msgid "Copy log messages to clipboard" -msgstr "" +msgstr "Log üzenetek másolása vágólapra" #. Resource IDs: (32777) msgid "Copy log to clipboard" -msgstr "" +msgstr "Log másolása vágólapra" #. Resource IDs: (209) msgid "Copy paths to clipboard" @@ -3249,7 +3279,7 @@ msgid "Copying..." msgstr "Másolás..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3410,7 +3440,7 @@ msgstr ".gitignore fájl létrehozása" #. Resource IDs: (82) msgid "Create Branch" -msgstr "" +msgstr "Branch létrehozása" #. Resource IDs: (1254) msgid "Create Branch at this version..." @@ -3513,10 +3543,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Készítők:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Kivágás" @@ -3667,7 +3693,7 @@ msgstr "%d &elem törlése és kizárása kiterjesztés alapján" #. Resource IDs: (80) msgid "Delete branch" -msgstr "" +msgstr "Branch törlése" #. Resource IDs: (1255) msgid "Delete branch/tag" @@ -3675,7 +3701,7 @@ msgstr "Ág/címke törlése" #. Resource IDs: (80) msgid "Delete remote branch" -msgstr "" +msgstr "Távoli branch törlése" #. Resource IDs: (4579) msgid "Delete remote tag - TortoiseGit" @@ -3692,7 +3718,7 @@ msgstr "" #. Resource IDs: (605) msgid "Delete submodule" -msgstr "" +msgstr "Almodul törlése" #. Resource IDs: (83) msgid "Delete tag" @@ -3700,7 +3726,7 @@ msgstr "" #. Resource IDs: (85) msgid "Delete the existing branch or use a different name." -msgstr "" +msgstr "Törölje a létező branch-ágat vagy használjon másik nevet." #. Resource IDs: (314) msgid "" @@ -3907,6 +3933,10 @@ msgstr "" msgid "Directory:" msgstr "Mappa:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4024,7 +4054,7 @@ msgstr "" #. Resource IDs: (71) #, c-format msgid "Do you really want to remove \"%s\"?" -msgstr "" +msgstr "Biztosan el akarja \"%s\"-t távolítani?" #. Resource IDs: (69) msgid "" @@ -4119,6 +4149,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Ne mutassa többet ezt az üzenetet" @@ -4255,6 +4289,10 @@ msgstr "" msgid "Edit..." msgstr "Szerkeszt..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4864,6 +4902,10 @@ msgid "" "Find" msgstr "Megkeresi a megadott szöveget\nKeres" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5002,10 +5044,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "" @@ -5071,6 +5109,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Információ összegyűjtése, kis türemlet..." @@ -5466,6 +5508,10 @@ msgstr "Azonosító" msgid "ID:220:V C +G" msgstr "" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5474,6 +5520,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5482,6 +5536,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5490,6 +5548,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5898,6 +5964,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Csak az alábbi intervallumot vegye figyelembe:" @@ -6319,6 +6389,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6539,10 +6613,6 @@ msgstr "Áthelyezés és átnevezés" msgid "Move to changelist" msgstr "Változáslistába helyezés" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Áthelyezés/átnevezés" @@ -7095,6 +7165,10 @@ msgstr "Képfájl megnyitása..." msgid "Open parent folder" msgstr "Szülőmappa megnyitása" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7169,6 +7243,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8106,10 +8184,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Felhasználónevet és jelszót igényel" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8548,6 +8622,10 @@ msgstr "Elmented %1 változásait?" msgid "Save modifications." msgstr "Módosítások mentése." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Verzió mentése &ide..." @@ -8629,6 +8707,10 @@ msgstr "Görgetés balra" msgid "Scroll Right" msgstr "Görgetés jobbra" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "&Megjegyzések keresése..." @@ -9151,6 +9233,10 @@ msgid "" "Show Whitespaces" msgstr "" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9209,6 +9295,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "" @@ -9292,10 +9382,6 @@ msgstr "Megadja, hogy a korábbi megjegyzések ablakban hány megjegyzés legyen msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Sortördelés" @@ -9467,10 +9553,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9494,6 +9576,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "" @@ -9502,13 +9588,6 @@ msgstr "" msgid "Success" msgstr "" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Váltás" @@ -9620,6 +9699,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10067,6 +10150,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10292,6 +10381,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10719,6 +10819,10 @@ msgstr "Bal oldali szövegblokk használata\nBal oldali szövegblokk használata msgid "Use th&is text block" msgstr "&Ezt a szövegblokkot használja" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10789,12 +10893,20 @@ msgstr "Felhasználónév:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "A használható paraméterek:\n/base:<útvonal az alap fájlhoz>\n/theirs:<útvonal a másik fájlhoz>\n/mine:<útvonal a saját fájlhoz>\n/merged:<útvonal a létrehozandó egyesített fájlhoz>\n/diff:<útvonal az \"egyesített diff\" fájlhoz>\n/patchpath:<útvonal a mappához>" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11412,6 +11524,10 @@ msgstr "nap" msgid "deleted" msgstr "törölve" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_id.po b/Languages/Tortoise_id.po index 77c3b621b..c982b1955 100644 --- a/Languages/Tortoise_id.po +++ b/Languages/Tortoise_id.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -660,6 +660,10 @@ msgstr "&Aktifkan Server Proxy" msgid "&Enable edit" msgstr "" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Ekspor yang dipilih ke..." @@ -926,6 +930,10 @@ msgstr "&Baru" msgid "&New..." msgstr "&Baru..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Halaman Berikutnya" @@ -954,6 +962,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Satu Halaman" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Buka" @@ -962,6 +974,10 @@ msgstr "&Buka" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -1423,6 +1439,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1712,6 +1732,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Tambah ekstensi khusus program diff" @@ -1856,6 +1880,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1948,6 +1978,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Menu Bingkai Aplikasi" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2098,10 +2132,6 @@ msgid "Authors case sensitive" msgstr "Sensitif huruf Pengarang" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Pengarang:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3250,7 +3280,7 @@ msgid "Copying..." msgstr "Mengcopy..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3514,10 +3544,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Penghargaan:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Cu&t" @@ -3908,6 +3934,10 @@ msgstr "" msgid "Directory:" msgstr "Direktori:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4120,6 +4150,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Jangan simpan\nMemuat ulang tampilan tanpa menyimpan modifikasi" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Jangan tampilkan pesan ini lagi" @@ -4256,6 +4290,10 @@ msgstr "" msgid "Edit..." msgstr "Ubah..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4865,6 +4903,10 @@ msgid "" "Find" msgstr "Cari teks yang ditetapkan\nCari" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5003,10 +5045,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "" - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Dari" @@ -5072,6 +5110,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Mengumpulkan informasi. Silakan tunggu..." @@ -5467,6 +5509,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5475,6 +5521,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5483,6 +5537,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5491,6 +5549,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5899,6 +5965,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Ikutkan hanya rentang revisi berikut:" @@ -6320,6 +6390,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6540,10 +6614,6 @@ msgstr "Pindahkan dan ganti nama" msgid "Move to changelist" msgstr "Pindahkan ke daftar perubahan" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Pindah/Ganti nama" @@ -7096,6 +7166,10 @@ msgstr "Buka berkas gambar..." msgid "Open parent folder" msgstr "Buka folder leluhur" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7170,6 +7244,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8107,10 +8185,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Meminta nama pengguna dan kata sandi" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8549,6 +8623,10 @@ msgstr "Simpan perubahan ke %1?" msgid "Save modifications." msgstr "Simpan modifikasi" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Simpan revisi &ke..." @@ -8630,6 +8708,10 @@ msgstr "Gulung Kiri" msgid "Scroll Right" msgstr "Gulung Kanan" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Cari pesan &log..." @@ -9152,6 +9234,10 @@ msgid "" "Show Whitespaces" msgstr "" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9210,6 +9296,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "" @@ -9293,10 +9383,6 @@ msgstr "Menetapkan seberapa banyak item yang ingin anda biarkan dalam dialog pes msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Garis pemisah" @@ -9468,10 +9554,6 @@ msgstr "" msgid "Submodule Diff" msgstr "Submodul Diff" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Submodul Info" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9495,6 +9577,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "" @@ -9503,13 +9589,6 @@ msgstr "" msgid "Success" msgstr "" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Tukar" @@ -9621,6 +9700,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10068,6 +10151,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10293,6 +10382,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10720,6 +10820,10 @@ msgstr "Gunakan blok teks dari tilik kiri\nGunakan blok kiri" msgid "Use th&is text block" msgstr "Gunakan blok teks &ini" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10790,12 +10894,20 @@ msgstr "Nama pengguna" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Opsi baris perintah yang benar adalah:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11413,6 +11525,10 @@ msgstr "hari" msgid "deleted" msgstr "dihapus" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_it_IT.po b/Languages/Tortoise_it_IT.po index 8d544f32f..eab8a07b2 100644 --- a/Languages/Tortoise_it_IT.po +++ b/Languages/Tortoise_it_IT.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -666,6 +666,10 @@ msgstr "A&bilita server proxy" msgid "&Enable edit" msgstr "" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Esporta selezione in..." @@ -932,6 +936,10 @@ msgstr "&Nuovo" msgid "&New..." msgstr "&Nuovo..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Pagina successiva" @@ -960,6 +968,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Una pagina" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Apri" @@ -968,6 +980,10 @@ msgstr "&Apri" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -1429,6 +1445,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1718,6 +1738,10 @@ msgstr "Aggiungi Remoto" msgid "Add \"&Signed-off-by\"" msgstr "Aggiungi \"&Confermato da\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Aggiungi applicazione di confronto per l'estensione" @@ -1862,6 +1886,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Già aggiornato." @@ -1954,6 +1984,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Menu dei frame dell'applicazione:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Applica Patch..." @@ -2104,10 +2138,6 @@ msgid "Authors case sensitive" msgstr "Non fare differenza tra maiuscole e minuscole nei nomi degli autori" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autori:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3256,7 +3286,7 @@ msgid "Copying..." msgstr "Copia in corso..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3520,10 +3550,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Ringraziamenti:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Taglia" @@ -3914,6 +3940,10 @@ msgstr "" msgid "Directory:" msgstr "Cartelle:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4126,6 +4156,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Non visualizzare più questo messaggio" @@ -4262,6 +4296,10 @@ msgstr "" msgid "Edit..." msgstr "Modifica..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4871,6 +4909,10 @@ msgid "" "Find" msgstr "Trova il testo specificato\nTrova" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5009,10 +5051,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Da" @@ -5078,6 +5116,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Raccolta informazioni. Attendere..." @@ -5473,6 +5515,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5481,6 +5527,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5489,6 +5543,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5497,6 +5555,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5905,6 +5971,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Includi solo il seguente intervallo di revisioni:" @@ -6326,6 +6396,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6546,10 +6620,6 @@ msgstr "Sposta e rinomina" msgid "Move to changelist" msgstr "Sposta nell'elenco modifiche" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Sposta/Rinomina" @@ -7102,6 +7172,10 @@ msgstr "Apri immagine..." msgid "Open parent folder" msgstr "Apri livello superiore" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7176,6 +7250,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8113,10 +8191,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Richiede un nome utente e una password" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8555,6 +8629,10 @@ msgstr "Salvare cambiamenti in %1?" msgid "Save modifications." msgstr "" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Salva revisione &come..." @@ -8636,6 +8714,10 @@ msgstr "Scorrimento a sinistra" msgid "Scroll Right" msgstr "Scorrimento a destra" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Cerca nei &commenti..." @@ -9158,6 +9240,10 @@ msgid "" "Show Whitespaces" msgstr "Visualizza caratteri speciali per spazi e ritorni a capo\nVisualizza spazi" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9216,6 +9302,10 @@ msgstr "Visualizza il log per i file / cartelle selezionate" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Tema argento" @@ -9299,10 +9389,6 @@ msgstr "Specifica quanti messaggi si vogliono visualizzare nella finestra di dia msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Dividi le linee" @@ -9474,10 +9560,6 @@ msgstr "" msgid "Submodule Diff" msgstr "Confronto Submodule" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Informazioni sul Submodule" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Inizializza Submodule" @@ -9501,6 +9583,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Submodule" @@ -9509,13 +9595,6 @@ msgstr "Submodule" msgid "Success" msgstr "Successo" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Scambia" @@ -9627,6 +9706,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Ta&gs:" @@ -10074,6 +10157,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10299,6 +10388,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10726,6 +10826,10 @@ msgstr "Usa il blocco di testo dalla visualizzazione di sinistra\nUsa blocco di msgid "Use th&is text block" msgstr "Usa &questo blocco di testo" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10796,12 +10900,20 @@ msgstr "Nome Utente:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Le opzioni valide della linea di comando sono:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11419,6 +11531,10 @@ msgstr "giorno" msgid "deleted" msgstr "eliminato" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_ja.po b/Languages/Tortoise_ja.po index aa3344a7e..b5fe12d6d 100644 --- a/Languages/Tortoise_ja.po +++ b/Languages/Tortoise_ja.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -661,6 +661,10 @@ msgstr "プロキシサーバーを有効にする(&E)" msgid "&Enable edit" msgstr "編集を有効化(&E)" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "選択をエクスポート(&E)..." @@ -927,6 +931,10 @@ msgstr "新規(&N)" msgid "&New..." msgstr "新規(&N)..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "次のページ(&N)" @@ -955,6 +963,10 @@ msgstr "&OK" msgid "&One Page" msgstr "1ページ(&O)" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "開く(&O)" @@ -963,6 +975,10 @@ msgstr "開く(&O)" msgid "&Open Git for Windows WebSite" msgstr "Git for Windows のウェブサイトを開く(&O)" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "開く(&O)...\tCtrl+O" @@ -1424,6 +1440,10 @@ msgstr "リポジトリルートの無視リストファイル(.gitignore)" msgid ".tgitconfig in the repository root" msgstr "リポジトリルートの .tgitconfig ファイル" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1713,6 +1733,10 @@ msgstr "リモートを追加" msgid "Add \"&Signed-off-by\"" msgstr "「Signed-off-by」を追加(&S)" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "拡張子に応じた差分プログラムを追加" @@ -1857,6 +1881,12 @@ msgstr "このビューで編集を許可\n編集を有効化" msgid "Allow to use custom Gravatar URL" msgstr "GravatarのURLをカスタマイズ" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "最新状態です。" @@ -1949,6 +1979,10 @@ msgstr "このブロックを左側の後ろへ追加" msgid "Application Frame Menus: " msgstr "アプリケーションメニュー: " +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "パッチを適用..." @@ -2099,10 +2133,6 @@ msgid "Authors case sensitive" msgstr "作者名の大文字/小文字を区別する" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "作者:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3251,8 +3281,8 @@ msgid "Copying..." msgstr "コピー中..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "" #. Resource IDs: (1254) msgid "Corrections" @@ -3515,10 +3545,6 @@ msgstr "資格情報ヘルパー:" msgid "Credentials" msgstr "資格情報" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "謝辞:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "切り取り(&T)" @@ -3909,6 +3935,10 @@ msgstr "フォルダー..." msgid "Directory:" msgstr "ディレクトリ:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4121,6 +4151,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "保存しない\n変更点を保存しないでビューを再読込" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "このメッセージを再び表示しない" @@ -4257,6 +4291,10 @@ msgstr "全ユーザ共通設定を編集(&Y)" msgid "Edit..." msgstr "編集..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "有効値" @@ -4866,6 +4904,10 @@ msgid "" "Find" msgstr "指定された文字列を検索する\n検索" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5004,10 +5046,6 @@ msgstr "空のコミットメッセージが見つかったため、リベース msgid "Found auto words:" msgstr "見つかった単語:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "From" @@ -5073,6 +5111,10 @@ msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+はビットマップオブジェクトを作成できませんでした。おそらく十分なメモリがありません。" +#. Resource IDs: (82) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "情報収集中です。しばらくお待ちください..." @@ -5468,6 +5510,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5476,6 +5522,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5484,6 +5538,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5492,6 +5550,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5900,6 +5966,10 @@ msgstr "タグを含める(&T)" msgid "Include &ignored files" msgstr "無視ファイルを含める(&I)" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "次のリビジョン範囲のみを含める:" @@ -6321,6 +6391,10 @@ msgid "" "The file status is changed to modified" msgstr "解決済みとする\nファイルのステータスは、修正済みに変更" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "このブロックをマークする" @@ -6541,10 +6615,6 @@ msgstr "移動して名前を変更" msgid "Move to changelist" msgstr "変更リストへ移動" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "拡張コンテキストメニュー (shiftキーで表示されます) へ移動" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "移動/名前変更" @@ -7097,6 +7167,10 @@ msgstr "画像ファイルを開く ..." msgid "Open parent folder" msgstr "親フォルダーを開く" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "ドキュメントを開く" @@ -7171,6 +7245,10 @@ msgstr "存在する場合はブランチを上書き" msgid "Overwrite" msgstr "上書き" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8108,10 +8186,6 @@ msgstr "プルリクエスト" msgid "Requests a username and a password" msgstr "ユーザー名とパスワードが必要です" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "GPGとパスフレーズなしのキーが必要です" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "解決する(&O)..." @@ -8550,6 +8624,10 @@ msgstr "変更を %1 へ保存しますか？" msgid "Save modifications." msgstr "変更を保存する。" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "リビジョンを保存(&T)..." @@ -8631,6 +8709,10 @@ msgstr "左へスクロール" msgid "Scroll Right" msgstr "右へスクロール" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "ログメッセージを検索(&L)..." @@ -9153,6 +9235,10 @@ msgid "" "Show Whitespaces" msgstr "ホワイトスペースと改行を表す特殊文字を表示\n空白類を表示" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "refラベルで、ref名の一部を記号で表示する" @@ -9211,6 +9297,10 @@ msgstr "選択したファイル/フォルダーのログを表示" msgid "Si&gn" msgstr "署名(&G)" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "シルバースタイル" @@ -9294,10 +9384,6 @@ msgstr "最近のログメッセージを表示するダイアログで、表示 msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "分割してコミット" - #. Resource IDs: (1253) msgid "Split lines" msgstr "行を分割" @@ -9469,10 +9555,6 @@ msgstr "サブモジュールの追加..." msgid "Submodule Diff" msgstr "サブモジュールの差分" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "サブモジュールの情報" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "サブモジュールの初期化" @@ -9496,6 +9578,10 @@ msgid "" "Revision %2!s!" msgstr "サブモジュール \"%1!s!\"\nリビジョン %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "サブモジュール" @@ -9504,13 +9590,6 @@ msgstr "サブモジュール" msgid "Success" msgstr "成功" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "切り替え" @@ -9622,6 +9701,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "タグ(&G):" @@ -10069,6 +10152,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "パスの指定が無効です。\nWindows のパスには、「<>|\"?*:」のいずれかの文字や、次のデバイス名を含めることはできません。\ncom1～com9、lpt1～lpt9、prn、aux、con、nul、clock$" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10294,6 +10383,17 @@ msgstr "TortoiseGitMergeは、このパッチファイルを適用できませ msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "変更行数合計（追加/削除したファイルを含む）:" @@ -10721,6 +10821,10 @@ msgstr "左ビューのテキストブロックを使用する\n左側のブロ msgid "Use th&is text block" msgstr "このテキストブロックを使用(&I)" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10791,12 +10895,20 @@ msgstr "ユーザー名:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "有効なコマンドラインオプションは:\n/base:\n/theirs:<あちら側ファイルへのパス>\n/mine:<こちら側ファイルへのパス>\n/merged:<マージ結果の出力ファイルへのパス>\n/diff:\n/patchpath:<フォルダーへのパス>" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11414,6 +11526,10 @@ msgstr "日" msgid "deleted" msgstr "削除" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_ko_KR.po b/Languages/Tortoise_ko_KR.po index 1a0413e97..754adb704 100644 --- a/Languages/Tortoise_ko_KR.po +++ b/Languages/Tortoise_ko_KR.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -15,6 +15,7 @@ # Kim KiHyeon , 2011 # kmshts, 2012 # kmshts, 2012 +# kmshts, 2012 # Ian Yoon , 2012 # Ian Yoon , 2012 # Lübbe TortoiseSVN , 2011 @@ -34,7 +35,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -676,6 +677,10 @@ msgstr "프록시 서버 활성화(&E)" msgid "&Enable edit" msgstr "&Enable edit" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "선택한 것을 내보내기(&E)..." @@ -942,6 +947,10 @@ msgstr "새로 만들기(&N)" msgid "&New..." msgstr "새로 만들기(&N)..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "다음 페이지(&N)" @@ -970,6 +979,10 @@ msgstr "확인(&O)" msgid "&One Page" msgstr "한 페이지(&O)" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "열기(&O)" @@ -978,6 +991,10 @@ msgstr "열기(&O)" msgid "&Open Git for Windows WebSite" msgstr "Git for Windows 웹 사이트 열기(&O)" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "열기...\tCtrl+O" @@ -1439,6 +1456,10 @@ msgstr "저장소 최상위 .gitignore 파일" msgid ".tgitconfig in the repository root" msgstr "저장소 루트에 있는 .tgitconfig" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1728,6 +1749,10 @@ msgstr "원격 저장소 추가" msgid "Add \"&Signed-off-by\"" msgstr "Add \"&Signed-off-by\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "확장자에 따른 비교 프로그램 등록" @@ -1872,6 +1897,12 @@ msgstr "Allow Editing for this view\nAllow Edit" msgid "Allow to use custom Gravatar URL" msgstr "커스텀 그라바타 URL을 허용합니다" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "이미 최신입니다." @@ -1964,6 +1995,10 @@ msgstr "Append this block to left" msgid "Application Frame Menus: " msgstr "어플리케이션 프레임 메뉴:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "패치 적용하기..." @@ -2114,10 +2149,6 @@ msgid "Authors case sensitive" msgstr "작성자 대소문자 구별함" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "작성자:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3266,8 +3297,8 @@ msgid "Copying..." msgstr "복사 중..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "저작권 (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "" #. Resource IDs: (1254) msgid "Corrections" @@ -3530,10 +3561,6 @@ msgstr "자격 증명 도우미:" msgid "Credentials" msgstr "자격 증명" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "만든 이들:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "잘라내기(&T)" @@ -3924,6 +3951,10 @@ msgstr "폴더..." msgid "Directory:" msgstr "경로:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4136,6 +4167,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Don't save\nReload the views without saving the modifications" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "이 메시지를 다시 표시하지 않음" @@ -4272,6 +4307,10 @@ msgstr "시스템 .gitconfig 편집하기(&Y)" msgid "Edit..." msgstr "편집..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "결과" @@ -4881,6 +4920,10 @@ msgid "" "Find" msgstr "특정 문자열 찾기\n찾기" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5019,10 +5062,6 @@ msgstr "Found an empty commit message. You have to enter one or rebase cannot pr msgid "Found auto words:" msgstr "자동 단어 찾기:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "From" @@ -5088,6 +5127,10 @@ msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+가 비트맵 개체를 만들 수 없습니다. 메모리가 부족합니다." +#. Resource IDs: (82) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "정보 수집 중, 기다리세요..." @@ -5483,6 +5526,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5491,6 +5538,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5499,6 +5554,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5507,6 +5566,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5915,6 +5982,10 @@ msgstr "태그도 포함(&T)" msgid "Include &ignored files" msgstr "무시파일도 보기(&I)" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "다음 리비전 구간만 포함:" @@ -6336,6 +6407,10 @@ msgid "" "The file status is changed to modified" msgstr "Mark as resolved\nThe file status is changed to modified" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "이 블록 표시" @@ -6556,10 +6631,6 @@ msgstr "이동하고 이름 변경" msgid "Move to changelist" msgstr "변경 리스트로 이동" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "확장 컨텍스트 메뉴 항목 (이걸 보려면 시프트키를 누른 상태로 메뉴를 열어야 합니다)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "이동/이름 바꾸기" @@ -7112,6 +7183,10 @@ msgstr "이미지 파일 열기..." msgid "Open parent folder" msgstr "상위 폴더 열기" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "이 문서 열기" @@ -7186,6 +7261,10 @@ msgstr "브랜치가 이미 있으면 덮어쓰기" msgid "Overwrite" msgstr "덮어쓰기" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8123,10 +8202,6 @@ msgstr "Request pull" msgid "Requests a username and a password" msgstr "사용자 이름과 암호를 요구합니다" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Requires GPG and a key without passphrase." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "충돌 해결하기(&O)..." @@ -8565,6 +8640,10 @@ msgstr "변경된 것을 %1에 저장하시겠습니까?" msgid "Save modifications." msgstr "Save modifications." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "이 리비전을 저장(&T)..." @@ -8646,6 +8725,10 @@ msgstr "왼쪽으로 스크롤하기" msgid "Scroll Right" msgstr "오른쪽으로 스크롤하기" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "로그 메시지 검색(&l)..." @@ -9168,6 +9251,10 @@ msgid "" "Show Whitespaces" msgstr "공백이나 줄바꿈 특수기호를 표시\n공백 보이기" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "라벨에서 참조 이름 일부를 기호로 바꿔 보여줍니다" @@ -9226,6 +9313,10 @@ msgstr "Shows the log for the selected file/folder" msgid "Si&gn" msgstr "Si&gn" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Silver Style" @@ -9309,10 +9400,6 @@ msgstr "사용된 로그는 저장되며, 몇 개까지 저장할 것인지를 msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "행을 분리함" @@ -9484,10 +9571,6 @@ msgstr "서브모듈 추가..." msgid "Submodule Diff" msgstr "서브모듈 비교" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "서브모듈 정보" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "서브모듈 초기화" @@ -9511,6 +9594,10 @@ msgid "" "Revision %2!s!" msgstr "서브모듈 \"%1!s!\"\r\n리비전 %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "서브모듈" @@ -9519,13 +9606,6 @@ msgstr "서브모듈" msgid "Success" msgstr "완료" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "스위치" @@ -9637,6 +9717,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Ta&gs:" @@ -10084,6 +10168,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10309,6 +10399,17 @@ msgstr "TortoiseGitMerge cannot process this patch file. The filename \"%s\" app msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "추가되거나 삭제된 파일을 포함한 변경된 줄 수:" @@ -10736,6 +10837,10 @@ msgstr "왼쪽 창의 텍스트 블럭을 사용합니다.\n왼쪽 블럭 사용 msgid "Use th&is text block" msgstr "이 텍스트 블록 사용(&i)" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10806,12 +10911,20 @@ msgstr "사용자명:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "가능한 명령행 옵션은 다음과 같습니다:\n/base:<고치기 전 파일 경로>\n/theirs:<저장소의 파일 경로>\n/mine:<작업사본의 파일 경로>\n/merged:<병합 결과를 저장할 파일 경로>\n/diff:\n/patchpath:<작업할 폴더 경로>" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11429,6 +11542,10 @@ msgstr "일" msgid "deleted" msgstr "삭제됨" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "더미" diff --git a/Languages/Tortoise_nl_NL.po b/Languages/Tortoise_nl_NL.po index fa4ca9775..7a562c65a 100644 --- a/Languages/Tortoise_nl_NL.po +++ b/Languages/Tortoise_nl_NL.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -18,6 +18,7 @@ # Paul , 2011 # Richard van Laak , 2012 # Richard van Laak , 2012 +# Richard van Laak , 2012 # Sven Strickroth , 2013 # W VB , 2011 msgid "" @@ -25,7 +26,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -667,6 +668,10 @@ msgstr "Activ&eer Proxy Server" msgid "&Enable edit" msgstr "B&ewerken inschakelen" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "E&xporteer selectie naar..." @@ -933,6 +938,10 @@ msgstr "&Nieuw" msgid "&New..." msgstr "&Nieuw..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Volgende pagina" @@ -961,6 +970,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Een pagina" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Openen" @@ -969,6 +982,10 @@ msgstr "&Openen" msgid "&Open Git for Windows WebSite" msgstr "Git voor Windows Website &Openen" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Openen...⇥Ctrl+O" @@ -1430,6 +1447,10 @@ msgstr ".gitignore in de archiefroot" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig in de archiefroot" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1719,6 +1740,10 @@ msgstr "Extern Archief Toevoegen" msgid "Add \"&Signed-off-by\"" msgstr "\"&Signed-off-by\" toevoegen" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Voeg een extensie-specifiek diff-programma toe" @@ -1863,6 +1888,12 @@ msgstr "Sta Bewerken toe voor dit overzicht\nBewerken Toestaan" msgid "Allow to use custom Gravatar URL" msgstr "Aangepaste Gravatar URL toestaan" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Reeds up-to-date." @@ -1955,6 +1986,10 @@ msgstr "Dit blok links ervoor toevoegen" msgid "Application Frame Menus: " msgstr "Menu's van applicatievenster:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Patchserie Toepassen..." @@ -2105,10 +2140,6 @@ msgid "Authors case sensitive" msgstr "Exacte auteursnamen" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Auteurs:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3257,8 +3288,8 @@ msgid "Copying..." msgstr "Kopiëren..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "" #. Resource IDs: (1254) msgid "Corrections" @@ -3521,10 +3552,6 @@ msgstr "Authenticatiemodule:" msgid "Credentials" msgstr "Authenticatiegegevens" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Credits:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Kn&ippen" @@ -3915,6 +3942,10 @@ msgstr "Map..." msgid "Directory:" msgstr "Map:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4127,6 +4158,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Niet opslaan\nHerlaadt de overzichten zonder de wijzigingen op te slaan" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Deze boodschap niet meer tonen" @@ -4263,6 +4298,10 @@ msgstr "Bewerk s&ysteem gitconfig" msgid "Edit..." msgstr "Wijzigen..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "Effectief" @@ -4872,6 +4911,10 @@ msgid "" "Find" msgstr "Zoek de opgegeven tekst\nZoeken" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5010,10 +5053,6 @@ msgstr "Leeg commitbericht gevonden. U moet er een opgeven voordat het rebasen v msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Van" @@ -5079,6 +5118,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Informatie ophalen. Een ogenblik geduld..." @@ -5474,6 +5517,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5482,6 +5529,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5490,6 +5545,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5498,6 +5557,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5906,6 +5973,10 @@ msgstr "Inclusief &Labels" msgid "Include &ignored files" msgstr "&Inclusief genegeerde bestanden" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Alleen het volgende revisiebereik gebruiken:" @@ -6327,6 +6398,10 @@ msgid "" "The file status is changed to modified" msgstr "Markeer als opgelost\nDe bestandsstatus is gewijzigd naar aangepast" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6547,10 +6622,6 @@ msgstr "Verplaats en hernoem" msgid "Move to changelist" msgstr "Verplaats naar werkset" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Verplaatst naar uitgebreid contextmenu (druk shift-toets in om te tonen)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Verplaats/hernoemen" @@ -7103,6 +7174,10 @@ msgstr "Open afbeelding..." msgid "Open parent folder" msgstr "Open bovenliggende map" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Open dit document" @@ -7177,6 +7252,10 @@ msgstr "Overschrijf bestaande branch" msgid "Overwrite" msgstr "Overschrijven" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8114,10 +8193,6 @@ msgstr "Pull aanvragen" msgid "Requests a username and a password" msgstr "Vraagt om een gebruikersnaam en wachtwoord" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Vereist GPG en een sleutel zonder wachtwoord" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8556,6 +8631,10 @@ msgstr "Wijzigingen in %1 opslaan?" msgid "Save modifications." msgstr "Wijzigingen opslaan." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Bewaar revisie &in..." @@ -8637,6 +8716,10 @@ msgstr "Scroll naar links" msgid "Scroll Right" msgstr "Scroll naar rechts" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Doorzoek &logboekberichten..." @@ -9159,6 +9242,10 @@ msgid "" "Show Whitespaces" msgstr "Toon tekens voor witregels, tabs en spaties\nToon witregels, tabs en spaties" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9217,6 +9304,10 @@ msgstr "Toont het logboek voor geselecteerd bestand/map" msgid "Si&gn" msgstr "Si&gneer" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Zilveren stijl" @@ -9300,10 +9391,6 @@ msgstr "Geeft aan hoeveel boodschappen bewaard worden in de geschiedenis van log msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Splits regels" @@ -9475,10 +9562,6 @@ msgstr "Submodule Toevoegen..." msgid "Submodule Diff" msgstr "Submodule Vergelijken" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Submodule Info" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Submodule Initialiseren" @@ -9502,6 +9585,10 @@ msgid "" "Revision %2!s!" msgstr "Submodule \"%1!s!\"\nRevisie %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Submodules" @@ -9510,13 +9597,6 @@ msgstr "Submodules" msgid "Success" msgstr "Geslaagd" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Wissel" @@ -9628,6 +9708,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "&Labels:" @@ -10075,6 +10159,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10300,6 +10390,17 @@ msgstr "TortoiseGitMerge kan dit patchbestand niet verwerken. De bestandsnaam \" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Totaal gewijzigde regels inclusief toegevoegde/verwijderde bestanden:" @@ -10727,6 +10828,10 @@ msgstr "Gebruik tekstgedeelte uit linker venster\nGebruik linker stuk" msgid "Use th&is text block" msgstr "Gebruik d&it tekstgedeelte" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10797,12 +10902,20 @@ msgstr "Gebruikersnaam:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Geldige parameters zijn:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11420,6 +11533,10 @@ msgstr "dag" msgid "deleted" msgstr "verwijderd" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_pl_PL.po b/Languages/Tortoise_pl_PL.po index 188a5dc59..c60bf1fb1 100644 --- a/Languages/Tortoise_pl_PL.po +++ b/Languages/Tortoise_pl_PL.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -24,8 +24,8 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-02-06 15:53+0000\n" -"Last-Translator: Sebastian Kaczorowski \n" +"PO-Revision-Date: 2015-04-02 18:53+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -666,6 +666,10 @@ msgstr "&Użyj serwera proxy" msgid "&Enable edit" msgstr "&Włącz edytowanie" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Eksportuj wybrane elementy do..." @@ -932,6 +936,10 @@ msgstr "&Nowy " msgid "&New..." msgstr "&Nowy..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Następna strona" @@ -960,6 +968,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Jedna strona" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Otwórz" @@ -968,6 +980,10 @@ msgstr "&Otwórz" msgid "&Open Git for Windows WebSite" msgstr "&Otwórz stronę Git dla Windows" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Otwórz...\tCtrl+O" @@ -1429,6 +1445,10 @@ msgstr ".gitignore w katalogu głównym repozytorium" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1718,6 +1738,10 @@ msgstr "Dodaj zdalny" msgid "Add \"&Signed-off-by\"" msgstr "Dodaj \"&Signed-off-by\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Dodaj program do porównywania plików, zależny od rozszerzenia pliku" @@ -1862,6 +1886,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1954,6 +1984,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Menu ramek aplikacji: " +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2104,10 +2138,6 @@ msgid "Authors case sensitive" msgstr "Autorzy bez uwzględnienia wielkości liter" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autorzy:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3256,7 +3286,7 @@ msgid "Copying..." msgstr "Kopiowanie..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3520,10 +3550,6 @@ msgstr "Pomocnik poświadczeń:" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Podziękowania:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Wytni&j" @@ -3914,6 +3940,10 @@ msgstr "Katalog..." msgid "Directory:" msgstr "Katalog:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4126,6 +4156,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Nie zapisuj\nPrzeładuj widoku bez zapisu zmian" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Nie pokazuj więcej tego komunikatu" @@ -4262,6 +4296,10 @@ msgstr "Edytuj o&gólnosystemowy gitconfig" msgid "Edit..." msgstr "Edytuj..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4871,6 +4909,10 @@ msgid "" "Find" msgstr "Szuka podanego tekstu\nZnajdź" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5009,10 +5051,6 @@ msgstr "Znaleziono pusty komunikat zatwierdzania. Wprowadź komunikat, albo zmia msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Od" @@ -5078,6 +5116,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Pobieranie informacji. Proszę czekać..." @@ -5473,6 +5515,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +N" @@ -5481,6 +5527,14 @@ msgstr "ID:32772:V +N" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5489,6 +5543,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +D" @@ -5497,6 +5555,14 @@ msgstr "ID:32778:V +D" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5905,6 +5971,10 @@ msgstr "Zawiera &tagi" msgid "Include &ignored files" msgstr "Dołącz &ignorowane pliki" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Uwzględnij tylko następujący zakres wersji:" @@ -6326,6 +6396,10 @@ msgid "" "The file status is changed to modified" msgstr "Zaznacz jako rozwiązane.\nPlik zostanie oznaczony jako zmieniony." +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6546,10 +6620,6 @@ msgstr "Przenieś i zmień nazwę" msgid "Move to changelist" msgstr "Przenieś do listy zmian" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Przenieś do rozszerzonego menu kontekstowego (naciśnij klawisz Shift, aby pokazać)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Przenieś/Zmień nazwę" @@ -7102,6 +7172,10 @@ msgstr "Otwórz plik obrazu..." msgid "Open parent folder" msgstr "Otwórz folder nadrzędny" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Otwórz dokument" @@ -7176,6 +7250,10 @@ msgstr "Nadpisz, jeśli gałąź istnieje" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8113,10 +8191,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Prośba o nazwę użytkownika i hasło" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Wymaga GPG i klucza bez hasła." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "R&ozwiąż..." @@ -8555,6 +8629,10 @@ msgstr "Zapisz zmiany do %1?" msgid "Save modifications." msgstr "Zapisz zmiany." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Zapisz wersję &w..." @@ -8636,6 +8714,10 @@ msgstr "Przewiń w lewo" msgid "Scroll Right" msgstr "Przewiń w prawo" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Szukaj w &opisach zmian..." @@ -9158,6 +9240,10 @@ msgid "" "Show Whitespaces" msgstr "Wyświetla znaki specjalne aby pokazać białe znaki i znaki końca linii\nPokaż białe znaki" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9216,6 +9302,10 @@ msgstr "Pokazuje log dla wybranego pliku/folderu" msgid "Si&gn" msgstr "Ozn&acz" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Styl srebrny" @@ -9299,10 +9389,6 @@ msgstr "Określa, jak wiele elementów chcesz pokazywać w oknie z ostatnimi opi msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Podziel linie" @@ -9474,10 +9560,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9501,6 +9583,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Podmoduły" @@ -9509,13 +9595,6 @@ msgstr "Podmoduły" msgid "Success" msgstr "Powodzenie" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Przełącz" @@ -9627,6 +9706,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Ta&gi:" @@ -10074,6 +10157,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10299,6 +10388,17 @@ msgstr "TortoiseGitMerge nie może przetworzyć pliku poprawki. Nazwa pliku \"%s msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10726,6 +10826,10 @@ msgstr "Użyj bloku tekstu z lewego pliku\nUżyj lewy blok tekstu" msgid "Use th&is text block" msgstr "Użyj tego &bloku tekstu" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10796,12 +10900,20 @@ msgstr "Użytkownik:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Poprawne parametry w wierszu poleceń to:\n/base:<ścieżka do pliku bazowego>\n/theirs:<ścieżka do pliku \"ich\" (z repozytorium)>\n/mine:<ścieżka do pliku \"mojego\" (z Twoimi zmianami)>\n/merged:<ścieżka do wynikowego pliku po scaleniu>\n/diff:<ścieżka do pliku różnicowego Unified diff>\n/patchpath:<ścieżka do katalogu z poprawkami>" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11419,6 +11531,10 @@ msgstr "dzień" msgid "deleted" msgstr "usunięte" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "pusty" diff --git a/Languages/Tortoise_pt_BR.po b/Languages/Tortoise_pt_BR.po index d31246568..28209b334 100644 --- a/Languages/Tortoise_pt_BR.po +++ b/Languages/Tortoise_pt_BR.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -658,6 +658,10 @@ msgstr "&Habilitar Servidor Proxy" msgid "&Enable edit" msgstr "&Habilitar edição" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportar seleção para..." @@ -924,6 +928,10 @@ msgstr "&Novo " msgid "&New..." msgstr "&Novo..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Próximo >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Próximo Página" @@ -952,6 +960,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Uma página" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Abrir" @@ -960,6 +972,10 @@ msgstr "&Abrir" msgid "&Open Git for Windows WebSite" msgstr "&Abrir WebSite do Git para Windows" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Abrir...\tCtrl+O" @@ -1421,6 +1437,10 @@ msgstr ".gitignore na raiz do repositório" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig na raiz do repositório" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1710,6 +1730,10 @@ msgstr "Adicionar Remoto" msgid "Add \"&Signed-off-by\"" msgstr "Adicionar \"&Signed-off-by\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Adicionar programa de comparação para extensão específica" @@ -1854,6 +1878,12 @@ msgstr "Permitir Edição nesta visualização\nPermitir Edição" msgid "Allow to use custom Gravatar URL" msgstr "Permitir utilizar URL do Gravatar personalizada" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Já está atualizado." @@ -1946,6 +1976,10 @@ msgstr "Anexar este bloco à esquerda" msgid "Application Frame Menus: " msgstr "Menus de Molduras da Aplicação:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Aplicar Série de Correções..." @@ -2096,10 +2130,6 @@ msgid "Authors case sensitive" msgstr "Autores sensível a caixa" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autores:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3248,8 +3278,8 @@ msgid "Copying..." msgstr "Copiando..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "" #. Resource IDs: (1254) msgid "Corrections" @@ -3512,10 +3542,6 @@ msgstr "Assistente de credenciais:" msgid "Credentials" msgstr "Credenciais" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Créditos:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Recortar" @@ -3906,6 +3932,10 @@ msgstr "Dir..." msgid "Directory:" msgstr "Diretório:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4118,6 +4148,10 @@ msgid "" "Reload the views without saving the modifications" 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 "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Não exibir essa mensagem novamente" @@ -4254,6 +4288,10 @@ msgstr "Editar gitconfig do &sistema" msgid "Edit..." msgstr "Editar..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "Efetivo" @@ -4863,6 +4901,10 @@ msgid "" "Find" msgstr "Localizar o texto especificado\nLocalizar" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5001,10 +5043,6 @@ msgstr "Encontrada uma mensagem de submissão em branco. Você tem que informar msgid "Found auto words:" msgstr "Palavras encontradas:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "De" @@ -5070,6 +5108,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Obtendo informações. Por favor, aguarde..." @@ -5465,6 +5507,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5473,6 +5519,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5481,6 +5535,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5489,6 +5547,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5897,6 +5963,10 @@ msgstr "Incluir &Etiquetas" msgid "Include &ignored files" msgstr "Incluir arquivos &ignorados" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Incluir apenas esta faixa de revisões:" @@ -6318,6 +6388,10 @@ msgid "" "The file status is changed to modified" msgstr "Marcar como resolvido\nO estado do arquivo foi alterado para modificado" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Marcar este block" @@ -6538,10 +6612,6 @@ msgstr "Mover e renomear" msgid "Move to changelist" msgstr "Mover para a lista de alterações" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Mover para o menu de contexto estendido (pressione shift para mostrá-lo)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Mover/Renomear" @@ -7094,6 +7164,10 @@ msgstr "Abrir arquivo de imagem..." msgid "Open parent folder" msgstr "Abrir pasta acima" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Abrir este documento" @@ -7168,6 +7242,10 @@ msgstr "Sobrescrever ramo se já existir" msgid "Overwrite" msgstr "Sobrescrever" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8105,10 +8183,6 @@ msgstr "Pedir para puxar" msgid "Requests a username and a password" msgstr "Solicita um nome de usuário e uma senha" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Requer GPG e uma chave sem senha." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Res&olver..." @@ -8547,6 +8621,10 @@ msgstr "Salvar alterações para %1?" msgid "Save modifications." msgstr "Salvar modificações." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Salvar revisão ¶..." @@ -8628,6 +8706,10 @@ msgstr "Rolar para Esquerda" msgid "Scroll Right" msgstr "Rolar para Direita" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Pesquisar mensagens do &histórico..." @@ -9150,6 +9232,10 @@ msgid "" "Show Whitespaces" msgstr "Exibir caracteres especiais para espaços em branco\nExibir Espaços em Branco" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) 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" @@ -9208,6 +9294,10 @@ msgstr "Exibe o histórico para o arquivo/pasta selecionado" msgid "Si&gn" msgstr "&Assinar" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Estilo Prata" @@ -9291,10 +9381,6 @@ msgstr "Especifica quantos itens você quer manter no diálogo de mensagens de h msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Separar linhas" @@ -9466,10 +9552,6 @@ msgstr "Adicionar Submódulo..." msgid "Submodule Diff" msgstr "Comparar Submódulo" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Inforçações do Submódulo" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Inicializar Submódulo" @@ -9493,6 +9575,10 @@ msgid "" "Revision %2!s!" msgstr "Submódulo \"%1!s!\"\nRevisão %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Submódulos" @@ -9501,13 +9587,6 @@ msgstr "Submódulos" msgid "Success" msgstr "Sucesso" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Mudar" @@ -9619,6 +9698,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "&Etiquetas:" @@ -10066,6 +10149,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10291,6 +10380,17 @@ msgstr "TortoiseGitMerge não pôde processar este arquivo de correções. O arq msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Total de linhas alteradas incluindo arquivos adicionados/excluídos:" @@ -10718,6 +10818,10 @@ msgstr "Usar bloco de texto da esquerdae \"deles\"\nUse \"deles\" do bloco de te msgid "Use th&is text block" msgstr "Usar &esse bloco de texto" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10788,12 +10892,20 @@ msgstr "Usuário:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "As opções de linha de comando válidas são:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11411,6 +11523,10 @@ msgstr "dia" msgid "deleted" msgstr "excluído" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "modelo" diff --git a/Languages/Tortoise_pt_PT.po b/Languages/Tortoise_pt_PT.po index c49dbc778..7ae923cc3 100644 --- a/Languages/Tortoise_pt_PT.po +++ b/Languages/Tortoise_pt_PT.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -660,6 +660,10 @@ msgstr "&Activar Servidor Proxy" msgid "&Enable edit" msgstr "" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportar selecção para..." @@ -926,6 +930,10 @@ msgstr "&Novo " msgid "&New..." msgstr "&Novo..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Próxima Página" @@ -954,6 +962,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Uma Página" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Abrir" @@ -962,6 +974,10 @@ msgstr "&Abrir" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -1423,6 +1439,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1712,6 +1732,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Adicionar programa de comparação para extensão específica" @@ -1856,6 +1880,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1948,6 +1978,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Menus da Moldura da Aplicação:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2098,10 +2132,6 @@ msgid "Authors case sensitive" msgstr "Autores sensível a caixa (maiúsculas/minúscula)" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autores:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3250,7 +3280,7 @@ msgid "Copying..." msgstr "Copiando..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3514,10 +3544,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Créditos:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Recor&tar" @@ -3908,6 +3934,10 @@ msgstr "" msgid "Directory:" msgstr "Pasta:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4120,6 +4150,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Não mostrar esta mensagem de novo" @@ -4256,6 +4290,10 @@ msgstr "" msgid "Edit..." msgstr "Editar..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4865,6 +4903,10 @@ msgid "" "Find" msgstr "Localiza o texto especificado\nLocalizar" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5003,10 +5045,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "" - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "De" @@ -5072,6 +5110,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Juntando informações. Por favor, espere..." @@ -5467,6 +5509,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5475,6 +5521,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5483,6 +5537,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5491,6 +5549,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5899,6 +5965,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Incluir apenas o seguinte intervalo de revisões:" @@ -6320,6 +6390,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6540,10 +6614,6 @@ msgstr "Mover e alterar o nome" msgid "Move to changelist" msgstr "Mover para a lista de alterações" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Mover/Alterar o nome" @@ -7096,6 +7166,10 @@ msgstr "Abrir arquivo de imagem..." msgid "Open parent folder" msgstr "Abrir pasta pai" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7170,6 +7244,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8107,10 +8185,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Solicita um nome de utilizador e uma palavra-passe" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8549,6 +8623,10 @@ msgstr "Guardar alterações em %1?" msgid "Save modifications." msgstr "" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Guardar revisão &em..." @@ -8630,6 +8708,10 @@ msgstr "Deslocar à Esquerda" msgid "Scroll Right" msgstr "Deslocar à Direita" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Procurar mensagens de ®isto..." @@ -9152,6 +9234,10 @@ msgid "" "Show Whitespaces" msgstr "Mostrar caracteres especiais para espaços em branco ou de novas linhas\nMostrar Espaços em branco" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9210,6 +9296,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Estilo Silver" @@ -9293,10 +9383,6 @@ msgstr "Especifica quantos itens quer manter na caixa de diálogo das mensagens msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Dividir linhas" @@ -9468,10 +9554,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9495,6 +9577,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "" @@ -9503,13 +9589,6 @@ msgstr "" msgid "Success" msgstr "" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Trocar" @@ -9621,6 +9700,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10068,6 +10151,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10293,6 +10382,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10720,6 +10820,10 @@ msgstr "Usa bloco de texto da vista esquerda\nUsar bloco de texto da esquerda" msgid "Use th&is text block" msgstr "Usar &este bloco de texto" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10790,12 +10894,20 @@ msgstr "Nome de utilizador:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "As opções de linha de comando válidas são:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11413,6 +11525,10 @@ msgstr "dia" msgid "deleted" msgstr "removido" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "boneco" diff --git a/Languages/Tortoise_ro.po b/Languages/Tortoise_ro.po index 99f2c0413..c4bce4531 100644 --- a/Languages/Tortoise_ro.po +++ b/Languages/Tortoise_ro.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-01-17 10:30+0000\n" -"Last-Translator: SoboLAN \n" +"PO-Revision-Date: 2015-04-02 18:53+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" "Content-Type: text/plain; charset=UTF-8\n" @@ -662,6 +662,10 @@ msgstr "&Activează serverul proxy" msgid "&Enable edit" msgstr "Activează editarea" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "E&xportă selecţia în..." @@ -928,6 +932,10 @@ msgstr "&Nou " msgid "&New..." msgstr "&Nou..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "Pagina &următoare" @@ -956,6 +964,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&O pagină" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Deschide" @@ -964,6 +976,10 @@ msgstr "&Deschide" msgid "&Open Git for Windows WebSite" msgstr "&Deschide pagina web Git pentru Windows" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "Deschide...»Ctrl+O" @@ -1425,6 +1441,10 @@ msgstr "fişier .gitignore în rădăcina depozitului" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig in radacina depozitului" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1714,6 +1734,10 @@ msgstr "Adaugă destinaţie" msgid "Add \"&Signed-off-by\"" msgstr "Adaugă \"&Semnat-de\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Adaugă program de diferenţiere specific unei extensii" @@ -1858,6 +1882,12 @@ msgstr "Permite editarea pentru această vizualizare\nPermite editarea" msgid "Allow to use custom Gravatar URL" msgstr "Permite folosirea URL Gravatar personalizat" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Deja la zi." @@ -1950,6 +1980,10 @@ msgstr "Adaugă acest bloc la stânga" msgid "Application Frame Menus: " msgstr "Meniuri de rama de aplicaţie:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Aplică serie de petice..." @@ -2100,10 +2134,6 @@ msgid "Authors case sensitive" msgstr "Autori cu majuscule semnificative" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autori:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3252,8 +3282,8 @@ msgid "Copying..." msgstr "Se copiază..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Drepturi de autor (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "" #. Resource IDs: (1254) msgid "Corrections" @@ -3516,10 +3546,6 @@ msgstr "Asistent de credenţiale:" msgid "Credentials" msgstr "Credenţiale" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Autori:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Taie" @@ -3910,6 +3936,10 @@ msgstr "Dir..." msgid "Directory:" msgstr "Dosar:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4122,6 +4152,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Nu salva\nReincarca vederile fara a salva modificarile" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Nu mai afişa mesajul acesta" @@ -4258,6 +4292,10 @@ msgstr "Editează .gitconfig sistem" msgid "Edit..." msgstr "Editează..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4867,6 +4905,10 @@ msgid "" "Find" msgstr "Caută textul specificat\nCaută" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5005,10 +5047,6 @@ msgstr "S-a găsit un mesaj de transmitere nul. Trebuie să introduceţi un mesa msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "De la" @@ -5074,6 +5112,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Se culeg informaţiile. Aşteptaţi..." @@ -5469,6 +5511,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5477,6 +5523,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5485,6 +5539,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5493,6 +5551,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5901,6 +5967,10 @@ msgstr "Include e&tichete" msgid "Include &ignored files" msgstr "Include fişiere &ignorate" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Include numai următorul interval de revizii:" @@ -6322,6 +6392,10 @@ msgid "" "The file status is changed to modified" msgstr "Marchează ca rezolvat\nFişierul a fost marcat ca fiind modificat" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Marcheaza acest bloc" @@ -6542,10 +6616,6 @@ msgstr "Mută şi redenumeşte" msgid "Move to changelist" msgstr "Mută în lista de schimbări" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Mută în meniul contextual extins (apasaţi shift pentru a-l vizualiza)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Mută/Redenumeşte" @@ -7098,6 +7168,10 @@ msgstr "Deschide fişier imagine..." msgid "Open parent folder" msgstr "Deschide dosarul părinte" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Deschide acest document" @@ -7172,6 +7246,10 @@ msgstr "Suprascrie ramura dacă există" msgid "Overwrite" msgstr "Suprascrie" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8109,10 +8187,6 @@ msgstr "Solicită tragere" msgid "Requests a username and a password" msgstr "Cere un nume utilizator şi o parolă" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Necesită GPG şi o cheie fără parolă." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Re&zolvă" @@ -8551,6 +8625,10 @@ msgstr "Salvaţi schimbările din %1?" msgid "Save modifications." msgstr "Salvare modificari." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Salvează revizia î&n..." @@ -8632,6 +8710,10 @@ msgstr "Derulează la stângă" msgid "Scroll Right" msgstr "Derulează la dreaptă" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Caută mesaje de &jurnal..." @@ -9154,6 +9236,10 @@ msgid "" "Show Whitespaces" msgstr "Afişează caracterele speciale pentru spaţii coale şi linii noi⏎ Arată spaţii goale" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) 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ţă" @@ -9212,6 +9298,10 @@ msgstr "Afişează jurnalul pentru fişierul/dosarul selectat" msgid "Si&gn" msgstr "Semnează" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Stil argint" @@ -9295,10 +9385,6 @@ msgstr "Specifică numărul de elemente pe care doriţi să le păstraţi în di msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "Imparte transmiterea" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Separă liniile" @@ -9470,10 +9556,6 @@ msgstr "Adauga submodul..." msgid "Submodule Diff" msgstr "Diferenţiere submodul" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Informaţii submodul" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Iniţializare submodul" @@ -9497,6 +9579,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Submodule" @@ -9505,13 +9591,6 @@ msgstr "Submodule" msgid "Success" msgstr "Succes" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Comută" @@ -9623,6 +9702,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "Etichete:" @@ -10070,6 +10153,12 @@ msgid "" "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$" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10295,6 +10384,17 @@ msgstr "TortoiseGitMerge nu poate procesa acest fişier petic. Numele de fişier msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Total linii schimbate incluzând fişiere adăugate/şterse:" @@ -10722,6 +10822,10 @@ msgstr "Foloseşte blocul de text de pe stângă\nFoloseşte blocul de pe stâng msgid "Use th&is text block" msgstr "Foloseşte &acest bloc de text" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10792,12 +10896,20 @@ msgstr "Nume utilizator:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Opţiunile valide în linia de comandă sunt:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11415,6 +11527,10 @@ msgstr "zi" msgid "deleted" msgstr "şters" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "înlocuitor temporar" diff --git a/Languages/Tortoise_ru.po b/Languages/Tortoise_ru.po index 5b1688c3d..97c38d547 100644 --- a/Languages/Tortoise_ru.po +++ b/Languages/Tortoise_ru.po @@ -1,18 +1,18 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # Alexander Shchekaturov , 2013-2015 -# Andrei Stepanov, 2014 +# Andrei Stepanov, 2014-2015 # Arioch , 2012-2013 # Arkady Shapkin , 2011 -# KOLANICH , 2013-2014 +# 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 @@ -27,8 +27,8 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-01-09 10:37+0000\n" -"Last-Translator: Alexander Shchekaturov \n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -669,6 +669,10 @@ msgstr "Использовать прокси-&сервер" msgid "&Enable edit" msgstr "&Разрешить редактирование" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "&Выход" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Экспортировать выбранное в..." @@ -935,6 +939,10 @@ msgstr "Со&здать" msgid "&New..." msgstr "Со&здать..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Далее >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Следующая страница" @@ -963,6 +971,10 @@ msgstr "O&K" msgid "&One Page" msgstr "&Одна страница" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "Поверх" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Открыть" @@ -971,6 +983,10 @@ msgstr "&Открыть" msgid "&Open Git for Windows WebSite" msgstr "&Перейти на сайт Git для Windows" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "&Открыть..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Открыть...\tCtrl+O" @@ -1432,6 +1448,10 @@ msgstr ".gitignore в корне хранилища" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig в корне хранилища" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< &Предыдущий" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1721,6 +1741,10 @@ msgstr "Добавить Отдалённый" msgid "Add \"&Signed-off-by\"" msgstr "Добавить \"&Подписано\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Добавить программу просмотра различий для определённых расширений" @@ -1865,6 +1889,12 @@ msgstr "Разрешить редактирование этого вида⏎\n msgid "Allow to use custom Gravatar URL" msgstr "Разрешить использовать свой URL Gravatar" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Уже обновлено" @@ -1957,6 +1987,10 @@ msgstr "Добавить сзади этот блок слева" msgid "Application Frame Menus: " msgstr "Базовые меню приложения:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "Применить &заплатку..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Применить серию заплаток..." @@ -2107,10 +2141,6 @@ msgid "Authors case sensitive" msgstr "Авторы c учётом регистра" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Авторы:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3259,8 +3289,8 @@ msgid "Copying..." msgstr "Копирование..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Авторские права (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "© TortoiseGit, 2009-2015" #. Resource IDs: (1254) msgid "Corrections" @@ -3523,10 +3553,6 @@ msgstr "Удостоверяющий центр:" msgid "Credentials" msgstr "Удостоверения" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Участники:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "В&ырезать" @@ -3917,6 +3943,10 @@ msgstr "Папка..." msgid "Directory:" msgstr "Папка:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "Отключить звуки" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4129,6 +4159,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Не сохранять⏎\nПерезагрузить виды без сохранения изменений" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "Не показывать выбранные элементы: (отображаются при удерживании shift)" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Больше не показывать это сообщение" @@ -4265,6 +4299,10 @@ msgstr "Редактировать общесистемный gitconfig" msgid "Edit..." msgstr "Поправить..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "Итог" @@ -4874,6 +4912,10 @@ msgid "" "Find" msgstr "Найти текст\nНайти" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "Найти:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5012,10 +5054,6 @@ msgstr "Найдено пустое сообщение фиксации. Вы д msgid "Found auto words:" msgstr "Автоматически обнаруженные слова:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Франк Ли Frank Li (lznuaa@gmail.com), Свен Стрикрот Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "От" @@ -5081,6 +5119,10 @@ msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ не может создать рисунок. Вероятно очень мало памяти." +#. Resource IDs: (82) +msgid "GPG signs the tag, see manual for details" +msgstr "GPG подписывает метку, подробнее см. руководство пользователя" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Выполняется сбор информации. Пожалуйста, подождите..." @@ -5476,6 +5518,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5484,6 +5530,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5492,6 +5546,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5500,6 +5558,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5908,6 +5974,10 @@ msgstr "Включая &метки" msgid "Include &ignored files" msgstr "Включить игнорируемые файлы" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "Включить ветвь FETCH_HEAD в выпадающее меню выбора ветвей" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Включить только следующий диапазон ревизий:" @@ -6329,6 +6399,10 @@ msgid "" "The file status is changed to modified" msgstr "Отметить как улаженный⏎\nСтатус файла меняется на изменённый" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "Отметить для сравнения" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Пометить этот блок" @@ -6549,10 +6623,6 @@ msgstr "Перемещение с переименованием" msgid "Move to changelist" msgstr "Переместить в группу изменений" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Переместить в расширенное меню (отображается при удерживании shift)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Перемещение/Переименование" @@ -7105,6 +7175,10 @@ msgstr "Открыть файл изображения..." msgid "Open parent folder" msgstr "Открыть родительскую папку" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "Открыть файл с заплаткой" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Открыть этот документ" @@ -7179,6 +7253,10 @@ msgstr "Перезаписать существующую ветвь" msgid "Overwrite" msgstr "Перезаписать" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "Настройка страницы..." + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8116,10 +8194,6 @@ msgstr "Запросить получение" msgid "Requests a username and a password" msgstr "запрашивает имя пользователя и пароль" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Требуется GPG и ключ без парольной фразы." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "У&ладить..." @@ -8558,6 +8632,10 @@ msgstr "Сохранить изменения в %1?" msgid "Save modifications." msgstr "Сохранить изменения." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "Сохранить файл с заплаткой" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Сохранить ревизию &в..." @@ -8639,6 +8717,10 @@ msgstr "Прокрутить влево" msgid "Scroll Right" msgstr "Прокрутить вправо" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "&Настройки..." + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Найти в &сообщениях журнала..." @@ -9161,6 +9243,10 @@ msgid "" "Show Whitespaces" msgstr "Показать специальные символы для непечатаемых знаков и переводов строк\nПоказать непечатаемые знаки" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "Показывать состояние подрепозиториев в родительских папках" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "Показать символы на бирках ссылок для подстановки частей имен ссылок" @@ -9219,6 +9305,10 @@ msgstr "Показывает журнал для выбранного файла msgid "Si&gn" msgstr "Под&писать" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "Значительный вклад внесли: (полный список в Git-репозитории)" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Серебристый стиль" @@ -9302,10 +9392,6 @@ msgstr "Задаёт количество недавно введённых со msgid "Spin1" msgstr "Счётчик1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "Разделить фиксацию" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Разделить на строки" @@ -9477,10 +9563,6 @@ msgstr "Подмодуль Добавить..." msgid "Submodule Diff" msgstr "Подмодуль Различия" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Подмодуль Инфо" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Подмодуль Инициализация" @@ -9504,6 +9586,10 @@ msgid "" "Revision %2!s!" msgstr "Подмодуль \"%1!s!\"↩⏎\nРевизия %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "Подмодуль проекта" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Подмодули" @@ -9512,13 +9598,6 @@ msgstr "Подмодули" msgid "Success" msgstr "Успешно" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Переключение" @@ -9630,6 +9709,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "М&етки:" @@ -10077,6 +10160,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "Этот путь не является корректным!\nКорректный путь не должен содержать '<<>|\"?*:' или одно из следующих имён устройств:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10302,6 +10391,17 @@ msgstr "TortoiseGitMerge не может обработать этот файл msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "TortoiseGitUDiff: унифицированный инструмент для просмотра различий в TortoiseGit\n\nДоступны следующие параметры командной строки:\n/patchfile:\"путь до унифицированного файла различий\"\n/title:\"заголовок для показа при просмотре\"\n/? - данный диалог помощи\n/p - считывать ввод различий из console pipe" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Всего изменённых линий включая добавленные/удалённые файлы:" @@ -10729,6 +10829,10 @@ msgstr "Использовать текстовый блок из левой п msgid "Use th&is text block" msgstr "Использовать э&тот текстовый блок" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "Использовать текущее время путем присвоения даты у автора дате фиксации." + #. Resource IDs: (314) #, c-format msgid "" @@ -10799,12 +10903,20 @@ msgstr "Имя пользователя:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Разрешенные опции в командной строке:\n/base:<путь к базовому файлу>\n/theirs:<путь к их файлу>\n/yours:<путь к вашему файлу>\n/merged:<путь к результирующему файлу>\n/diff:<путь к файлу объединённых различий>\n/patchpath:<путь к папке>" +"/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) msgid "Value" @@ -11422,6 +11534,10 @@ msgstr "день" msgid "deleted" msgstr "удалён" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "сравнить из канала" + #. Resource IDs: (58116) msgid "dummy" msgstr "пустой" diff --git a/Languages/Tortoise_sk.po b/Languages/Tortoise_sk.po index 23c60b724..7f78bf34f 100644 --- a/Languages/Tortoise_sk.po +++ b/Languages/Tortoise_sk.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -653,6 +653,10 @@ msgstr "&Povoliť Proxy Server" msgid "&Enable edit" msgstr "&Povoliť úpravy" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportovať výber do..." @@ -919,6 +923,10 @@ msgstr "&Nový" msgid "&New..." msgstr "&Nový" +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Ďalšia strana" @@ -947,6 +955,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Jeden panel" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Otvoriť" @@ -955,6 +967,10 @@ msgstr "&Otvoriť" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Otvoriť...\tCtrl+O" @@ -1416,6 +1432,10 @@ msgstr ".gitignore v koreňovom adresári repozitára" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig v koreňovom adresári repozitára" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1705,6 +1725,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Pridať porovnávací program pre príponu" @@ -1849,6 +1873,12 @@ msgstr "Povoliť úpravy pre toto okno\nPovoliť úpravy" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1941,6 +1971,10 @@ msgstr "Pripojiť blok do prava" msgid "Application Frame Menus: " msgstr "Rámcová ponuka aplikácie" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2091,10 +2125,6 @@ msgid "Authors case sensitive" msgstr "Rozlišovať veľkosť písmen v menách autorov" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autori:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3243,7 +3273,7 @@ msgid "Copying..." msgstr "Kopírovanie..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3507,10 +3537,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Zásluhy:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Vyreza&ť" @@ -3901,6 +3927,10 @@ msgstr "" msgid "Directory:" msgstr "Adresár:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4113,6 +4143,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Neukladať\nObnoví zobrazenia bez uloženia zmien" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Túto správu už viac nezobrazovať" @@ -4249,6 +4283,10 @@ msgstr "" msgid "Edit..." msgstr "Upraviť..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4858,6 +4896,10 @@ msgid "" "Find" msgstr "Nájsť zadaný text\nNájsť" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -4996,10 +5038,6 @@ msgstr "" msgid "Found auto words:" msgstr "Najdene automaticke slova:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Od:" @@ -5065,6 +5103,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Získavanie informácií. Čakajte prosím ..." @@ -5460,6 +5502,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5468,6 +5514,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5476,6 +5530,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5484,6 +5542,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5892,6 +5958,10 @@ msgstr "Vrátane &značiek" msgid "Include &ignored files" msgstr "Vrátane &ignorovaných súborov" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Iba nasledovný rozsah revízií:" @@ -6313,6 +6383,10 @@ msgid "" "The file status is changed to modified" msgstr "Označiť za vyriešný\nZmení stav súboru na vyriešený" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6533,10 +6607,6 @@ msgstr "Presunúť a premenovať" msgid "Move to changelist" msgstr "Presunúť do zoznamu zmien" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Presunúť/premenovať" @@ -7089,6 +7159,10 @@ msgstr "Otvor obrázok..." msgid "Open parent folder" msgstr "Otvoriť hlavný adresár" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Otvoriť tento dokument" @@ -7163,6 +7237,10 @@ msgstr "Prepísať existujúcu vetvu" msgid "Overwrite" msgstr "Prepísať" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8100,10 +8178,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Vyžiada užívateľské meno a heslo" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "&Vyriešiť..." @@ -8542,6 +8616,10 @@ msgstr "Uložiť zmeny do %1?" msgid "Save modifications." msgstr "Uložiť zmeny." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Uložiť revíziu &do..." @@ -8623,6 +8701,10 @@ msgstr "Doľava" msgid "Scroll Right" msgstr "Doprava" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Vyhľadaj &správy denníka..." @@ -9145,6 +9227,10 @@ msgid "" "Show Whitespaces" msgstr "Zobraziť špeciálne znaky pre biele znaky a nové riadky.\nZobraziť biele znaky" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9203,6 +9289,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Strieborný štýl" @@ -9286,10 +9376,6 @@ msgstr "Určuje koľko záznamov sa ma pamätať v histórií správ denníka." msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Rozdeliť riadky" @@ -9461,10 +9547,6 @@ msgstr "Pridať podmodul..." msgid "Submodule Diff" msgstr "Rozdiel podmodulu" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Informácie o podmodule" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Inicializácia podmodulu" @@ -9488,6 +9570,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Podmoduly" @@ -9496,13 +9582,6 @@ msgstr "Podmoduly" msgid "Success" msgstr "Úspešné" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Prepnúť" @@ -9614,6 +9693,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10061,6 +10144,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10286,6 +10375,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "Celkový počet zmenených riadky vrátane pridaných/zmazaných súborov:" @@ -10713,6 +10813,10 @@ msgstr "Použiť blok z ľavého zobrazenia\nPoužije ľavý blok" msgid "Use th&is text block" msgstr "Použiť &tento blok" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10783,12 +10887,20 @@ msgstr "Meno užívateľa:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Platné voľby príkazového riadku sú:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11406,6 +11518,10 @@ msgstr "dní" msgid "deleted" msgstr "vymazané" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" diff --git a/Languages/Tortoise_sr@latin.po b/Languages/Tortoise_sr@latin.po index 08210c5d3..78653294b 100644 --- a/Languages/Tortoise_sr@latin.po +++ b/Languages/Tortoise_sr@latin.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -658,6 +658,10 @@ msgstr "&Omogući Proxy Server" msgid "&Enable edit" msgstr "Omogići ur&eđenje" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "%Izvezi odabir u..." @@ -924,6 +928,10 @@ msgstr "&Novo" msgid "&New..." msgstr "&Novo..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Sledeća Stranica" @@ -952,6 +960,10 @@ msgstr "&U redu" msgid "&One Page" msgstr "&Jedna Strana" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Otvori" @@ -960,6 +972,10 @@ msgstr "&Otvori" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -1421,6 +1437,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1710,6 +1730,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Dodaj diff program zavistan od ekstenzija" @@ -1854,6 +1878,12 @@ msgstr "Omogićava uređenje za ovaj pregled\nOmogućava uređenje" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1946,6 +1976,10 @@ msgstr "Dodaj ovaj blok levo" msgid "Application Frame Menus: " msgstr "Meni okvira aplikacije" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "" @@ -2096,10 +2130,6 @@ msgid "Authors case sensitive" msgstr "Autori po azbučnom redu" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Autori:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3248,7 +3278,7 @@ msgid "Copying..." msgstr "Kopiram..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3512,10 +3542,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Zasluge:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "I&seci" @@ -3906,6 +3932,10 @@ msgstr "" msgid "Directory:" msgstr "Folder:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4118,6 +4148,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Ne prikazuj više ovu poruku" @@ -4254,6 +4288,10 @@ msgstr "" msgid "Edit..." msgstr "Uredi..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4863,6 +4901,10 @@ msgid "" "Find" msgstr "Pronađi označeni tekst\nPronađi" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5001,10 +5043,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "" - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Od" @@ -5070,6 +5108,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Sakupljanje informacija. Molim sačekajte..." @@ -5465,6 +5507,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5473,6 +5519,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5481,6 +5535,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5489,6 +5547,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5897,6 +5963,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Uključi samo sledeći raspon revizija:" @@ -6318,6 +6388,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6538,10 +6612,6 @@ msgstr "Premesti i preimenuj" msgid "Move to changelist" msgstr "Premesti na skup izmena" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Premesti/Preimenuj" @@ -7094,6 +7164,10 @@ msgstr "Otvori fajl slike..." msgid "Open parent folder" msgstr "Otvori predački folder" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7168,6 +7242,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8105,10 +8183,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Traži ime korisnika i lozinku" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Raz&reši..." @@ -8547,6 +8621,10 @@ msgstr "Sačuvaj izmene u %1?" msgid "Save modifications." msgstr "" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Sačuvaj reviziju &u..." @@ -8628,6 +8706,10 @@ msgstr "Premotaj ulevo" msgid "Scroll Right" msgstr "Premotaj udesno" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Pretraži &dnevnik poruka..." @@ -9150,6 +9232,10 @@ msgid "" "Show Whitespaces" msgstr "Prikaži specijalne karaktere za beline i nove linije\nPrikaži beline" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9208,6 +9294,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Srebrni stil" @@ -9291,10 +9381,6 @@ msgstr "Određuje koliko poruka želite držati u priručnoj memoriji nedavno up msgid "Spin1" msgstr "Rotacija1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Podeli redove" @@ -9466,10 +9552,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9493,6 +9575,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "" @@ -9501,13 +9587,6 @@ msgstr "" msgid "Success" msgstr "" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Prebaci" @@ -9619,6 +9698,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10066,6 +10149,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10291,6 +10380,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10718,6 +10818,10 @@ msgstr "Koristi blok teksta iz levog pregleda\nKoristi levi blok" msgid "Use th&is text block" msgstr "Koristi o&vaj blok teksta" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10788,12 +10892,20 @@ msgstr "Ime korisnika:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Valjane opcije komandne linije su:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11411,6 +11523,10 @@ msgstr "dan" msgid "deleted" msgstr "obrisano" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "veštačko" diff --git a/Languages/Tortoise_sv.po b/Languages/Tortoise_sv.po index 912319036..0866dedab 100644 --- a/Languages/Tortoise_sv.po +++ b/Languages/Tortoise_sv.po @@ -1,11 +1,11 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # Johan Foglemark , 2011,2013 -# Johan Jacobsson , 2014 +# Johan Jacobsson , 2014-2015 # LordDaimos , 2011 # Kim Svensson , 2011 # Kim Svensson , 2011 @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -613,7 +613,7 @@ msgstr "&Dockning" #. Resource IDs: (1032) msgid "&Don't ask me again" -msgstr "" +msgstr "&Fråga mig inte igen" #. Resource IDs: (1384) msgid "&Down" @@ -663,6 +663,10 @@ msgstr "&Aktivera proxyserver" msgid "&Enable edit" msgstr "&Tillåt redigering" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "&Avsluta" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Exportera markering till..." @@ -929,6 +933,10 @@ msgstr "&Ny" msgid "&New..." msgstr "&Ny..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "&Nästa >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Nästa sida" @@ -957,6 +965,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&En sida" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Öppna" @@ -965,6 +977,10 @@ msgstr "&Öppna" msgid "&Open Git for Windows WebSite" msgstr "&Öppna 'Git för Windows'-hemsidan" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "&Öppna..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Öppna...\tCtrl+O" @@ -1051,7 +1067,7 @@ msgstr "&Reguljärt uttryck" #. Resource IDs: (97) msgid "&Remind me later" -msgstr "" +msgstr "&Påminn mig senare" #. Resource IDs: (1617) msgid "&Remote Branch:" @@ -1251,7 +1267,7 @@ msgstr "&Verktygsradsnamn:" #. Resource IDs: (65535) msgid "&Toolbars and Docking Windows" -msgstr "" +msgstr "&Verktygsrad och Dockning" #. Resource IDs: (65535) msgid "&Toolbars:" @@ -1426,6 +1442,10 @@ msgstr ".gitignore i roten på arkivet" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig i roten på arkivet" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< &Föregående" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1715,6 +1735,10 @@ msgstr "Lägg till Fjärrarkiv" msgid "Add \"&Signed-off-by\"" msgstr "Lägg till \"&Signed-Off-By\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Lägg till filändelsespecifikt program för att visa skillnader" @@ -1859,6 +1883,12 @@ msgstr "Tillåt Redigering för denna vy\nTillåt Redigering" msgid "Allow to use custom Gravatar URL" msgstr "Tillåt användande av egen Gravatar URL" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Redan uppdaterad." @@ -1951,6 +1981,10 @@ msgstr "Lägg till detta block till vänster i slutet" msgid "Application Frame Menus: " msgstr "Program menyer:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "Applicera &Patch..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Applicera en Patch-serie..." @@ -2101,10 +2135,6 @@ msgid "Authors case sensitive" msgstr "Hantera användarnamn skiftlägesokänsligt" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Skrivet av:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -2186,7 +2216,7 @@ msgstr "Tillbaka" #. Resource IDs: (65535) msgid "Background" -msgstr "" +msgstr "Bakgrund" #. Resource IDs: (65535) msgid "Baltic" @@ -2198,7 +2228,7 @@ msgstr "Stapeldiagram" #. Resource IDs: (1385) msgid "Base" -msgstr "" +msgstr "Bas" #. Resource IDs: (1522) msgid "Base On" @@ -3253,8 +3283,8 @@ msgid "Copying..." msgstr "Kopierar..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "Copyright (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3517,10 +3547,6 @@ msgstr "Inloggningshanterare:" msgid "Credentials" msgstr "Inloggningsuppgifter" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Tack till:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Klipp ut" @@ -3743,11 +3769,11 @@ msgstr "Tar bort" #. Resource IDs: (97) msgid "Deleting cached data" -msgstr "" +msgstr "Tar bort cachad data" #. Resource IDs: (97) msgid "Deleting file" -msgstr "" +msgstr "Tar bort fil" #. Resource IDs: (88) msgid "Deleting remote refs..." @@ -3843,15 +3869,15 @@ msgstr "Diff Viewer::Merge Tool" #. Resource IDs: (65535) msgid "Diff added lines" -msgstr "" +msgstr "Diff adderade rader" #. Resource IDs: (65535) msgid "Diff command" -msgstr "" +msgstr "Diff kommando" #. Resource IDs: (65535) msgid "Diff comment" -msgstr "" +msgstr "Diff kommentar" #. Resource IDs: (65535) msgid "Diff file:" @@ -3859,7 +3885,7 @@ msgstr "Patchfil:" #. Resource IDs: (65535) msgid "Diff header" -msgstr "" +msgstr "Diff rubrik" #. Resource IDs: (15) msgid "Diff later" @@ -3867,11 +3893,11 @@ msgstr "Jämför senare" #. Resource IDs: (65535) msgid "Diff position" -msgstr "" +msgstr "Diff position" #. Resource IDs: (65535) msgid "Diff removed lines" -msgstr "" +msgstr "Diff borttagna rader" #. Resource IDs: (15) #, c-format @@ -3911,6 +3937,10 @@ msgstr "Mapp..." msgid "Directory:" msgstr "Mapp:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "Inaktivera ljud" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -3919,7 +3949,7 @@ msgstr "Avaktivera denna om du använder riktigt stora arbetsträd och du upplev #. Resource IDs: (97) msgid "Disable update checks" -msgstr "" +msgstr "Inaktivera uppdateringskoll" #. Resource IDs: (2054) msgid "Disabled" @@ -4004,7 +4034,7 @@ 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 "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) msgid "Do you really want to mark the selected file(s) as assume-valid?" @@ -4123,6 +4153,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Spara inte\nLäs om vyerna utan att spara ändringarna" +#. Resource IDs: (65535) +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) msgid "Don't show this message again" msgstr "Visa inte detta meddelande igen" @@ -4259,6 +4293,10 @@ msgstr "Redigera syst. gitconfig" msgid "Edit..." msgstr "Redigera..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "Effektiv" @@ -4868,6 +4906,10 @@ msgid "" "Find" msgstr "Sök efter text\nSök" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "Sök:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -4977,7 +5019,7 @@ msgstr "Tvinga: Kan överge" #. Resource IDs: (65535) msgid "Foreground" -msgstr "" +msgstr "Förgrund" #. Resource IDs: (312) msgid "Format Patch" @@ -5006,10 +5048,6 @@ msgstr "Hittade ett tomt arkiveringsmeddelande. Du måste ange ett annars kan in msgid "Found auto words:" msgstr "Hittade auto-ord:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Från" @@ -5075,6 +5113,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "GPG signerar märket, se manualen för mer detaljer" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Hämtar information. Var god vänta..." @@ -5470,6 +5512,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5478,6 +5524,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5486,6 +5540,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5494,6 +5552,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5540,7 +5606,7 @@ msgstr "ID:32870:V C +L" #. Accelerator Entry for Menu ID:32873; '' msgid "ID:32873:V C +E" -msgstr "" +msgstr "ID:32873:V C +E" #. Accelerator Entry for Menu ID:32881; '' msgid "ID:32881:V C +P" @@ -5688,7 +5754,7 @@ msgstr "Ikoner/Design/Kodning: \t\tLuebbe Onken" #. Resource IDs: (97) msgid "Identical" -msgstr "" +msgstr "Identisk" #. Resource IDs: (194) msgid "" @@ -5902,6 +5968,10 @@ msgstr "Inkludera &märken" msgid "Include &ignored files" msgstr "Inkludera &ignorerade filer" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Inkludera endast följande revisionsintervall:" @@ -6090,7 +6160,7 @@ msgstr "Lämna som konflikt\nKonfliktstatus för filen behålls" #. Resource IDs: (252) msgid "Leave only marked blocks" -msgstr "" +msgstr "Lämna endast markerade block" #. Resource IDs: (188) msgid "Left View: " @@ -6183,7 +6253,7 @@ msgstr "Ladda in ändringar\nÄndringar gjorda i TortoiseGitMerge kommer att fö msgid "" "Load changes\n" "The views are updated with the new content." -msgstr "" +msgstr "Ladda ändringar\nVyerna kommer att uppdateras med det nya innehållet." #. Resource IDs: (369,1379) msgid "Loading..." @@ -6215,7 +6285,7 @@ msgstr "Lokal:" msgid "" "Location where the contents of the\n" "selected revision of the repository will be saved to." -msgstr "" +msgstr "Plats där innehållet för den valda revisionen av arkivet kommer att sparas." #. Resource IDs: (32854) msgid "Locator Bar" @@ -6323,13 +6393,17 @@ msgid "" "The file status is changed to modified" msgstr "Markera som löst\nFilens status ändras till \"modifierad\"" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "Markera för jämförelse" + #. Resource IDs: (252) msgid "Mark this block" msgstr "Markera blocket" #. Resource IDs: (7) msgid "Marked Blocks" -msgstr "" +msgstr "Markerade block" #. Resource IDs: (2051) msgid "" @@ -6543,10 +6617,6 @@ msgstr "Flytta och byt namn" msgid "Move to changelist" msgstr "Flytta till ändringslista" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "Flytta till utökade kontextmenyn (tryck Shift för att visa denna)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Flytta/Byt namn" @@ -6917,7 +6987,7 @@ msgstr "Antal tecken som krävs för att upptäcka flyttad/kopierad rad:" #. Resource IDs: (96) msgid "Number of characters to show in the abbreviated hash part" -msgstr "" +msgstr "Antal tecken som visas av en förkortad hash" #. Resource IDs: (1160) msgid "Number of weeks:" @@ -7099,6 +7169,10 @@ msgstr "Öppna bildfil..." msgid "Open parent folder" msgstr "Öppna mappens förälder" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "Öppna patch-fil" + #. Resource IDs: (3602) msgid "Open this document" msgstr "Öppna detta dokument" @@ -7173,6 +7247,10 @@ msgstr "Skriver över om grenen finns" msgid "Overwrite" msgstr "Skriv över" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8110,10 +8188,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Begär ett användarnamn och ett lösenord" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "Kräver GPG och en nyckel utan lösenord." - #. Resource IDs: (8) msgid "Res&olve..." msgstr "Lös k&onflikter..." @@ -8302,12 +8376,12 @@ msgstr "Revision:" #. Resource IDs: (605) msgid "Rewind" -msgstr "" +msgstr "Spola tillbaka" #. Resource IDs: (95) #, c-format msgid "Rewind %d" -msgstr "" +msgstr "Spola tillbaka %d" #. Resource IDs: (3850) msgid "" @@ -8515,19 +8589,19 @@ msgstr "Spara alla\nBåda filerna sparas" msgid "" "Save and exclude\n" "Your changes are saved and the original content is used" -msgstr "" +msgstr "Spara och exkludera\nDina ändringar sparas och det ursprungliga innehållet används" #. Resource IDs: (7) msgid "" "Save and ignore marked blocks\n" "Only your manual edits are saved, marked blocks are left as they are" -msgstr "" +msgstr "Spara och ignorera markerade block\nBara dina manuella ändringar sparas, markerade block lämnas orörda" #. Resource IDs: (7) msgid "" "Save and include\n" "Your changes are saved and the marked blocks are included" -msgstr "" +msgstr "Spara och inkludera\nDina ändringar sparas och de markerade blocken inkluderas" #. Resource IDs: (156) msgid "Save as" @@ -8552,6 +8626,10 @@ msgstr "Spara ändringar i %1?" msgid "Save modifications." msgstr "Spara ändringar." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "Spara patch-fil" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Spara revision &till..." @@ -8633,6 +8711,10 @@ msgstr "Scrolla vänster" msgid "Scroll Right" msgstr "Scrolla höger" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "Ins&tällningar..." + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Sök &loggmeddelanden..." @@ -9155,6 +9237,10 @@ msgid "" "Show Whitespaces" msgstr "Visa specialtecken för tomrum och radbrytning\nVisa tomrum" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9213,6 +9299,10 @@ msgstr "Visa historiken för vald fil/mapp" msgid "Si&gn" msgstr "Si&gnera" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Silver tema" @@ -9296,10 +9386,6 @@ msgstr "Specificerar hur många gamla loggmeddelanden som ska sparas i loggmedde msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Dela rader" @@ -9471,10 +9557,6 @@ msgstr "Lägg till Sub-modul..." msgid "Submodule Diff" msgstr "Jämför Sub-modul" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Info om Sub-modul" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Initiera Sub-modul" @@ -9498,6 +9580,10 @@ msgid "" "Revision %2!s!" msgstr "Sub-modul \"%1!s!\"\nRevision %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Sub-moduler" @@ -9506,13 +9592,6 @@ msgstr "Sub-moduler" msgid "Success" msgstr "Lyckades" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Växla" @@ -9624,6 +9703,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "&Märken:" @@ -9990,7 +10073,7 @@ msgstr "De två valda URL:erna är inte skapade från samma rot.\nDet går inte msgid "" "The working tree is not clean and contains unstaged changes.\n" "Review and commit the changes?" -msgstr "" +msgstr "Arbetsträdet är inte rent och innehåller icke-adderade ändringar.\nGranska och arkivera ändringarna?" #. Resource IDs: (65535) msgid "Their file:" @@ -10071,6 +10154,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10294,6 +10383,17 @@ msgstr "TortoiseGitMerge kan inte processa den här patch-filen. Filnamnet \"%s\ #. Resource IDs: (357) msgid "TortoiseGitUDiff" +msgstr "TortoiseGitUDiff" + +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" msgstr "" #. Resource IDs: (1739) @@ -10723,6 +10823,10 @@ msgstr "Använd textblocket från den vänstra vyn\nAnvänd vänstra blocket" msgid "Use th&is text block" msgstr "Använd &detta textblock" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10793,12 +10897,20 @@ msgstr "Användarnamn:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Tillåtna kommandoradsparametrar är:\n/base:\n/theirs:\n/mine:\n/merged:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11129,7 +11241,7 @@ 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 "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) msgid "" @@ -11139,7 +11251,7 @@ msgstr "" #. Resource IDs: (7) msgid "You have marked changed blocks. How should those blocks be saved?" -msgstr "" +msgstr "Du har markerat ändrade block. Hur ska blocken sparas?" #. Resource IDs: (16) msgid "" @@ -11416,6 +11528,10 @@ msgstr "dag" msgid "deleted" msgstr "borttagen" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" @@ -11532,7 +11648,7 @@ msgstr "icke versionhanterad" #. Resource IDs: (97) msgid "none" -msgstr "" +msgstr "inga" #. Resource IDs: (10) msgid "normal" diff --git a/Languages/Tortoise_tr.po b/Languages/Tortoise_tr.po index c9dc270ce..c197c5a26 100644 --- a/Languages/Tortoise_tr.po +++ b/Languages/Tortoise_tr.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -666,6 +666,10 @@ msgstr "&Proxy sunucusunu etkinleştir" msgid "&Enable edit" msgstr "" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Seçilenleri gönder..." @@ -932,6 +936,10 @@ msgstr "&Yeni" msgid "&New..." msgstr "&Yeni..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Sonraki Sayfa" @@ -960,6 +968,10 @@ msgstr "&Tamam" msgid "&One Page" msgstr "&Tek Sayfa" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Aç" @@ -968,6 +980,10 @@ msgstr "&Aç" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "&Aç...\tCtrl+O" @@ -1429,6 +1445,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1718,6 +1738,10 @@ msgstr "" msgid "Add \"&Signed-off-by\"" msgstr "" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Belirli bir uzantı için karşılaştırma programı ekle" @@ -1862,6 +1886,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "Zaten güncel." @@ -1954,6 +1984,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Uygulama Pencere Menüleri:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Yama Serisi Uygula..." @@ -2104,10 +2138,6 @@ msgid "Authors case sensitive" msgstr "Yazarlar büyük küçük harfe duyarlı" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Yazarlar:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3256,7 +3286,7 @@ msgid "Copying..." msgstr "Kopyalanıyor..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3520,10 +3550,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Katkıda bulunanlar:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "Ke&s" @@ -3914,6 +3940,10 @@ msgstr "Klasör..." msgid "Directory:" msgstr "Dizin:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4126,6 +4156,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Bu mesajı tekrar gösterme" @@ -4262,6 +4296,10 @@ msgstr "" msgid "Edit..." msgstr "Düzenle..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4871,6 +4909,10 @@ msgid "" "Find" msgstr "Belirtilen metni bul\nBul" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5009,10 +5051,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Buradan" @@ -5078,6 +5116,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Bilgi getiriliyor. Lütfen bekleyin..." @@ -5473,6 +5515,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5481,6 +5527,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5489,6 +5543,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5497,6 +5555,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5905,6 +5971,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "" @@ -6326,6 +6396,10 @@ msgid "" "The file status is changed to modified" msgstr "" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6546,10 +6620,6 @@ msgstr "Taşı ve yeniden adlandır" msgid "Move to changelist" msgstr "Değişim listesine taşı" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Taşı/Tekrar adlandır" @@ -7102,6 +7172,10 @@ msgstr "Resim dosyasını aç..." msgid "Open parent folder" msgstr "Bir üst klasörü Aç" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7176,6 +7250,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8113,10 +8191,6 @@ msgstr "" msgid "Requests a username and a password" msgstr "Kullanıcı adı ve sifre bilgilerini ister" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8555,6 +8629,10 @@ msgstr "%1 'e yapılan değişiklikler kaydedilsin mi?" msgid "Save modifications." msgstr "" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Revizyonu kaydet &..." @@ -8636,6 +8714,10 @@ msgstr "Sola Kaydır" msgid "Scroll Right" msgstr "Sağa Kaydır" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "&Günlük mesajlarında ara..." @@ -9158,6 +9240,10 @@ msgid "" "Show Whitespaces" msgstr "" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9216,6 +9302,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "" @@ -9299,10 +9389,6 @@ msgstr "En son Günlük mesajları diyalogunda kaç tane elemanı saklamak isted msgid "Spin1" msgstr "Döndür1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Satırları ayır" @@ -9474,10 +9560,6 @@ msgstr "" msgid "Submodule Diff" msgstr "Altbirim Farkı" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "Altbirim Bilgisi" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "Altbirim Hazırla" @@ -9501,6 +9583,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "Alt modüller" @@ -9509,13 +9595,6 @@ msgstr "Alt modüller" msgid "Success" msgstr "Başarılı" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Değiştir" @@ -9627,6 +9706,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "&Etiketler:" @@ -10074,6 +10157,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10299,6 +10388,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10726,6 +10826,10 @@ msgstr "Soldaki metin bloğunu kullan\nSol bloğu kullan" msgid "Use th&is text block" msgstr "Bu& metin bloğunu kullan" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10796,12 +10900,20 @@ msgstr "Kullanıcıadı:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Geçerli komuta satırları :\n/Taban :< taban dosyasının dizini>\n/Onların:\n/Benim:\n/Birleştirilmiş:\n/diff:\n/patchpath:" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11419,6 +11531,10 @@ msgstr "gün" msgid "deleted" msgstr "silindi" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "işlevsiz" diff --git a/Languages/Tortoise_vi.po b/Languages/Tortoise_vi.po index 7e00404a6..b9c04d51f 100644 --- a/Languages/Tortoise_vi.po +++ b/Languages/Tortoise_vi.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2014-12-30 15:26+0000\n" +"PO-Revision-Date: 2015-04-02 18:53+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" @@ -657,6 +657,10 @@ msgstr "&Cho phép Máy Chủ Proxy" msgid "&Enable edit" msgstr "&Cho phép chỉnh sửa" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "&Xuất lựa chọn sang..." @@ -923,6 +927,10 @@ msgstr "&Mới" msgid "&New..." msgstr "&Mới..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "&Trang tiếp theo" @@ -951,6 +959,10 @@ msgstr "&OK" msgid "&One Page" msgstr "&Một Trang" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "&Mở" @@ -959,6 +971,10 @@ msgstr "&Mở" msgid "&Open Git for Windows WebSite" msgstr "" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "" + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "" @@ -1420,6 +1436,10 @@ msgstr "" msgid ".tgitconfig in the repository root" msgstr "" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1709,6 +1729,10 @@ 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) +msgid "Add another commit?" +msgstr "" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "Thêm chương trình so sánh cho mở rộng xác định" @@ -1853,6 +1877,12 @@ msgstr "" msgid "Allow to use custom Gravatar URL" msgstr "" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "" @@ -1945,6 +1975,10 @@ msgstr "" msgid "Application Frame Menus: " msgstr "Thực đơn cho khung ứng dụng:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "" + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "Áp dụng mã số vá..." @@ -2095,10 +2129,6 @@ msgid "Authors case sensitive" msgstr "Các tác giả có phân biệt chữ thường và hoa" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "Các tác giả:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3247,7 +3277,7 @@ msgid "Copying..." msgstr "Đang sao chép..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" msgstr "" #. Resource IDs: (1254) @@ -3511,10 +3541,6 @@ msgstr "" msgid "Credentials" msgstr "" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "Công trạng:" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "&Cắt" @@ -3905,6 +3931,10 @@ msgstr "" msgid "Directory:" msgstr "Thư mục:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4117,6 +4147,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "Đừng lưu\nTải lại trình xem mà không lưu các sửa đổi" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "Đừng hiện lại thông điệp này nữa" @@ -4253,6 +4287,10 @@ msgstr "" msgid "Edit..." msgstr "Biên tập..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "" + #. Resource IDs: (1770) msgid "Effective" msgstr "" @@ -4862,6 +4900,10 @@ msgid "" "Find" msgstr "Tìm các dòng chữ đã chỉ ra\nTìm" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5000,10 +5042,6 @@ msgstr "" msgid "Found auto words:" msgstr "" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "" - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "Từ" @@ -5069,6 +5107,10 @@ 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) +msgid "GPG signs the tag, see manual for details" +msgstr "" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "Đang thu thập thông tin. Vui lòng chờ..." @@ -5464,6 +5506,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5472,6 +5518,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5480,6 +5534,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5488,6 +5546,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5896,6 +5962,10 @@ msgstr "" msgid "Include &ignored files" msgstr "" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "Chỉ bao gồm phạm vi thay đổi sau đây:" @@ -6317,6 +6387,10 @@ msgid "" "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) +msgid "Mark for comparison" +msgstr "" + #. Resource IDs: (252) msgid "Mark this block" msgstr "" @@ -6537,10 +6611,6 @@ msgstr "Di chuyển và đổi tên" msgid "Move to changelist" msgstr "Chuyển đến danh sách thay đổi" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "Chuyển/Đổi tên" @@ -7093,6 +7163,10 @@ msgstr "Mở tập tin ảnh..." msgid "Open parent folder" msgstr "Mở thư mục cha" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "" + #. Resource IDs: (3602) msgid "Open this document" msgstr "" @@ -7167,6 +7241,10 @@ msgstr "" msgid "Overwrite" msgstr "" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "" + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -8104,10 +8182,6 @@ 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: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "" @@ -8546,6 +8620,10 @@ msgstr "Lưu thay đổi sang %1?" msgid "Save modifications." msgstr "Lưu các thay đổi." +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "Lưu chỉnh sửa &vào..." @@ -8627,6 +8705,10 @@ msgstr "Cuộn Trái" msgid "Scroll Right" msgstr "Cuộn Phải" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "" + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "Tìm kiếm trên các &thông điệp tường trình..." @@ -9149,6 +9231,10 @@ msgid "" "Show Whitespaces" msgstr "Hiển thị ký tự đặc biệt cho các khoảng trắng và dòng mới\nHiển thị Khoảng Trắng" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "" @@ -9207,6 +9293,10 @@ msgstr "" msgid "Si&gn" msgstr "" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "Kiều Màu Bạc" @@ -9290,10 +9380,6 @@ 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: (1827) -msgid "Split commit" -msgstr "" - #. Resource IDs: (1253) msgid "Split lines" msgstr "Tách các dòng" @@ -9465,10 +9551,6 @@ msgstr "" msgid "Submodule Diff" msgstr "" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "" @@ -9492,6 +9574,10 @@ msgid "" "Revision %2!s!" msgstr "" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "" + #. Resource IDs: (1708) msgid "Submodules" msgstr "" @@ -9500,13 +9586,6 @@ msgstr "" msgid "Success" msgstr "" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "Xoay chuyển" @@ -9618,6 +9697,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "" @@ -10065,6 +10148,12 @@ msgid "" "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) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10290,6 +10379,17 @@ msgstr "" msgid "TortoiseGitUDiff" msgstr "" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "" @@ -10717,6 +10817,10 @@ msgstr "Dùng khối văn bản từ bảng xem bên trái\nDùng khối bên tr msgid "Use th&is text block" msgstr "Dùng khối văn bản &này" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "" + #. Resource IDs: (314) #, c-format msgid "" @@ -10787,12 +10891,20 @@ msgstr "Tên đăng nhập:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "Các tuỳ chọn dòng lệnh hợp lệ là:\n/base:<đường dẫn tới tập tin gốc>\n/theirs:<đường dẫn tới tập tin của họ>\n/mine:<đường dẫn tới tập tin của bạn>\n/merged:<đường dẫn tới tập tin hợp nhất>\n/diff:<đường dẫn tới tập tin khác biệt thống nhất>\n/patchpath:<đường dẫn tới thư mục>" +"/patchpath:\n" +"/saverequired\n" +"/saverequiredonconflicts\n" +"/oneway \n" +"/line:" +msgstr "" #. Resource IDs: (11, 357) msgid "Value" @@ -11410,6 +11522,10 @@ msgstr "ngày" msgid "deleted" msgstr "đã xóa" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "" + #. Resource IDs: (58116) msgid "dummy" msgstr "vật giả" diff --git a/Languages/Tortoise_zh_CN.po b/Languages/Tortoise_zh_CN.po index af3980bac..e0c1e9345 100644 --- a/Languages/Tortoise_zh_CN.po +++ b/Languages/Tortoise_zh_CN.po @@ -1,5 +1,5 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-02-10 15:40+0000\n" +"PO-Revision-Date: 2015-04-02 19:43+0000\n" "Last-Translator: YF \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/tortoisegit/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -168,7 +168,7 @@ msgstr "%1!s!" 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) #, c-format @@ -225,7 +225,7 @@ msgstr "%d个文件已删除。" #. Resource IDs: (69) #, c-format msgid "%d files reverted to %s." -msgstr "%d个文件已回滚到 %s。" +msgstr "%d个文件已还原到 %s。" #. Resource IDs: (169) #, c-format @@ -664,6 +664,10 @@ msgstr "使用代理服务器(&E)" msgid "&Enable edit" msgstr "启用编辑(&E)" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "退出(&E)" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "导出选择项(&E)..." @@ -872,7 +876,7 @@ msgstr "内嵌差异比较的最大行长度(&M)" #. Resource IDs: (16543) msgid "&Menu animations:" -msgstr "动画菜单(&M):" +msgstr "菜单动画(&M):" #. Resource IDs: (16921) msgid "&Menu contents:" @@ -930,6 +934,10 @@ msgstr "新建(&N)" msgid "&New..." msgstr "新建(&N)..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "下一个(&N) >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "下页(&N)" @@ -958,6 +966,10 @@ msgstr "确定(&O)" msgid "&One Page" msgstr "单页(&O)" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "到(&O)" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "打开(&O)" @@ -966,6 +978,10 @@ msgstr "打开(&O)" msgid "&Open Git for Windows WebSite" msgstr "打开 Git for Windows 网站(&O)" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "打开(&O)..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "打开(&O)...\tCtrl+O" @@ -1144,7 +1160,7 @@ msgstr "图片另存为(&S)..." #. Resource IDs: (322) msgid "&Save list of selected files to..." -msgstr "保存选择文件列表(&S)" +msgstr "保存选中文件的列表到(&S)..." #. Resource IDs: (84) msgid "&Set Git path" @@ -1240,7 +1256,7 @@ msgstr "仅文本(&T)" #. Resource IDs: (1222) msgid "&Timeout in seconds to stop the auto-completion parsing" -msgstr "停止自动完成分析的超时时间(秒)(&T)" +msgstr "停止“自动完成”分析工作的超时时间(秒)(&T)" #. Resource IDs: (59392) msgid "&Toolbar" @@ -1276,7 +1292,7 @@ msgstr "双页(&T)" #. Resource IDs: (1076, 65535) msgid "&URL:" -msgstr "URL(&U):" +msgstr "&URL:" #. Resource IDs: (1253, 57643) msgid "&Undo" @@ -1340,7 +1356,7 @@ msgstr "在文件中(&W)" #. Resource IDs: (1657) msgid "&ignore space change" -msgstr "忽略空格变更(&iI)" +msgstr "忽略空格变更(&I)" #. Resource IDs: (1498) msgid "&known changes" @@ -1427,6 +1443,10 @@ msgstr ".gitignore 放在版本库的根目录" msgid ".tgitconfig in the repository root" msgstr "版本库根目录中的 .tgitconfig" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< 上一个(&P)" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<.....>" @@ -1466,7 +1486,7 @@ msgid "" "To use TortoiseGit please open the explorer and right-click on any folder you like\n" "to bring up the context menu where you will find all TortoiseGit commands.\n" "And read the manual!" -msgstr "TortoiseGit 是一个 Windows 外壳扩展，\\n这意味着该程序是集成在 Windows 资源管理器中的。\\n要使用 TortoiseGit 请打开资源管理器并在任意目录中单击鼠标右键，\\n在弹出的右键菜单中可以找到所有的 TortoiseGit 命令。\\n更详细的使用请阅读手册！" +msgstr "TortoiseGit 是一个 Windows 外壳扩展。\n这意味着本程序会集成在 Windows 资源管理器中。\n要使用 TortoiseGit，请打开资源管理器，在任意文件夹中单击鼠标右键，\n在弹出的右键菜单中您可以找到所有的 TortoiseGit 命令。\n更详细的操作方法请阅读手册。" #. Resource IDs: (84) msgid "" @@ -1716,6 +1736,10 @@ msgstr "添加远端" msgid "Add \"&Signed-off-by\"" msgstr "添加“Signed-off-by”(&S)" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "再添加一个提交？" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "根据扩展名指定差异比较程序" @@ -1726,7 +1750,7 @@ msgstr "根据扩展名指定合并程序" #. Resource IDs: (1065) msgid "Add new files automatically to Git" -msgstr "自动向Git添加新文件" +msgstr "自动添加新文件到 Git" #. Resource IDs: (13) msgid "Add to &ignore list" @@ -1734,7 +1758,7 @@ msgstr "增加到忽略列表(&I)" #. Resource IDs: (1068) msgid "Add to Quick Access Toolbar" -msgstr "增加到快速访问工具栏" +msgstr "添加到快速访问工具栏" #. Resource IDs: (209, 1279) msgid "Add..." @@ -1860,6 +1884,12 @@ msgstr "允许编辑这个视窗\n允许编辑" msgid "Allow to use custom Gravatar URL" msgstr "允许使用自定义的 Gravatar 网址" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "已经最新" @@ -1915,7 +1945,7 @@ 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 "用来解决冲突文件的外部合并程序。\n\n您可以在程序路径中指定以下参数: \n%merged : 发生冲突的文件存放位置\n%theirs : 版本库中存放的文件\n%mine : 您拥有的修改过的文件\n%base : 不包含您所做修改的原始文件" +msgstr "用来解决冲突文件的外部合并程序。\n\n您可以在程序路径中指定以下参数: \n%merged : 发生冲突的文件存放位置\n%theirs : 版本库中存放的文件\n%mine : 您现有的修改过的文件\n%base : 不包含您所做修改的原始文件" #. Resource IDs: (3867) #, c-format @@ -1952,6 +1982,10 @@ msgstr "追加这个块到左边" msgid "Application Frame Menus: " msgstr "应用程序框架菜单:" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "应用补丁(&P)..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "应用补丁序列..." @@ -2023,19 +2057,19 @@ msgstr "分配到:" #. Resource IDs: (10) msgid "Assume Unchanged" -msgstr "假定无修改" +msgstr "假定未变更" #. Resource IDs: (1550) msgid "Assume valid/unchanged" -msgstr "假定有效/无修改" +msgstr "假定有效/未变更" #. Resource IDs: (1550) msgid "Assume valid/unchanged (\"Needs-lock\" in TortoiseSVN)" -msgstr "假设有效/没有修改(\"Needs-lock\" 在TortotiseSVN)" +msgstr "假定有效/未变更(TortotiseSVN中的\"Needs-lock\")" #. Resource IDs: (32792) msgid "At file &creation" -msgstr "在文件创建(&c)" +msgstr "在文件创建(&C)" #. Resource IDs: (2054) msgid "At file creation" @@ -2102,10 +2136,6 @@ msgid "Authors case sensitive" msgstr "作者区分大小写" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "作者: " - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -2113,11 +2143,11 @@ msgstr "作者:\tFrank Li (lznuaa@gmail.com),\n\t\tSven Strickroth (email@cs-war #. Resource IDs: (65535) msgid "Auto CrLf convert" -msgstr "自动DOS\\UNIX换行符转化" +msgstr "自动CrLf换行符转换" #. Resource IDs: (65535) msgid "Auto Crlf:" -msgstr "自动DOS\\UNIX换行符转化:" +msgstr "自动CrLf转换:" #. Resource IDs: (1003) msgid "Auto Hide" @@ -2269,7 +2299,7 @@ msgstr "列出文件每一行的作者" #. Resource IDs: (32812) msgid "Blend alpha" -msgstr "Alpha 混和" +msgstr "Alpha 混合" #. Resource IDs: (156, 626) msgid "Blue Style" @@ -2339,7 +2369,7 @@ msgstr "浏览(&W)" #. Resource IDs: (21) msgid "Browse References" -msgstr "浏览参考" +msgstr "浏览引用" #. Resource IDs: (78) msgid "Browse for the external diff program" @@ -2347,7 +2377,7 @@ msgstr "查找外部比较差异工具" #. Resource IDs: (322) msgid "Browse references" -msgstr "浏览参考" +msgstr "浏览引用" #. Resource IDs: (1069) msgid "Browse..." @@ -2403,7 +2433,7 @@ msgstr "从版本创建分支/标签(&R)" #. Resource IDs: (65535) msgid "C&urrent Keys:" -msgstr "当前主键(&U):" +msgstr "当前快捷键(&U):" #. Resource IDs: (501) msgid "C&ut" @@ -2509,7 +2539,7 @@ msgstr "不能强制更新当前分支。如果您需要，请使用 reset 命 #. Resource IDs: (1) #, c-format msgid "Cannot show blame. \"%s\" is not under version control by git." -msgstr "不能显示追溯. \"%s\" 没有被git管理" +msgstr "不能显示追溯。“%s”没有被 git 管理。" #. Resource IDs: (68) msgid "Cannot show diff because of inconsistent newlines in the file." @@ -2517,7 +2547,7 @@ msgstr "由于文件中采用了不同的换行方式，不能显示其差异。 #. Resource IDs: (16926) msgid "Casca&de" -msgstr "层叠(&d)" +msgstr "层叠(&D)" #. Resource IDs: (65535) msgid "Cascaded context menu" @@ -2643,7 +2673,7 @@ msgstr "检查更新..." #. Resource IDs: (13) msgid "Check for modi&fications" -msgstr "检查更新(&F)" +msgstr "检查已修改(&F)" #. Resource IDs: (251) msgid "Check the path and/or URL you've entered." @@ -2671,7 +2701,7 @@ msgstr "选中可在日志信息中使用较简短的日期及时间" #. Resource IDs: (1700) msgid "Check:" -msgstr "核查" +msgstr "检查：" #. Resource IDs: (77) msgid "Checkout" @@ -2889,7 +2919,7 @@ msgstr "折叠" msgid "" "Collapse unchanged sections\n" "Collapse" -msgstr "折叠未修改的片段\n折叠" +msgstr "折叠未变更的片段\n折叠" #. Resource IDs: (16662) msgid "Color" @@ -2979,7 +3009,7 @@ msgstr "提交者名称" #. Resource IDs: (1750) msgid "Commit Ordering:" -msgstr "提交排序：" +msgstr "对提交的排序方式：" #. Resource IDs: (96) msgid "Commit super project" @@ -3024,7 +3054,7 @@ msgid "" "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:" @@ -3223,7 +3253,7 @@ msgstr "将路径复制到剪贴板" #. Resource IDs: (90) msgid "Copy ref names" -msgstr "复制参考名称" +msgstr "复制引用名称" #. Resource IDs: (323) msgid "Copy selection to cli&pboard" @@ -3242,7 +3272,7 @@ msgstr "复制到剪贴板" #. Resource IDs: (98) #, c-format msgid "Copy: New name for %s" -msgstr "复制: %s 的新名称" +msgstr "复制: %s 的新名称" #. Resource IDs: (80) #, c-format @@ -3254,8 +3284,8 @@ msgid "Copying..." msgstr "正在复制..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "版权所有 (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "版权所有 (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3486,7 +3516,7 @@ msgstr "创建分支/标签" #. Resource IDs: (76) msgid "Creates a library folder with special settings for Git working trees" -msgstr "创建一个Git工作区的库文件夹" +msgstr "创建一个用于 Git 工作区的“库”文件夹" #. Resource IDs: (2052) msgid "" @@ -3518,10 +3548,6 @@ msgstr "凭证助手:" msgid "Credentials" msgstr "凭证" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "贡献者: " - #. Resource IDs: (1253) msgid "Cu&t" msgstr "剪切(&T)" @@ -3573,11 +3599,11 @@ msgstr "定制键盘" #. Resource IDs: (1069) msgid "Customize Quick Access Toolbar" -msgstr "定制快速访问工具栏" +msgstr "自定义快速访问工具栏" #. Resource IDs: (1068) msgid "Customize Quick Access Toolbar..." -msgstr "定制快速访问工具栏..." +msgstr "自定义快速访问工具栏..." #. Resource IDs: (1258) msgid "Customize..." @@ -3595,7 +3621,7 @@ msgstr "Cyrillic" #. Resource IDs: (1624) msgid "DCommit Type" -msgstr "DCommit类型" +msgstr "DCommit 类型" #. Resource IDs: (14) msgid "Daemon" @@ -3663,7 +3689,7 @@ msgstr "根据名称删除和忽略 %d 项(&I)" #. Resource IDs: (23) msgid "Delete and add to &ignore list" -msgstr "删除并且添加到忽略列表(&I)" +msgstr "删除并添加到忽略列表(&I)" #. Resource IDs: (23) #, c-format @@ -3689,7 +3715,7 @@ msgstr "删除远端标签 - TortoiseGit" #. Resource IDs: (95) #, c-format msgid "Delete remote tags on \"%s\"..." -msgstr "删除远端标签 在“%s”..." +msgstr "删除在“%s”的远端标签..." #. Resource IDs: (86) msgid "Delete remote tags..." @@ -3719,7 +3745,7 @@ msgstr "已删除" #. Resource IDs: (4570) msgid "Deleted merge conflict" -msgstr "删除分支合并冲突" +msgstr "已删除合并冲突" #. Resource IDs: (23) msgid "" @@ -3768,7 +3794,7 @@ msgstr "描述" #. Resource IDs: (65535) msgid "Describe Strategy" -msgstr "策略描述" +msgstr "描述策略" #. Resource IDs: (1002) msgid "Description" @@ -3864,7 +3890,7 @@ msgstr "差异-头" #. Resource IDs: (15) msgid "Diff later" -msgstr "以后比较差异" +msgstr "用于稍后比较差异" #. Resource IDs: (65535) msgid "Diff position" @@ -3912,6 +3938,10 @@ msgstr "目录..." msgid "Directory:" msgstr "目录: " +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "禁用音效" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -3956,7 +3986,7 @@ msgstr "显示被点选的按钮、菜单或窗口的帮助\n帮助" msgid "" "Display help for current task or command\n" "Help" -msgstr "显示当前工作或命令的帮助\n帮助" +msgstr "显示当前任务或命令的帮助\n帮助" #. Resource IDs: (3605) msgid "" @@ -4009,15 +4039,15 @@ msgstr "您确定要停用 TortoiseGit 的自动检查更新吗？\n\n您可以 #. Resource IDs: (88) msgid "Do you really want to mark the selected file(s) as assume-valid?" -msgstr "您确定要标记选择文件为 assume-valid 吗？" +msgstr "您确定要标记选中文件为 assume-valid 吗？" #. Resource IDs: (88) msgid "Do you really want to mark the selected file(s) as skip-worktree?" -msgstr "您真的想标记选定的文件为 skip-worktree（跳过工作副本）吗？" +msgstr "您确定要标记选中文件为 skip-worktree（跳过工作树）吗？" #. Resource IDs: (145) msgid "Do you really want to move this file or folder?" -msgstr "您确定要移动这个文件或目录吗？" +msgstr "您确定要移动这个文件或文件夹吗？" #. Resource IDs: (70) #, c-format @@ -4035,7 +4065,7 @@ msgstr "您确定要删除\"%s\"吗？" msgid "" "Do you really want to restore the copy? You will lose all changes that you " "have done after creating the copy." -msgstr "您真的确定要恢复该副本？您将丢失所有的在创建该副本之后的变更。" +msgstr "您真的确定要恢复该副本？您将丢失所有在创建该副本后的变更。" #. Resource IDs: (119) #, c-format @@ -4043,7 +4073,7 @@ 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) #, c-format @@ -4051,13 +4081,13 @@ 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) msgid "" "Do you really want to unflag the selected file(s) as skip-worktree or " "assume-unchanged?" -msgstr "您确定要取消选中文件的 skip-worktree （Git 将不再检查他们是否被更新）或者 assume-valid 标记吗？" +msgstr "您确定要取消选中文件的 skip-worktree 或者 assume-unchanged 标记吗？" #. Resource IDs: (86) msgid "Do you want to fetch remote branches from the newly added remote?" @@ -4124,6 +4154,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "不保存\n重新加载视图而不保存修改" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "不显示选定项: (仅在按下 Shift 键时显示)" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "不再显示此信息" @@ -4260,6 +4294,10 @@ msgstr "编辑系统gitconfig(&Y)" msgid "Edit..." msgstr "编辑..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "编辑/拆分提交" + #. Resource IDs: (1770) msgid "Effective" msgstr "实际生效" @@ -4272,7 +4310,7 @@ msgstr "代理服务器的名称或 IP 地址" msgid "" "Ellipse Tools\n" "Ellipse" -msgstr "Ellipse 工具\nEllipse" +msgstr "椭圆工具\n椭圆" #. Resource IDs: (1255) msgid "Email" @@ -4296,7 +4334,7 @@ msgstr "启用编辑" #. Resource IDs: (1510) msgid "Enable EditorConfig" -msgstr "启用编辑器配置" +msgstr "启用 EditorConfig" #. Resource IDs: (1766) msgid "Enable Gravatar" @@ -4374,7 +4412,7 @@ msgstr "行结束符风格" #. Resource IDs: (3825) msgid "Enlarge the window to full size" -msgstr "忽略空格变更(&i)" +msgstr "扩大窗口到全尺寸" #. Resource IDs: (241) msgid "Enter Log Message" @@ -4705,7 +4743,7 @@ msgstr "从\"%s\"获取" #. Resource IDs: (76) msgid "Fetch&&Re&base" -msgstr "获取后变基(&B)" +msgstr "获取，然后变基(&B)" #. Resource IDs: (20) msgid "Fetch..." @@ -4869,6 +4907,10 @@ msgid "" "Find" msgstr "查找指定文本\n查找" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "查找:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -4909,7 +4951,7 @@ msgstr "仅第一个父节点" #. Resource IDs: (1617) msgid "First known &bad:" -msgstr "一个已知问题版本(&B)" +msgstr "第一个问题版本(&B):" #. Resource IDs: (32818) msgid "Fit image &heights" @@ -4925,7 +4967,7 @@ msgstr "软驱 (A: B:)" #. Resource IDs: (1002) msgid "Folder" -msgstr "目录" +msgstr "文件夹" #. Resource IDs: (1675) msgid "Follow renames" @@ -5007,10 +5049,6 @@ msgstr "找到一个空的提交信息。必须输入一个或者变基没完成 msgid "Found auto words:" msgstr "找到自动字词：" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "从" @@ -5076,6 +5114,10 @@ msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ 无法创建位图对象。可能是您的系统内存不足。" +#. Resource IDs: (82) +msgid "GPG signs the tag, see manual for details" +msgstr "GPG 签名该标签，查阅手册了解详细信息" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "正在获取信息。请稍候..." @@ -5168,15 +5210,15 @@ msgstr "Git 复制并更名版本控制的项目到当前位置" #. Resource IDs: (13) msgid "Git Copy versioned item(s) here" -msgstr "Git 复制版本控制的条目到当前位置" +msgstr "Git 复制受版本控制的项目到当前位置" #. Resource IDs: (14) msgid "Git Export all items here" -msgstr "Git 导出所有条目到当前位置" +msgstr "Git 导出所有项目到当前位置" #. Resource IDs: (14) msgid "Git Export versioned items here" -msgstr "Git 导出版本控制的条目到当前位置" +msgstr "Git 导出受版本控制的项目到当前位置" #. Resource IDs: (330) msgid "Git Init" @@ -5196,7 +5238,7 @@ msgstr "Git 移动并更名版本控制的项目到当前位置" #. Resource IDs: (12) msgid "Git Move versioned item(s) here" -msgstr "Git 移动版本控制的条目到当前位置" +msgstr "Git 移动受版本控制的项目到当前位置" #. Resource IDs: (84) msgid "Git Remote Settings" @@ -5307,7 +5349,7 @@ msgstr "跳到上个冲突处\n上个冲突" msgid "" "Go to the previous difference\n" "Previous difference" -msgstr "跳到上个差异处\\n上个差异" +msgstr "跳到上个差异处\n上个差异" #. Resource IDs: (2055) msgid "" @@ -5341,7 +5383,7 @@ msgstr "分组修改列表" #. Resource IDs: (1229) msgid "H&ide Unrelated Changed Paths" -msgstr "隐藏不相关的文件(&i)" +msgstr "隐藏不相关的文件(&I)" #. Resource IDs: (65535) msgid "H&ue:" @@ -5405,7 +5447,7 @@ msgstr "运行时隐藏脚本" #. Resource IDs: (95) msgid "Hide unchanged" -msgstr "隐藏未更改" +msgstr "隐藏未变更" #. Resource IDs: (95, 1781) msgid "Hide unchanged refs in Ref Compare List" @@ -5471,6 +5513,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5479,6 +5525,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5487,6 +5541,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5495,6 +5553,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5724,7 +5790,7 @@ msgstr "如果选中此项，TortoiseGit 将每周检查是否有新版本可用 msgid "" "If enabled, working tree folders which are excluded from\n" "showing overlays still show the overlay for status 'normal'" -msgstr "如果选中该项，已从覆盖显示排除的工作副本目录仍旧会按照“正常”情况覆盖显示" +msgstr "如果选中该项，已从覆盖显示排除的工作副本文件夹仍旧会按照“正常”情况覆盖显示" #. Resource IDs: (196) msgid "" @@ -5743,7 +5809,7 @@ 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) msgid "Ignore" @@ -5780,7 +5846,7 @@ msgstr "忽略空行" #. Resource IDs: (1067) msgid "Ignore case cha&nges" -msgstr "忽略大小写变更(&n)" +msgstr "忽略大小写变更(&N)" #. Resource IDs: (315) msgid "" @@ -5790,7 +5856,7 @@ msgstr "忽略变更\n忽略外部变更。" #. Resource IDs: (1687) msgid "Ignore item(s) only in the containing folder(s)" -msgstr "只忽略指定文件夹中的文件或目录" +msgstr "只忽略指定文件夹中的文件或文件夹" #. Resource IDs: (1688) msgid "Ignore item(s) recursively" @@ -5867,7 +5933,7 @@ msgstr "导入%s 到 %s%s" #. Resource IDs: (22, 329) msgid "Import SVN Ignore" -msgstr "输入SVN忽略设置" +msgstr "导入 SVN 忽略设置" #. Resource IDs: (22) msgid "Import SVN Ignore ..." @@ -5876,7 +5942,7 @@ msgstr "导入SVN忽略..." #. Resource IDs: (1640) msgid "" "Import svn ignore file to .git/info/exclude file (file will be overwritten)" -msgstr "导入 SVN 忽略文件到目录.git/info/exclude file(如果存在，文件将被覆盖)" +msgstr "导入 SVN 忽略文件到 .git/info/exclude 文件（文件将被覆盖）" #. Resource IDs: (120) #, c-format @@ -5903,6 +5969,10 @@ msgstr "包括标签(&T)" msgid "Include &ignored files" msgstr "包括忽略文件(&I)" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "在分支选择框中包含 FETCH_HEAD" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "仅包括下列版本范围:" @@ -6172,7 +6242,7 @@ msgstr "载入图片" #. Resource IDs: (1505) msgid "Load Putty &Key" -msgstr "加载 Putty 密钥(&K)" +msgstr "加载Putty密钥(&K)" #. Resource IDs: (315) msgid "" @@ -6296,7 +6366,7 @@ msgstr "邮件系统 DLL 无效。" #. Resource IDs: (156) msgid "Main" -msgstr "主" +msgstr "主要" #. Resource IDs: (1653) msgid "Make it Bare (No working directories)" @@ -6324,6 +6394,10 @@ msgid "" "The file status is changed to modified" msgstr "标记为解决\n文件状态将被标记成已经被修改" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "标记供比较" + #. Resource IDs: (252) msgid "Mark this block" msgstr "标记此块" @@ -6364,7 +6438,7 @@ msgstr "动作记录最大行数" #. Resource IDs: (16655) msgid "Me&nus show recently used commands first" -msgstr "用来显示最近使用的命令列表的菜单(&N)" +msgstr "菜单中首先显示最近使用过的命令(&N)" #. Resource IDs: (16134) msgid "Menu" @@ -6376,7 +6450,7 @@ msgstr "菜单栏" #. Resource IDs: (16626) msgid "Menu s&hadows" -msgstr "阴影菜单(&H)" +msgstr "菜单阴影(&H)" #. Resource IDs: (78, 313) msgid "Merge" @@ -6458,11 +6532,11 @@ msgstr "最小" #. Resource IDs: (263) msgid "Mine" -msgstr "本地文件（mine）" +msgstr "现有文件（mine）" #. Resource IDs: (1068) msgid "Minimize the Ribbon" -msgstr "最小化缎带" +msgstr "最小化功能区" #. Resource IDs: (65535) msgid "Minimum number of chars for a commit message:" @@ -6544,10 +6618,6 @@ msgstr "移动和更名" msgid "Move to changelist" msgstr "移动到修改列表" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "移动到扩展右键菜单（按下 Shift 键来显示）" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "移动/更名" @@ -6555,11 +6625,11 @@ msgstr "移动/更名" #. Resource IDs: (98) #, c-format msgid "Move: New name for %s" -msgstr "移动: %s 的新名称" +msgstr "移动: %s 的新名称" #. Resource IDs: (197) msgid "Moves the modified files to the recycle bin first before reverting" -msgstr "在恢复前将已经修改的文件移动到回收站" +msgstr "在还原前将已经修改的文件移动到回收站" #. Resource IDs: (80) #, c-format @@ -6743,7 +6813,7 @@ msgstr "没有发生错误。" msgid "" "No files or folders were modified. There is nothing for TortoiseGit to " "revert!" -msgstr "从上次提交以来没有任何文件修改或加入。TortoiseGit 不需要进行复原！" +msgstr "自上次提交以来没有文件或文件夹被修改。TortoiseGit 不需要进行任何还原！" #. Resource IDs: (239) msgid "" @@ -6870,11 +6940,11 @@ 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) msgid "Notes" @@ -7098,7 +7168,11 @@ msgstr "打开图像文件..." #. Resource IDs: (282) msgid "Open parent folder" -msgstr "打开父目录" +msgstr "打开父文件夹" + +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "创建补丁文件" #. Resource IDs: (3602) msgid "Open this document" @@ -7116,7 +7190,7 @@ msgstr "打开帮助\n帮助主题" #. Resource IDs: (21) msgid "Opens the Reference Browser dialog." -msgstr "打开参考浏览器对话框。" +msgstr "打开引用浏览器对话框。" #. Resource IDs: (15) msgid "Opens the repository browser" @@ -7174,6 +7248,10 @@ msgstr "覆盖已存在的分支" msgid "Overwrite" msgstr "覆盖" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "页面设置(&A)..." + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -7360,11 +7438,11 @@ msgstr "摘取 %s" msgid "" "Picture (Metafile)\n" "a picture" -msgstr "图画(元文件)\n一幅图画" +msgstr "图片 (元文件)\n一张图片" #. Resource IDs: (65535) msgid "Picture:" -msgstr "图画:" +msgstr "图片:" #. Resource IDs: (157) msgid "" @@ -7465,11 +7543,11 @@ 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) msgid "Preview" @@ -7716,7 +7794,7 @@ msgstr "范围" #. Resource IDs: (1736) msgid "Re&base" -msgstr "变基(&b)" +msgstr "变基(&B)" #. Resource IDs: (1494) msgid "Re&mote:" @@ -7748,7 +7826,7 @@ msgstr "还原(&V)..." #. Resource IDs: (606) msgid "Reachable" -msgstr "可达成" +msgstr "可达 (Reachable)" #. Resource IDs: (12) msgid "Read the 'Daily Use Guide' before you are stuck..." @@ -7926,7 +8004,7 @@ msgstr "远端URL(&U):" #. Resource IDs: (1754) msgid "Remote &tracking branch" -msgstr "远端跟踪分支(&t)" +msgstr "远端跟踪分支(&T)" #. Resource IDs: (65535) msgid "Remote Branch" @@ -7990,7 +8068,7 @@ msgstr "从忽略列表删除(&I)" #. Resource IDs: (1068) msgid "Remove from Quick Access Toolbar" -msgstr "从快捷访问工具栏删除" +msgstr "从快速访问工具栏移除" #. Resource IDs: (209) msgid "Remove from changelist" @@ -7998,7 +8076,7 @@ msgstr "从修改列表删除" #. Resource IDs: (1629) msgid "Remove ignored files (-fX)" -msgstr "删除忽略文件(-fx)" +msgstr "删除忽略的文件(-fx)" #. Resource IDs: (1626) msgid "Remove untracked directories (-d)" @@ -8111,10 +8189,6 @@ msgstr "请求拉取" msgid "Requests a username and a password" msgstr "需要用户名和密码" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "需要 GPG 和一个没有密码的密钥。" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "解决冲突(&O)..." @@ -8159,11 +8233,11 @@ msgstr "解决子模块冲突" #. Resource IDs: (282) msgid "Resolve conflict using 'mine'" -msgstr "使用“我的”解决有冲突的文件" +msgstr "使用“现有”解决有冲突的文件" #. Resource IDs: (282) msgid "Resolve conflict using 'theirs'" -msgstr "使用“他们的”解决有冲突的文件" +msgstr "使用“到来”解决有冲突的文件" #. Resource IDs: (74, 209) msgid "Resolved" @@ -8186,7 +8260,7 @@ msgstr "重新开始变基" #. Resource IDs: (64) msgid "Restore" -msgstr "锁定" +msgstr "恢复" #. Resource IDs: (1254) msgid "Restore Default" @@ -8202,7 +8276,7 @@ msgstr "还原窗口至一般大小" #. Resource IDs: (73) msgid "Restored" -msgstr "还原" +msgstr "已恢复" #. Resource IDs: (73) msgid "Retry" @@ -8227,12 +8301,12 @@ msgstr "还原提交 %s" #. Resource IDs: (1258) msgid "Revert to parent revision" -msgstr "复原到父版本" +msgstr "还原到父版本" #. Resource IDs: (323) #, c-format msgid "Revert to revision %s" -msgstr "复原到版本%s" +msgstr "还原到版本 %s" #. Resource IDs: (73) msgid "Reverted" @@ -8240,7 +8314,7 @@ msgstr "已还原" #. Resource IDs: (9) msgid "Reverts all changes you made since the last update" -msgstr "复原从上次更新之后全部的变动" +msgstr "还原上次更新后的全部变更" #. Resource IDs: (14) msgid "Reverts an addition to version control" @@ -8295,7 +8369,7 @@ msgstr "版本分支图" #. Resource IDs: (86) msgid "" "Revision(s) reverted. All changes are integrated into your working tree now." -msgstr "版本已经回溯。所有的变更现在已经在您的工作目录。" +msgstr "版本已还原。所有的变更现在已集成到您的工作树。" #. Resource IDs: (1579, 65535) msgid "Revision:" @@ -8356,7 +8430,7 @@ msgstr "在两行上显示按钮(&H)" #. Resource IDs: (17078) msgid "S&how Quick Access Toolbar below the Ribbon" -msgstr "在缎带下方显示快捷访问工具栏(&H)" +msgstr "在功能区下方显示快速访问工具栏(&H)" #. Resource IDs: (1132) msgid "S&tatistics" @@ -8384,7 +8458,7 @@ msgstr "SMTP 服务器需要身份验证" #. Resource IDs: (1757) msgid "SMTP Server:" -msgstr "SMTP 服务器地址:" +msgstr "SMTP 服务器:" #. Resource IDs: (90) msgid "SMTP, directly to destination server" @@ -8404,7 +8478,7 @@ msgstr "STARTTLS" #. Resource IDs: (331) msgid "SVN Commit Type" -msgstr "SVN Commit类型" +msgstr "SVN Commit 类型" #. Resource IDs: (22) msgid "SVN DCommit..." @@ -8553,6 +8627,10 @@ msgstr "是否保存 %1 的变更？" msgid "Save modifications." msgstr "保存修改。" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "保存补丁文件" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "保存版本至(&T)..." @@ -8634,6 +8712,10 @@ msgstr "左卷" msgid "Scroll Right" msgstr "右卷" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "设置(&T)..." + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "查找日志信息(&L)..." @@ -8832,7 +8914,7 @@ msgstr "设置加速键(&F):" #. Resource IDs: (1558) msgid "Set au&thor" -msgstr "设置作者(&t)" +msgstr "设置作者(&T)" #. Resource IDs: (1557) msgid "Set author &date" @@ -8921,11 +9003,11 @@ msgstr "仅在资源管理器中显示图标覆盖和右键菜单(&O)" #. Resource IDs: (1069) msgid "Show Above the Ribbon" -msgstr "缎带上方显示" +msgstr "在功能区上方显示" #. Resource IDs: (1069) msgid "Show Below the Ribbon" -msgstr "缎带下方显示" +msgstr "在功能区下方显示" #. Resource IDs: (1382) msgid "Show Environment Variables" @@ -8957,15 +9039,15 @@ msgstr "显示更多的按钮" #. Resource IDs: (1068) msgid "Show Quick Access Toolbar Above the Ribbon" -msgstr "在缎带上方显示快捷访问工具栏" +msgstr "在功能区上方显示快速访问工具栏" #. Resource IDs: (1068) msgid "Show Quick Access Toolbar Below the Ribbon" -msgstr "在缎带下方显示快捷访问工具栏" +msgstr "在功能区下方显示快速访问工具栏" #. Resource IDs: (16651) msgid "Show Screen&Tips on toolbars" -msgstr "在工具栏中显示屏幕提示(&T)" +msgstr "在工具栏上显示工具提示(&T)" #. Resource IDs: (156) msgid "Show Whitespaces" @@ -9029,7 +9111,7 @@ msgstr "显示和上次提交的差异" #. Resource IDs: (1126) msgid "Show excluded folders as normal" -msgstr "对排除的目录正常显示" +msgstr "对排除的文件夹正常显示" #. Resource IDs: (16656) msgid "Show f&ull menus after a short delay" @@ -9045,7 +9127,7 @@ msgstr "显示 git.exe 执行用时及时间戳" #. Resource IDs: (1264) msgid "Show i&gnored files" -msgstr "显示被忽略的文件(&G)" +msgstr "显示已忽略的文件(&G)" #. Resource IDs: (1265) msgid "Show ignore local changes flagged files" @@ -9078,7 +9160,7 @@ msgstr "显示子模块历史" #. Resource IDs: (14) msgid "Show log of this folder" -msgstr "显示此目录的日志" +msgstr "显示此文件夹的日志" #. Resource IDs: (1256) msgid "Show log..." @@ -9156,6 +9238,10 @@ msgid "" "Show Whitespaces" msgstr "空白和换行显示为特殊字符\n显示空白" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "在子仓库的父文件夹中显示状态" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "在ref标签中显示特殊符号" @@ -9214,6 +9300,10 @@ msgstr "显示选定的文件/文件夹的日志" msgid "Si&gn" msgstr "签名(&G)" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "主要贡献者: (完整列表见 Git 版本库)" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "银色风格" @@ -9241,7 +9331,7 @@ msgstr "跳过工作树" #. Resource IDs: (1529) msgid "Skip worktree (\"Locked\" in TortoiseSVN)" -msgstr "跳过工作树(\"Lockes\"在TortoiseSVN)" +msgstr "跳过工作树(TortoiseSVN中的\"Lockes\")" #. Resource IDs: (74) msgid "Skipped" @@ -9291,16 +9381,12 @@ msgstr "反向顺序排序标签列表" 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 "旋转一" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "拆分提交" - #. Resource IDs: (1253) msgid "Split lines" msgstr "分割行" @@ -9446,11 +9532,11 @@ msgstr "风格" #. Resource IDs: (1, 65) msgid "Subject" -msgstr "标题" +msgstr "主题" #. Resource IDs: (65535) msgid "Subject:" -msgstr "标题:" +msgstr "主题:" #. Resource IDs: (1639) msgid "Submodule" @@ -9472,10 +9558,6 @@ msgstr "添加子模块..." msgid "Submodule Diff" msgstr "比较子模块" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "显示子模块信息" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "初始化子模块" @@ -9499,6 +9581,10 @@ msgid "" "Revision %2!s!" msgstr "子模块 \"%1!s!\"\n修订版本 %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "项目的子模块:" + #. Resource IDs: (1708) msgid "Submodules" msgstr "子模块" @@ -9507,13 +9593,6 @@ msgstr "子模块" msgid "Success" msgstr "成功" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "切换" @@ -9589,7 +9668,7 @@ msgstr "互换这个比较的左右双方" #. Resource IDs: (1733) msgid "Symbolize ref names" -msgstr "符号化参考名称" +msgstr "符号化引用名称" #. Resource IDs: (11031) msgid "Symlink" @@ -9625,6 +9704,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "标签(&G):" @@ -9979,7 +10062,7 @@ 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) msgid "" @@ -10012,7 +10095,7 @@ msgstr "子模块中包含的目录中有修改或未版本控制的对象。\n msgid "" "There are currently %d overlay handlers installed besides the ones Tortoise " "uses." -msgstr "除 Tortoise 所用以外，現在还有 %d 个已安装的图标覆盖。" +msgstr "除 Tortoise 所用以外，现在还有 %d 个已安装的图标覆盖。" #. Resource IDs: (316) msgid "" @@ -10043,7 +10126,7 @@ msgstr "有未保存的修改！\n您要保存所做的修改吗？" 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) msgid "Thesaurus" @@ -10072,6 +10155,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "这是一个无效路径！\n正确的路径不能包含“<<>|\"?*:”或以下设备名: \ncom1-com9，lpt1-lpt9，prn，aux，con，nul，clock$" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "在日志对话框仍在载入提交时，此操作不能进行。" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10111,15 +10200,15 @@ msgstr "三路比较" #. Resource IDs: (16928) msgid "Tile &Vertically" -msgstr "垂直标题(&V)" +msgstr "垂直堆叠(&V)" #. Resource IDs: (16924) msgid "Tile Hori&zontally" -msgstr "水平标题(&z)" +msgstr "水平堆叠(&Z)" #. Resource IDs: (1676) msgid "To" -msgstr "收件人" +msgstr "至" #. Resource IDs: (1422) msgid "" @@ -10213,7 +10302,7 @@ msgstr "TortoiseGit 检测到类似的文件名。您要同时更名\n文件 %s #. Resource IDs: (198) #, c-format msgid "TortoiseGit will not show the following overlays: %s" -msgstr "TortoiseGit将不显示以下覆盖：%s" +msgstr "TortoiseGit 将不会显示下列图标覆盖：%s" #. Resource IDs: (1096) msgid "TortoiseGit&UDiff" @@ -10266,7 +10355,7 @@ 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 "TortoiseIDiff: TortoiseSVN 的图片差异查看器\n\n可用的命令行参数: \n/left: “左侧文件的路径”\n/lefttitle: “左侧窗口的标题”\n/right: “右侧文件的路径”\n/righttitle: “右侧窗口的标题”\n/overlay\t\t启用覆盖模式\n/fit\t\t适合图像尺寸\\n\n/showinfo\t\t显示图像信息框" +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) msgid "TortoiseGitMerge" @@ -10297,6 +10386,17 @@ msgstr "TortoiseGitMerge不能处理这个补丁文件。文件 \"%s\" 出现多 msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "TortoiseGitUDiff：TortoiseGit 的统一差异查看器\n\n可用的命令行参数：\n/patchfile:\"统一差异文件的路径\"\n/title:\"查看器的标题\"\n/? - 本帮助对话框\n/p - 从控制台管道读入差异" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "包括添加/删除文件的修改的总行数" @@ -10481,7 +10581,7 @@ msgstr "未格式化的文本\n没有任何格式的文本" #. Resource IDs: (2054) msgid "Unified &diff of HEAD revisions" -msgstr "HEAD版本的标准差异(&D)" +msgstr "与HEAD版本的标准差异(&D)" #. Resource IDs: (1258) msgid "Unknown" @@ -10558,19 +10658,19 @@ msgstr "使用其他文本块(&O)" #. Resource IDs: (156) msgid "Use 'mine' text block" -msgstr "使用“我的”文本块" +msgstr "使用“现有”文本块" #. Resource IDs: (156) msgid "Use 'mine' text block then 'theirs'" -msgstr "先使用“我的”文本块，然后才是“他们的”" +msgstr "先使用“现有”文本块，然后才是“到来”" #. Resource IDs: (156) msgid "Use 'theirs' text block" -msgstr "使用“他们的”文本块" +msgstr "使用“到来”文本块" #. Resource IDs: (156) msgid "Use 'theirs' text block then 'mine'" -msgstr "先使用“他们的”文本块，然后才是“我的”" +msgstr "先使用“到来”文本块，然后才是“现有”" #. Resource IDs: (156) msgid "Use Blocks" @@ -10582,7 +10682,7 @@ msgstr "使用HTTP路径组件" #. Resource IDs: (1066) msgid "Use Ribbons" -msgstr "使用Ribbons" +msgstr "使用 Ribbon 风格" #. Resource IDs: (1500) msgid "Use Task Dialog" @@ -10656,7 +10756,7 @@ msgstr "当前分支颜色使用本地分支颜色" #. Resource IDs: (1432) msgid "Use recycle bin when reverting" -msgstr "在恢复时使用回收站" +msgstr "在还原时使用回收站" #. Resource IDs: (116) msgid "Use regular expression" @@ -10676,43 +10776,43 @@ msgstr "对日期/时间使用系统区域" #. Resource IDs: (251) msgid "Use text block from '&mine'" -msgstr "使用“我的”文本块(&M)" +msgstr "使用“现有”文本块(&M)" #. Resource IDs: (251) msgid "Use text block from '&theirs'" -msgstr "使用“他们的”文本块(&T)" +msgstr "使用“到来”文本块(&T)" #. Resource IDs: (251) msgid "Use text block from 'm&ine' before 'theirs'" -msgstr "先使用“我的”文本块(&I)" +msgstr "先使用“现有”文本块(&I)" #. Resource IDs: (2052) msgid "" "Use text block from 'mine' before 'theirs'\n" "Use 'mine' text block then 'theirs'" -msgstr "先使用“我的”文本块\n先使用“我的”文本块，然后才是“他们的”" +msgstr "先使用“现有”文本块\n先使用“现有”文本块，然后才是“到来”" #. Resource IDs: (2052) msgid "" "Use text block from 'mine'\n" "Use 'mine' text block" -msgstr "使用“我的”文本块\n使用“我的”文本块" +msgstr "使用“现有”文本块\n使用“现有”文本块" #. Resource IDs: (251) msgid "Use text block from 't&heirs' before 'mine'" -msgstr "先使用“他们的”文本块(&h)" +msgstr "先使用“他们的”文本块(&H)" #. Resource IDs: (2052) msgid "" "Use text block from 'theirs' before 'mine'\n" "Use 'theirs' text block then 'mine'" -msgstr "先使用“他们的”文本块\n先使用“他们的”文本块，然后才是“我的”" +msgstr "先使用“到来”文本块\n先使用“到来”文本块，然后才是“现有”" #. Resource IDs: (2052) msgid "" "Use text block from 'theirs'\n" "Use 'theirs' text block" -msgstr "使用“他们的”文本块\n使用“他们的”文本块" +msgstr "使用“到来”文本块\n使用“到来”文本块" #. Resource IDs: (2054) msgid "" @@ -10724,6 +10824,10 @@ msgstr "使用左边视图中的文本块\n使用左边的块" msgid "Use th&is text block" msgstr "使用此文本块(&I)" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "使用当前时间设置提交日期之作者日期。" + #. Resource IDs: (314) #, c-format msgid "" @@ -10794,12 +10898,20 @@ msgstr "用户名称: " msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "可用的命令行选项有: \n/base: <基础文件的路径>\n/theirs: <远端文件的路径>\n/yours: <本地文件的路径>\n/merged: <合并后文件的路径>\n/diff: <标准差异文件的路径>\n/patchpath: <文件夹路径>" +"/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) msgid "Value" @@ -10961,7 +11073,7 @@ msgstr "在启用时，在拖放文件/文件夹时将可使用 TortoiseGit 的 msgid "" "When enabled, larger version numbers come first. It is because latest " "versions are usually more useful." -msgstr "当启用时，较大的版本号将列为首位。这是因为最新的版本可能更为有用。" +msgstr "当启用时，较大的版本号将列为首位。这是因为最近的版本可能更为有用。" #. Resource IDs: (197) msgid "" @@ -11074,7 +11186,7 @@ msgstr "工作副本路径:" #. Resource IDs: (1253) msgid "Working dir changes" -msgstr "工作目录变更" +msgstr "工作目录中的变更" #. Resource IDs: (156) msgid "Wrap long lines" @@ -11102,7 +11214,7 @@ msgstr "您已经安装了最新版本。" 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) #, c-format @@ -11136,7 +11248,7 @@ msgstr "您已安装的 Git for Windows (https://msysgit.github.io/) 是旧版 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”命令，于是采用回收站的忽略文件/目录将被直接删除。" +msgstr "您选择了“包括未被版本控制的\"。\n这实际包括了调用“git clean -fd”命令，于是已忽略的文件/目录将被直接删除到回收站。" #. Resource IDs: (7) msgid "You have marked changed blocks. How should those blocks be saved?" @@ -11193,7 +11305,7 @@ msgstr "您必须为 zip 文件选择一个文件名！" msgid "" "You selected a folder.\r\n" "Exports are only possible to a (zip) file." -msgstr "您选择了一个目录。\n导出只能是一个(zip)文件。" +msgstr "您选择了一个文件夹。\n导出只能是一个(zip)文件。" #. Resource IDs: (77) msgid "" @@ -11417,6 +11529,10 @@ msgstr "天" msgid "deleted" msgstr "已删除" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "差异来自管道输入" + #. Resource IDs: (58116) msgid "dummy" msgstr "虚拟" @@ -11449,7 +11565,7 @@ msgstr "忽略" #. Resource IDs: (1130) msgid "include &untracked" -msgstr "包括未版本控制的(&u)" +msgstr "包括未版本控制的(&U)" #. Resource IDs: (13) msgid "incomplete" diff --git a/Languages/Tortoise_zh_TW.po b/Languages/Tortoise_zh_TW.po index 4fb878446..433e873cf 100644 --- a/Languages/Tortoise_zh_TW.po +++ b/Languages/Tortoise_zh_TW.po @@ -1,12 +1,12 @@ # Translation of TortoiseGit -# Copyright (C) 2008-2014 the TortoiseGit team +# Copyright (C) 2008-2015 the TortoiseGit team # # This file is distributed under the same license as TortoiseGit # # Translators: # Hydriz Scholz , 2013 # ch cooli , 2012 -# ch cooli , 2012-2014 +# ch cooli , 2012-2015 # Hydriz Scholz , 2013 # Hydriz Scholz , 2013,2015 # Sven Strickroth , 2013 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: TortoiseGit\n" "Report-Msgid-Bugs-To: http://code.google.com/p/tortoisegit/issues\n" "POT-Creation-Date: 1900-01-01 00:00+0000\n" -"PO-Revision-Date: 2015-01-08 07:11+0000\n" -"Last-Translator: Yue Lin Ho \n" +"PO-Revision-Date: 2015-04-06 14:27+0000\n" +"Last-Translator: ch cooli \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" @@ -659,6 +659,10 @@ msgstr "啟用代理伺服器(&E)" msgid "&Enable edit" msgstr "啟用編輯(&E)" +#. Resource IDs: (32771) +msgid "&Exit" +msgstr "離開(&E)" + #. Resource IDs: (323) msgid "&Export selection to..." msgstr "匯出選取範圍至(&E)..." @@ -925,6 +929,10 @@ msgstr "新增(&N)" msgid "&New..." msgstr "新增(&N)..." +#. Resource IDs: (1014) +msgid "&Next >" +msgstr "下一個(&N) >" + #. Resource IDs: (58114) msgid "&Next Page" msgstr "下一頁(&N)" @@ -953,6 +961,10 @@ msgstr "確定(&O)" msgid "&One Page" msgstr "單頁(&O)" +#. Resource IDs: (1828) +msgid "&Onto" +msgstr "建於(&O)" + #. Resource IDs: (101, 1251, 32773, 57601) msgid "&Open" msgstr "開啟(&O)" @@ -961,6 +973,10 @@ msgstr "開啟(&O)" msgid "&Open Git for Windows WebSite" msgstr "開啟 Git for Windows 網站" +#. Resource IDs: (32774) +msgid "&Open..." +msgstr "開啟(&O)..." + #. Resource IDs: (57601) msgid "&Open...\tCtrl+O" msgstr "開啟(&O)...\tCtrl+O" @@ -1422,6 +1438,10 @@ msgstr ".gitignore 在根目錄" msgid ".tgitconfig in the repository root" msgstr ".tgitconfig 在根目錄" +#. Resource IDs: (1020) +msgid "< &Previous" +msgstr "< 上一個(&P)" + #. Resource IDs: (16506) msgid "<.....>" msgstr "<...>" @@ -1711,6 +1731,10 @@ msgstr "加入遠端伺服器" msgid "Add \"&Signed-off-by\"" msgstr "加入 \"&Signed-off-by\"" +#. Resource IDs: (98) +msgid "Add another commit?" +msgstr "加入另一個提交?" + #. Resource IDs: (110) msgid "Add extension specific diff program" msgstr "根據副檔名加入差異比對程式" @@ -1855,6 +1879,12 @@ msgstr "允許在此視窗中編輯\n允許編輯" msgid "Allow to use custom Gravatar URL" msgstr "容許使用自訂的 Gravatar URL" +#. Resource IDs: (97) +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) msgid "Already up to date." msgstr "己經是最新的" @@ -1947,6 +1977,10 @@ msgstr "附加這個區塊至左方" msgid "Application Frame Menus: " msgstr "應用程式窗框選單：" +#. Resource IDs: (32780) +msgid "Apply &Patch..." +msgstr "套用補綴(&P)..." + #. Resource IDs: (20) msgid "Apply Patch Serial..." msgstr "套用補綴序列(&P)..." @@ -2097,10 +2131,6 @@ msgid "Authors case sensitive" msgstr "作者欄有大小寫之分" #. Resource IDs: (65535) -msgid "Authors:" -msgstr "作者:" - -#. Resource IDs: (65535) msgid "" "Authors:\tFrank Li (lznuaa@gmail.com),\n" "\t\tSven Strickroth (email@cs-ware.de)" @@ -3249,8 +3279,8 @@ msgid "Copying..." msgstr "正在複製..." #. Resource IDs: (1001) -msgid "Copyright (C) 2009-2014 TortoiseGit" -msgstr "版權所有 (C) 2009-2014 TortoiseGit" +msgid "Copyright (C) 2009-2015 TortoiseGit" +msgstr "版權所有 (C) 2009-2015 TortoiseGit" #. Resource IDs: (1254) msgid "Corrections" @@ -3513,10 +3543,6 @@ msgstr "憑據助手：" msgid "Credentials" msgstr "憑據" -#. Resource IDs: (65535) -msgid "Credits:" -msgstr "作者：" - #. Resource IDs: (1253) msgid "Cu&t" msgstr "剪下(&T)" @@ -3907,6 +3933,10 @@ msgstr "目錄(Dir)..." msgid "Directory:" msgstr "目錄:" +#. Resource IDs: (1796) +msgid "Disable sounds" +msgstr "關閉音效" + #. Resource IDs: (195) msgid "" "Disable this option if you have really big working trees and experience\r\n" @@ -4119,6 +4149,10 @@ msgid "" "Reload the views without saving the modifications" msgstr "不儲存\n不儲存變更直接重新載入顯示" +#. Resource IDs: (65535) +msgid "Don't show the selected items: (press shift key to show them)" +msgstr "不顯示以下選取的項目: (加按 Shift 鍵可重新顯示它們)" + #. Resource IDs: (73, 80) msgid "Don't show this message again" msgstr "不再顯示此訊息" @@ -4255,6 +4289,10 @@ msgstr "編輯系統 gitconfig (&Y)" msgid "Edit..." msgstr "編輯..." +#. Resource IDs: (1827) +msgid "Edit/Split commit" +msgstr "編輯/切分 提交" + #. Resource IDs: (1770) msgid "Effective" msgstr "有效的" @@ -4864,6 +4902,10 @@ msgid "" "Find" msgstr "搜尋指定文字\n搜尋" +#. Resource IDs: (65535) +msgid "Find:" +msgstr "搜尋:" + #. Resource IDs: (95) #, c-format msgid "Find: Can't find the text \"%s\"" @@ -5002,10 +5044,6 @@ msgstr "找到空白的提交訊息，請輸入提交訊息，否則不能繼續 msgid "Found auto words:" msgstr "找到 auto word:" -#. Resource IDs: (65535) -msgid "Frank Li (lznuaa@gmail.com), Sven Strickroth " -msgstr "Frank Li (lznuaa@gmail.com), Sven Strickroth " - #. Resource IDs: (1385, 1522, 65535) msgid "From" msgstr "由" @@ -5071,6 +5109,10 @@ msgid "" "GDI+ couldn't create a bitmap object. You probably don't have enough memory." msgstr "GDI+ 無法建立點陣圖物件. 你可能沒有足夠的記憶體." +#. Resource IDs: (82) +msgid "GPG signs the tag, see manual for details" +msgstr "GPG 簽名標籤，請查閱手冊了解詳細資訊。" + #. Resource IDs: (284) msgid "Gathering information. Please wait..." msgstr "正在取得資訊，請稍候..." @@ -5466,6 +5508,10 @@ msgstr "ID" msgid "ID:220:V C +G" msgstr "ID:220:V C +G" +#. Accelerator Entry for Menu ID:32771; '&Exit' +msgid "ID:32771:V C +W" +msgstr "ID:32771:V C +W" + #. Accelerator Entry for Menu ID:32772; '&Overlay images' msgid "ID:32772:V +O" msgstr "ID:32772:V +O" @@ -5474,6 +5520,14 @@ msgstr "ID:32772:V +O" msgid "ID:32773:V C +O" msgstr "ID:32773:V C +O" +#. Accelerator Entry for Menu ID:32773; 'Save &as' +msgid "ID:32773:V CS+S" +msgstr "ID:32773:V CS+S" + +#. Accelerator Entry for Menu ID:32774; '&Open' +msgid "ID:32774:V C +O" +msgstr "ID:32774:V C +O" + #. Accelerator Entry for Menu ID:32774; '&Whitespaces' msgid "ID:32774:V C +T" msgstr "ID:32774:V C +T" @@ -5482,6 +5536,10 @@ msgstr "ID:32774:V C +T" msgid "ID:32775:V C +D" msgstr "ID:32775:V C +D" +#. Accelerator Entry for Menu ID:32776; '&Save' +msgid "ID:32776:V C +S" +msgstr "ID:32776:V C +S" + #. Accelerator Entry for Menu ID:32778; '&Fit images in window' msgid "ID:32778:V +F" msgstr "ID:32778:V +F" @@ -5490,6 +5548,14 @@ msgstr "ID:32778:V +F" msgid "ID:32779:V +S" msgstr "ID:32779:V +S" +#. Accelerator Entry for Menu ID:32782; '&Print' +msgid "ID:32782:V C +P" +msgstr "ID:32782:V C +P" + +#. Accelerator Entry for Menu ID:32787; '' +msgid "ID:32787:V C +F" +msgstr "ID:32787:V C +F" + #. Accelerator Entry for Menu ID:32793; 'Arrange &vertical' msgid "ID:32793:V C +V" msgstr "ID:32793:V C +V" @@ -5680,7 +5746,7 @@ 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) msgid "Identical" @@ -5898,6 +5964,10 @@ msgstr "包含標籤(&T)" msgid "Include &ignored files" msgstr "包含忽略的檔案(&I)" +#. Resource IDs: (1797) +msgid "Include FETCH_HEAD in branch selection boxes" +msgstr "在分支下拉選單中顯示 FETCH_HEAD" + #. Resource IDs: (65535) msgid "Include only the following revision range:" msgstr "只包括以下版本範圍" @@ -6319,6 +6389,10 @@ msgid "" "The file status is changed to modified" msgstr "標記為已解決\n清除衝突狀態並標示為已更改" +#. Resource IDs: (97) +msgid "Mark for comparison" +msgstr "標記為比較基準" + #. Resource IDs: (252) msgid "Mark this block" msgstr "標記這個區塊" @@ -6539,10 +6613,6 @@ msgstr "移動並重新命名" msgid "Move to changelist" msgstr "移至變更列表" -#. Resource IDs: (65535) -msgid "Move to extended context menu (press shift key to show it)" -msgstr "移動到擴展右鍵選單的項目(需要按住Shift鍵)" - #. Resource IDs: (229) msgid "Move/Rename" msgstr "移動/重新命名" @@ -7095,6 +7165,10 @@ msgstr "開啟影像檔..." msgid "Open parent folder" msgstr "開啟上層目錄" +#. Resource IDs: (7) +msgid "Open patch file" +msgstr "開啟補綴檔" + #. Resource IDs: (3602) msgid "Open this document" msgstr "開啟此文件" @@ -7169,6 +7243,10 @@ msgstr "覆寫已存在的分支" msgid "Overwrite" msgstr "覆寫" +#. Resource IDs: (32781) +msgid "P&age setup..." +msgstr "版面設定(&A)..." + #. Resource IDs: (3845) #, c-format msgid "Page %u" @@ -7644,7 +7722,7 @@ msgstr "推送備註" #. Resource IDs: (76) msgid "Push ta&gs" -msgstr "推送標籤(&g)" +msgstr "推送標籤(&G)" #. Resource IDs: (14, 64) msgid "Push..." @@ -8106,10 +8184,6 @@ msgstr "要求拉取" msgid "Requests a username and a password" msgstr "需要帳號和密碼" -#. Resource IDs: (82) -msgid "Requires GPG and a key without passphrase." -msgstr "要求 GPG 及密鑰但沒有密碼" - #. Resource IDs: (8) msgid "Res&olve..." msgstr "解決(&O)..." @@ -8548,6 +8622,10 @@ msgstr "是否儲存 %1 的變動?" msgid "Save modifications." msgstr "儲存變更。" +#. Resource IDs: (7) +msgid "Save patch file" +msgstr "儲存補綴檔" + #. Resource IDs: (1253) msgid "Save revision &to..." msgstr "儲存版本至(&T)..." @@ -8629,6 +8707,10 @@ msgstr "向左捲動" msgid "Scroll Right" msgstr "向右捲動" +#. Resource IDs: (32779) +msgid "Se&ttings..." +msgstr "設定(&T)..." + #. Resource IDs: (1253) msgid "Search &log messages..." msgstr "搜尋記錄訊息(&L)..." @@ -9151,6 +9233,10 @@ msgid "" "Show Whitespaces" msgstr "以特殊字元顯示空白字元及換行字元\n顯示空白字元" +#. Resource IDs: (1314) +msgid "Show status of subrepositories in parent folders" +msgstr "在上層資料夾顯示子版本庫的狀態" + #. Resource IDs: (87) msgid "Show symbols on ref labels to substitute part of the ref names" msgstr "在參考點上以符號代替名稱的某部分" @@ -9209,6 +9295,10 @@ msgstr "顯示選定的檔案/資料夾的記錄" msgid "Si&gn" msgstr "簽名(&G)" +#. Resource IDs: (65535) +msgid "Significant contributions by: (see Git repository for a complete list)" +msgstr "主要貢獻來自於: (查看 Git 版本庫以取得完整的貢獻者列表)" + #. Resource IDs: (156, 626) msgid "Silver Style" msgstr "銀色樣式" @@ -9292,10 +9382,6 @@ msgstr "指定最近訊息紀錄要保留幾筆資料." msgid "Spin1" msgstr "Spin1" -#. Resource IDs: (1827) -msgid "Split commit" -msgstr "拆分提交" - #. Resource IDs: (1253) msgid "Split lines" msgstr "斷行" @@ -9467,10 +9553,6 @@ msgstr "子模組新增" msgid "Submodule Diff" msgstr "比較子模組" -#. Resource IDs: (1585) -msgid "Submodule Info" -msgstr "顯示子模組訊息" - #. Resource IDs: (76) msgid "Submodule Init" msgstr "子模組初始化" @@ -9494,6 +9576,10 @@ msgid "" "Revision %2!s!" msgstr "子模組 \"%1!s!\"\n版本 %2!s!" +#. Resource IDs: (1585) +msgid "Submodule of Project: " +msgstr "專案中的子模組: " + #. Resource IDs: (1708) msgid "Submodules" msgstr "子模組" @@ -9502,13 +9588,6 @@ msgstr "子模組" msgid "Success" msgstr "成功" -#. Resource IDs: (65535) -msgid "" -"Sup Yut Sum , Colin Law , Myagi " -", Johan 't Hart , Laszlo Papp " -"" -msgstr "Sup Yut Sum , Colin Law , Myagi , Johan 't Hart , Laszlo Papp " - #. Resource IDs: (78) msgid "Switch" msgstr "切換" @@ -9620,6 +9699,10 @@ msgstr "TIS-620" msgid "TORTOISEGITIDIFF" msgstr "TORTOISEGITIDIFF" +#. Resource IDs: (7) +msgid "TORTOISEGITUDIFF" +msgstr "TORTOISEGITUDIFF" + #. Resource IDs: (1513) msgid "Ta&gs:" msgstr "標籤(&G)" @@ -10067,6 +10150,12 @@ msgid "" "com1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" msgstr "路徑錯誤!\n正確的路徑不可以包含'<<>|\"?*:' 或是下列的裝置名:\ncom1-com9, lpt1-lpt9, prn, aux, con, nul, clock$" +#. Resource IDs: (98) +msgid "" +"This operation cannot be started while the log dialog is still loading " +"commits." +msgstr "在記錄視窗仍在載入提交時，不能開始這動作。" + #. Resource IDs: (3857) #, c-format msgid "" @@ -10292,6 +10381,17 @@ msgstr "TortoiseGitMerge 無法處理這補綴檔，檔名 %s 出現多於一次 msgid "TortoiseGitUDiff" msgstr "TortoiseGitUDiff" +#. Resource IDs: (7) +msgid "" +"TortoiseGitUDiff: the unified diff viewer for TortoiseGit\n" +"\n" +"Available 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" +msgstr "TortoiseGitUDiff: TortoiseGit 的單一差異檔檢視器\n可使用的命令列參數有:\n/patchfile:\"單一差異檔的路徑\"\n/title:\"要顯示在檢視器抬頭的文字\"\n/? - 顯示關於這個對話框的說明文件\n/p - 從控制台管道讀取差異輸入" + #. Resource IDs: (1739) msgid "Total changed lines including added/deleted files:" msgstr "總變更行數包含新增/刪除的檔案" @@ -10719,6 +10819,10 @@ msgstr "使用左方視窗的文字區塊\n使用左方區塊" msgid "Use th&is text block" msgstr "使用此文字區塊(&I)" +#. Resource IDs: (98) +msgid "Use the current time by setting the author date to the commit date." +msgstr "修改作者時間為提交時間(目前時間)" + #. Resource IDs: (314) #, c-format msgid "" @@ -10789,12 +10893,20 @@ msgstr "用戶名稱:" msgid "" "Valid command line options are:\n" "/base:\n" +"/basename:\n" "/theirs:\n" +"/theirsname:\n" "/mine:\n" +"/minename:\n" "/merged:\n" +"/mergedname:\n" "/diff:\n" -"/patchpath:" -msgstr "可用的命令列選項有:\n/base:<基礎檔案的路徑>\n/theirs:<倉儲檔案的路徑>\n/mine:<本地檔案的路徑>\n/merged:<合併後檔案的路徑>\n/diff:<單一差異檔的路徑>\n/patchpath:<資料夾路徑>" +"/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) msgid "Value" @@ -11412,6 +11524,10 @@ msgstr "日" msgid "deleted" msgstr "刪除" +#. Resource IDs: (7) +msgid "diff from pipe" +msgstr "來自管道的差異" + #. Resource IDs: (58116) msgid "dummy" msgstr "dummy" -- 2.11.4.GIT